diff --git a/src/headers/utility.hpp b/src/headers/utility.hpp index 9020caa5..77116296 100644 --- a/src/headers/utility.hpp +++ b/src/headers/utility.hpp @@ -64,7 +64,8 @@ void populateTransitionSelection(QComboBox *sel, bool addCurrent = true, bool addAny = false); void populateWindowSelection(QComboBox *sel, bool addSelect = true); void populateAudioSelection(QComboBox *sel, bool addSelect = true); -void populateVideoSelection(QComboBox *sel, bool addSelect = true); +void populateVideoSelection(QComboBox *sel, bool addScenes = false, + bool addSelect = true); void populateMediaSelection(QComboBox *sel, bool addSelect = true); void populateProcessSelection(QComboBox *sel, bool addSelect = true); void populateSourceSelection(QComboBox *list, bool addSelect = true); diff --git a/src/macro-action-screenshot.cpp b/src/macro-action-screenshot.cpp index 6757bd5d..97a1f8af 100644 --- a/src/macro-action-screenshot.cpp +++ b/src/macro-action-screenshot.cpp @@ -62,7 +62,7 @@ MacroActionScreenshotEdit::MacroActionScreenshotEdit( : QWidget(parent) { _sources = new QComboBox(); - populateVideoSelection(_sources, false); + populateVideoSelection(_sources, true, false); addOBSMainOutputEntry(_sources); QWidget::connect(_sources, SIGNAL(currentTextChanged(const QString &)), diff --git a/src/utility.cpp b/src/utility.cpp index 61d1ecc5..9e4ee274 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -594,7 +594,7 @@ void populateAudioSelection(QComboBox *sel, bool addSelect) sel->setCurrentIndex(0); } -void populateVideoSelection(QComboBox *sel, bool addSelect) +void populateVideoSelection(QComboBox *sel, bool addScenes, bool addSelect) { auto sourceEnum = [](void *data, obs_source_t *source) -> bool /* -- */ @@ -616,6 +616,11 @@ void populateVideoSelection(QComboBox *sel, bool addSelect) sel->addItem(source.c_str()); } + if (addScenes) { + populateSceneSelection(sel, false, false, false, false, nullptr, + false); + } + sel->model()->sort(0); if (addSelect) { addSelectionEntry(