Skip to content

frontend: Fix audio mixer preview for groups and subscenes #13509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kajalkattige30 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

frontend: Fix audio mixer preview for groups and subscenes #13509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions frontend/widgets/AudioMixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,13 @@ void AudioMixer::updatePreviewSources()
return;
}

if (!previewScene) {
return;
}
auto previewEnum = [](obs_scene_t *scene, obs_sceneitem_t *item, void *data) -> bool {
return (*static_cast<std::function<bool(obs_scene_t *, obs_sceneitem_t *)> *>(data))(scene, item);
};

std::function<bool(obs_scene_t *, obs_sceneitem_t *)> getPreviewSources =
[&](obs_scene_t * /* scene */, obs_sceneitem_t *item) -> bool {

auto getPreviewSources = [this](obs_scene_t *, obs_sceneitem_t *item) {
if (!obs_sceneitem_visible(item)) {
return true;
}
Expand All @@ -424,6 +426,22 @@ void AudioMixer::updatePreviewSources()
return true;
}

obs_scene_t *subScene = nullptr;

if(obs_source_is_group(source)) {
subScene = obs_group_from_source(source);
}
else {
subScene = obs_scene_from_source(source);
}

if(subScene) {
{
OBSSource safeSource = source; // Automatically adds a reference safely
obs_scene_enum_items(subScene, previewEnum, &getPreviewSources);
}
}

uint32_t flags = obs_source_get_output_flags(source);
if ((flags & OBS_SOURCE_AUDIO) == 0) {
return true;
Expand All @@ -441,12 +459,6 @@ void AudioMixer::updatePreviewSources()
return true;
};

using getPreviewSources_t = decltype(getPreviewSources);

auto previewEnum = [](obs_scene_t *scene, obs_sceneitem_t *item, void *data) -> bool {
return (*static_cast<getPreviewSources_t *>(data))(scene, item);
};

obs_scene_enum_items(previewScene, previewEnum, &getPreviewSources);
}
}
Expand Down