opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-30 17:58:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Fix multiview not decrementing showing state count

Browse Source 
Also replaced a variable `numSrcs` with `multiviewNewScenes.size()`
because they are always identical.
This commit is contained in:
Norihiro Kamae
2025-04-16 19:10:13 +09:00
committed by Ryan Foster
parent 86f98beaf1
commit 8e2da12c2a
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/Multiview.cpp
+21 -15
View File
@@ -70,9 +70,6 @@ void Multiview::Update(MultiviewLayout multiviewLayout, bool drawLabel, bool dra
this->drawLabel = drawLabel;
this->drawSafeArea = drawSafeArea;
multiviewScenes.clear();
multiviewLabels.clear();
struct obs_video_info ovi;
obs_get_video_info(&ovi);
@@ -85,9 +82,6 @@ void Multiview::Update(MultiviewLayout multiviewLayout, bool drawLabel, bool dra
struct obs_frontend_source_list scenes = {};
obs_frontend_get_scenes(&scenes);
multiviewLabels.emplace_back(CreateLabel(Str("StudioMode.Preview"), h / 2));
multiviewLabels.emplace_back(CreateLabel(Str("StudioMode.Program"), h / 2));
switch (multiviewLayout) {
case MultiviewLayout::HORIZONTAL_TOP_18_SCENES:
pvwprgCX = fw / 2;
@@ -155,9 +149,14 @@ void Multiview::Update(MultiviewLayout multiviewLayout, bool drawLabel, bool dra
siScaleX = (scenesCX - thicknessx2) / fw;
siScaleY = (scenesCY - thicknessx2) / fh;
numSrcs = 0;
std::vector<OBSWeakSource> updatedScenes;
std::vector<OBSSource> updatedLabels;
updatedLabels.emplace_back(CreateLabel(Str("StudioMode.Preview"), h / 2));
updatedLabels.emplace_back(CreateLabel(Str("StudioMode.Program"), h / 2));
size_t i = 0;
while (i < scenes.sources.num && numSrcs < maxSrcs) {
while (i < scenes.sources.num && updatedScenes.size() < maxSrcs) {
obs_source_t *src = scenes.sources.array[i++];
OBSDataAutoRelease data = obs_source_get_private_settings(src);
@@ -165,16 +164,22 @@ void Multiview::Update(MultiviewLayout multiviewLayout, bool drawLabel, bool dra
if (!obs_data_get_bool(data, "show_in_multiview"))
continue;
// We have a displayable source.
numSrcs++;
multiviewScenes.emplace_back(OBSGetWeakRef(src));
updatedScenes.emplace_back(OBSGetWeakRef(src));
obs_source_inc_showing(src);
multiviewLabels.emplace_back(CreateLabel(obs_source_get_name(src), h / 3));
updatedLabels.emplace_back(CreateLabel(obs_source_get_name(src), h / 3));
}
obs_frontend_source_list_free(&scenes);
for (OBSWeakSource &weakSrc : multiviewScenes) {
OBSSource src = OBSGetStrongRef(weakSrc);
if (src)
obs_source_dec_showing(src);
}
multiviewScenes = std::move(updatedScenes);
multiviewLabels = std::move(updatedLabels);
}
static inline uint32_t labelOffset(MultiviewLayout multiviewLayout, obs_source_t *label, uint32_t cx)
@@ -388,7 +393,7 @@ void Multiview::Render(uint32_t cx, uint32_t cy)
// Handle all the offsets
calcBaseSource(i);
if (i >= numSrcs) {
if (i >= multiviewScenes.size()) {
// Just paint the background and continue
paintAreaWithColor(sourceX, sourceY, scenesCX, scenesCY, outerColor);
paintAreaWithColor(siX, siY, siCX, siCY, backgroundColor);
@@ -741,7 +746,8 @@ OBSSource Multiview::GetSourceByPosition(int x, int y)
pos += 4;
}
if (pos < 0 || pos >= (int)numSrcs)
if (pos < 0 || pos >= (int)multiviewScenes.size())
return nullptr;
return OBSGetStrongRef(multiviewScenes[pos]);
}
frontend/components/Multiview.hpp
+1 -1
View File
@@ -28,7 +28,7 @@ public:
private:
bool drawLabel, drawSafeArea;
MultiviewLayout multiviewLayout;
size_t maxSrcs, numSrcs;
size_t maxSrcs;
gs_vertbuffer_t *actionSafeMargin = nullptr;
gs_vertbuffer_t *graphicsSafeMargin = nullptr;
gs_vertbuffer_t *fourByThreeSafeMargin = nullptr;