Enable screenshots of scenes

This commit is contained in:
WarmUpTill
2021-11-27 17:03:49 +01:00
committed by WarmUpTill
parent 2d70fbac36
commit 949e26781a
3 changed files with 9 additions and 3 deletions

View File

@@ -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);

View File

@@ -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 &)),

View File

@@ -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(