Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-21 16:55:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename main SceneSwitcher widget to AdvSceneSwitcher

Browse Source
This commit is contained in:
WarmUpTill
2020-10-18 17:18:21 +02:00
parent 6c5c861514
commit 986422ca83
19 changed files with 164 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forms/advanced-scene-switcher.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SceneSwitcher</class>
<widget class="QDialog" name="SceneSwitcher">
<class>AdvSceneSwitcher</class>
<widget class="QDialog" name="AdvSceneSwitcher">
<property name="geometry">
<rect>
<x>0</x>

35
src/advanced-scene-switcher.cpp
View File

@@ -26,8 +26,8 @@ SwitcherData *switcher = nullptr;
/********************************************************************************
* Create the Advanced Scene Switcher settings window
********************************************************************************/
SceneSwitcher::SceneSwitcher(QWidget *parent)
: QDialog(parent), ui(new Ui_SceneSwitcher)
AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent)
: QDialog(parent), ui(new Ui_AdvSceneSwitcher)
{
ui->setupUi(this);
@@ -37,7 +37,7 @@ SceneSwitcher::SceneSwitcher(QWidget *parent)
loadUI();
}
void SceneSwitcher::loadUI()
void AdvSceneSwitcher::loadUI()
{
#if __APPLE__
setMinimumHeight(700);
@@ -83,8 +83,8 @@ void addSelectionEntry(QComboBox *sel, const char *description,
firstItem->setEnabled(false);
}
void SceneSwitcher::populateSceneSelection(QComboBox *sel, bool addPrevious,
bool addSelect)
void AdvSceneSwitcher::populateSceneSelection(QComboBox *sel, bool addPrevious,
bool addSelect)
{
if (addSelect)
addSelectionEntry(sel, "--select scene--",
@@ -102,7 +102,8 @@ void SceneSwitcher::populateSceneSelection(QComboBox *sel, bool addPrevious,
sel->addItem(previous_scene_name);
}
void SceneSwitcher::populateTransitionSelection(QComboBox *sel, bool addSelect)
void AdvSceneSwitcher::populateTransitionSelection(QComboBox *sel,
bool addSelect)
{
if (addSelect)
addSelectionEntry(sel, "--select transition--");
@@ -119,7 +120,7 @@ void SceneSwitcher::populateTransitionSelection(QComboBox *sel, bool addSelect)
obs_frontend_source_list_free(transitions);
}
void SceneSwitcher::populateWindowSelection(QComboBox *sel, bool addSelect)
void AdvSceneSwitcher::populateWindowSelection(QComboBox *sel, bool addSelect)
{
if (addSelect)
addSelectionEntry(sel, "--select window--");
@@ -133,7 +134,7 @@ void SceneSwitcher::populateWindowSelection(QComboBox *sel, bool addSelect)
}
}
void SceneSwitcher::populateAudioSelection(QComboBox *sel, bool addSelect)
void AdvSceneSwitcher::populateAudioSelection(QComboBox *sel, bool addSelect)
{
if (addSelect)
addSelectionEntry(sel, "--select audio source--",
@@ -154,7 +155,7 @@ void SceneSwitcher::populateAudioSelection(QComboBox *sel, bool addSelect)
obs_enum_sources(sourceEnum, sel);
}
void SceneSwitcher::populateMediaSelection(QComboBox *sel, bool addSelect)
void AdvSceneSwitcher::populateMediaSelection(QComboBox *sel, bool addSelect)
{
if (addSelect)
addSelectionEntry(sel, "--select media source--",
@@ -175,7 +176,7 @@ void SceneSwitcher::populateMediaSelection(QComboBox *sel, bool addSelect)
obs_enum_sources(sourceEnum, sel);
}
void SceneSwitcher::populateProcessSelection(QComboBox *sel, bool addSelect)
void AdvSceneSwitcher::populateProcessSelection(QComboBox *sel, bool addSelect)
{
if (addSelect)
addSelectionEntry(sel, "--select process--");
@@ -186,7 +187,7 @@ void SceneSwitcher::populateProcessSelection(QComboBox *sel, bool addSelect)
sel->addItem(process);
}
bool SceneSwitcher::listMoveUp(QListWidget *list)
bool AdvSceneSwitcher::listMoveUp(QListWidget *list)
{
int index = list->currentRow();
if (index == -1 || index == 0)
@@ -203,7 +204,7 @@ bool SceneSwitcher::listMoveUp(QListWidget *list)
return true;
}
bool SceneSwitcher::listMoveDown(QListWidget *list)
bool AdvSceneSwitcher::listMoveDown(QListWidget *list)
{
int index = list->currentRow();
if (index == -1 || index == list->count() - 1)
@@ -220,10 +221,10 @@ bool SceneSwitcher::listMoveDown(QListWidget *list)
return true;
}
QMetaObject::Connection SceneSwitcher::PulseWidget(QWidget *widget,
QColor endColor,
QColor startColor,
QString specifier)
QMetaObject::Connection AdvSceneSwitcher::PulseWidget(QWidget *widget,
QColor endColor,
QColor startColor,
QString specifier)
{
if (switcher->disableHints)
return QMetaObject::Connection();
@@ -584,7 +585,7 @@ extern "C" void InitSceneSwitcher()
QMainWindow *window =
(QMainWindow *)obs_frontend_get_main_window();
SceneSwitcher ss(window);
AdvSceneSwitcher ss(window);
ss.exec();
};

55
src/general.cpp
View File

@@ -7,12 +7,12 @@
QMetaObject::Connection inactivePluse;
void SceneSwitcher::on_close_clicked()
void AdvSceneSwitcher::on_close_clicked()
{
done(0);
}
void SceneSwitcher::UpdateNonMatchingScene(const QString &name)
void AdvSceneSwitcher::UpdateNonMatchingScene(const QString &name)
{
obs_source_t *scene = obs_get_source_by_name(name.toUtf8().constData());
obs_weak_source_t *ws = obs_source_get_weak_source(scene);
@@ -23,7 +23,7 @@ void SceneSwitcher::UpdateNonMatchingScene(const QString &name)
obs_source_release(scene);
}
void SceneSwitcher::on_noMatchDontSwitch_clicked()
void AdvSceneSwitcher::on_noMatchDontSwitch_clicked()
{
if (loading)
return;
@@ -34,7 +34,7 @@ void SceneSwitcher::on_noMatchDontSwitch_clicked()
ui->randomDisabledWarning->setVisible(true);
}
void SceneSwitcher::on_noMatchSwitch_clicked()
void AdvSceneSwitcher::on_noMatchSwitch_clicked()
{
if (loading)
return;
@@ -46,7 +46,7 @@ void SceneSwitcher::on_noMatchSwitch_clicked()
ui->randomDisabledWarning->setVisible(true);
}
void SceneSwitcher::on_noMatchRandomSwitch_clicked()
void AdvSceneSwitcher::on_noMatchRandomSwitch_clicked()
{
if (loading)
return;
@@ -57,7 +57,7 @@ void SceneSwitcher::on_noMatchRandomSwitch_clicked()
ui->randomDisabledWarning->setVisible(false);
}
void SceneSwitcher::on_startupBehavior_currentIndexChanged(int index)
void AdvSceneSwitcher::on_startupBehavior_currentIndexChanged(int index)
{
if (loading)
return;
@@ -66,7 +66,8 @@ void SceneSwitcher::on_startupBehavior_currentIndexChanged(int index)
switcher->startupBehavior = (StartupBehavior)index;
}
void SceneSwitcher::on_noMatchSwitchScene_currentTextChanged(const QString &text)
void AdvSceneSwitcher::on_noMatchSwitchScene_currentTextChanged(
const QString &text)
{
if (loading)
return;
@@ -75,7 +76,7 @@ void SceneSwitcher::on_noMatchSwitchScene_currentTextChanged(const QString &text
UpdateNonMatchingScene(text);
}
void SceneSwitcher::on_checkInterval_valueChanged(int value)
void AdvSceneSwitcher::on_checkInterval_valueChanged(int value)
{
if (loading)
return;
@@ -84,14 +85,14 @@ void SceneSwitcher::on_checkInterval_valueChanged(int value)
switcher->interval = value;
}
void SceneSwitcher::SetStarted()
void AdvSceneSwitcher::SetStarted()
{
ui->toggleStartButton->setText("Stop");
ui->pluginRunningText->setText("Active");
ui->pluginRunningText->disconnect(inactivePluse);
}
void SceneSwitcher::SetStopped()
void AdvSceneSwitcher::SetStopped()
{
ui->toggleStartButton->setText("Start");
ui->pluginRunningText->setText("Inactive");
@@ -99,7 +100,7 @@ void SceneSwitcher::SetStopped()
QColor(0, 0, 0, 0), "QLabel ");
}
void SceneSwitcher::on_toggleStartButton_clicked()
void AdvSceneSwitcher::on_toggleStartButton_clicked()
{
if (switcher->th && switcher->th->isRunning()) {
switcher->Stop();
@@ -110,12 +111,12 @@ void SceneSwitcher::on_toggleStartButton_clicked()
}
}
void SceneSwitcher::closeEvent(QCloseEvent *)
void AdvSceneSwitcher::closeEvent(QCloseEvent *)
{
obs_frontend_save();
}
void SceneSwitcher::on_autoStopScenes_currentTextChanged(const QString &text)
void AdvSceneSwitcher::on_autoStopScenes_currentTextChanged(const QString &text)
{
if (loading)
return;
@@ -124,7 +125,7 @@ void SceneSwitcher::on_autoStopScenes_currentTextChanged(const QString &text)
UpdateAutoStopScene(text);
}
void SceneSwitcher::on_autoStopSceneCheckBox_stateChanged(int state)
void AdvSceneSwitcher::on_autoStopSceneCheckBox_stateChanged(int state)
{
if (loading)
return;
@@ -141,7 +142,7 @@ void SceneSwitcher::on_autoStopSceneCheckBox_stateChanged(int state)
}
}
void SceneSwitcher::UpdateAutoStopScene(const QString &name)
void AdvSceneSwitcher::UpdateAutoStopScene(const QString &name)
{
obs_source_t *scene = obs_get_source_by_name(name.toUtf8().constData());
obs_weak_source_t *ws = obs_source_get_weak_source(scene);
@@ -167,7 +168,7 @@ void SwitcherData::autoStopStreamAndRecording()
obs_weak_source_release(ws);
}
void SceneSwitcher::on_autoStartType_currentIndexChanged(int index)
void AdvSceneSwitcher::on_autoStartType_currentIndexChanged(int index)
{
if (loading)
return;
@@ -175,7 +176,7 @@ void SceneSwitcher::on_autoStartType_currentIndexChanged(int index)
switcher->autoStartType = (AutoStartType)index;
}
void SceneSwitcher::on_autoStartScenes_currentTextChanged(const QString &text)
void AdvSceneSwitcher::on_autoStartScenes_currentTextChanged(const QString &text)
{
if (loading)
return;
@@ -184,7 +185,7 @@ void SceneSwitcher::on_autoStartScenes_currentTextChanged(const QString &text)
UpdateAutoStartScene(text);
}
void SceneSwitcher::on_autoStartSceneCheckBox_stateChanged(int state)
void AdvSceneSwitcher::on_autoStartSceneCheckBox_stateChanged(int state)
{
if (loading)
return;
@@ -204,7 +205,7 @@ void SceneSwitcher::on_autoStartSceneCheckBox_stateChanged(int state)
}
}
void SceneSwitcher::UpdateAutoStartScene(const QString &name)
void AdvSceneSwitcher::UpdateAutoStartScene(const QString &name)
{
obs_source_t *scene = obs_get_source_by_name(name.toUtf8().constData());
obs_weak_source_t *ws = obs_source_get_weak_source(scene);
@@ -239,21 +240,21 @@ void SwitcherData::autoStartStreamRecording()
autoStartedRecently = true;
}
void SceneSwitcher::on_verboseLogging_stateChanged(int state)
void AdvSceneSwitcher::on_verboseLogging_stateChanged(int state)
{
if (loading)
return;
switcher->verbose = state;
}
void SceneSwitcher::on_uiHintsDisable_stateChanged(int state)
void AdvSceneSwitcher::on_uiHintsDisable_stateChanged(int state)
{
if (loading)
return;
switcher->disableHints = state;
}
void SceneSwitcher::on_exportSettings_clicked()
void AdvSceneSwitcher::on_exportSettings_clicked()
{
QString directory = QFileDialog::getSaveFileName(
this, tr("Export Advanced Scene Switcher settings to file ..."),
@@ -287,7 +288,7 @@ void SceneSwitcher::on_exportSettings_clicked()
obs_data_release(obj);
}
void SceneSwitcher::on_importSettings_clicked()
void AdvSceneSwitcher::on_importSettings_clicked()
{
std::lock_guard<std::mutex> lock(switcher->m);
@@ -397,7 +398,7 @@ int findTabIndex(QTabBar *bar, int pos)
return at;
}
void SceneSwitcher::setTabOrder()
void AdvSceneSwitcher::setTabOrder()
{
QTabBar *bar = ui->tabWidget->tabBar();
for (int i = 0; i < bar->count(); ++i) {
@@ -407,10 +408,10 @@ void SceneSwitcher::setTabOrder()
bar->moveTab(curPos, i);
}
connect(bar, &QTabBar::tabMoved, this, &SceneSwitcher::on_tabMoved);
connect(bar, &QTabBar::tabMoved, this, &AdvSceneSwitcher::on_tabMoved);
}
void SceneSwitcher::on_tabMoved(int from, int to)
void AdvSceneSwitcher::on_tabMoved(int from, int to)
{
if (loading)
return;
@@ -605,7 +606,7 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
(int)(obs_data_get_int(obj, "audioTabPos")));
}
void SceneSwitcher::setupGeneralTab()
void AdvSceneSwitcher::setupGeneralTab()
{
populateSceneSelection(ui->noMatchSwitchScene, false);
populateSceneSelection(ui->autoStopScenes, false);

6
src/headers/advanced-scene-switcher.hpp
View File

@@ -19,14 +19,14 @@ class QCloseEvent;
/*******************************************************************************
* Advanced Scene Switcher window
*******************************************************************************/
class SceneSwitcher : public QDialog {
class AdvSceneSwitcher : public QDialog {
Q_OBJECT
public:
std::unique_ptr<Ui_SceneSwitcher> ui;
std::unique_ptr<Ui_AdvSceneSwitcher> ui;
bool loading = true;
SceneSwitcher(QWidget *parent);
AdvSceneSwitcher(QWidget *parent);
void closeEvent(QCloseEvent *event) override;

2
src/headers/switch-generic.hpp
View File

@@ -16,7 +16,7 @@ struct SceneSwitcherEntry {
inline SceneSwitcherEntry(OBSWeakSource scene_,
OBSWeakSource transition_,
bool usePreviousScene_ = true)
bool usePreviousScene_ = false)
: scene(scene_),
transition(transition_),
usePreviousScene(usePreviousScene_)

12
src/switch-audio.cpp
View File

@@ -9,7 +9,7 @@
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_audioAdd_clicked()
void AdvSceneSwitcher::on_audioAdd_clicked()
{
ui->audioAdd->disconnect(addPulse);
@@ -25,7 +25,7 @@ void SceneSwitcher::on_audioAdd_clicked()
ui->audioSwitches->setItemWidget(item, sw);
}
void SceneSwitcher::on_audioRemove_clicked()
void AdvSceneSwitcher::on_audioRemove_clicked()
{
QListWidgetItem *item = ui->audioSwitches->currentItem();
if (!item)
@@ -41,7 +41,7 @@ void SceneSwitcher::on_audioRemove_clicked()
delete item;
}
void SceneSwitcher::on_audioUp_clicked()
void AdvSceneSwitcher::on_audioUp_clicked()
{
int index = ui->audioSwitches->currentRow();
if (!listMoveUp(ui->audioSwitches))
@@ -61,7 +61,7 @@ void SceneSwitcher::on_audioUp_clicked()
switcher->audioSwitches[index - 1]);
}
void SceneSwitcher::on_audioDown_clicked()
void AdvSceneSwitcher::on_audioDown_clicked()
{
int index = ui->audioSwitches->currentRow();
@@ -180,7 +180,7 @@ void SwitcherData::loadAudioSwitches(obs_data_t *obj)
obs_data_array_release(audioArray);
}
void SceneSwitcher::setupAudioTab()
void AdvSceneSwitcher::setupAudioTab()
{
for (auto &s : switcher->audioSwitches) {
QListWidgetItem *item;
@@ -353,7 +353,7 @@ AudioSwitchWidget::AudioSwitchWidget(AudioSwitch *s) : SwitchWidget(s)
SIGNAL(currentTextChanged(const QString &)), this,
SLOT(SourceChanged(const QString &)));
SceneSwitcher::populateAudioSelection(audioSources);
AdvSceneSwitcher::populateAudioSelection(audioSources);
if (s) {
audioSources->setCurrentText(

12
src/switch-executable.cpp
View File

@@ -2,7 +2,7 @@
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_executableAdd_clicked()
void AdvSceneSwitcher::on_executableAdd_clicked()
{
ui->executableAdd->disconnect(addPulse);
@@ -18,7 +18,7 @@ void SceneSwitcher::on_executableAdd_clicked()
ui->executables->setItemWidget(item, sw);
}
void SceneSwitcher::on_executableRemove_clicked()
void AdvSceneSwitcher::on_executableRemove_clicked()
{
QListWidgetItem *item = ui->executables->currentItem();
if (!item)
@@ -34,7 +34,7 @@ void SceneSwitcher::on_executableRemove_clicked()
delete item;
}
void SceneSwitcher::on_executableUp_clicked()
void AdvSceneSwitcher::on_executableUp_clicked()
{
int index = ui->executables->currentRow();
if (!listMoveUp(ui->executables))
@@ -54,7 +54,7 @@ void SceneSwitcher::on_executableUp_clicked()
switcher->executableSwitches[index - 1]);
}
void SceneSwitcher::on_executableDown_clicked()
void AdvSceneSwitcher::on_executableDown_clicked()
{
int index = ui->executables->currentRow();
@@ -187,7 +187,7 @@ void SwitcherData::loadExecutableSwitches(obs_data_t *obj)
obs_data_array_release(executableArray);
}
void SceneSwitcher::setupExecutableTab()
void AdvSceneSwitcher::setupExecutableTab()
{
for (auto &s : switcher->executableSwitches) {
QListWidgetItem *item;
@@ -217,7 +217,7 @@ ExecutableSwitchWidget::ExecutableSwitchWidget(ExecutableSwitch *s)
QWidget::connect(requiresFocus, SIGNAL(stateChanged(int)), this,
SLOT(FocusChanged(int)));
SceneSwitcher::populateProcessSelection(processes);
AdvSceneSwitcher::populateProcessSelection(processes);
if (s) {
processes->setCurrentText(s->exe);

26
src/switch-file.cpp
View File

@@ -9,7 +9,7 @@
#define LOCAL_FILE_IDX 0
#define REMOTE_FILE_IDX 1
void SceneSwitcher::on_browseButton_clicked()
void AdvSceneSwitcher::on_browseButton_clicked()
{
QString path = QFileDialog::getOpenFileName(
this, tr("Select a file to write to ..."), QDir::currentPath(),
@@ -18,7 +18,7 @@ void SceneSwitcher::on_browseButton_clicked()
ui->writePathLineEdit->setText(path);
}
void SceneSwitcher::on_readFileCheckBox_stateChanged(int state)
void AdvSceneSwitcher::on_readFileCheckBox_stateChanged(int state)
{
if (loading)
return;
@@ -35,7 +35,7 @@ void SceneSwitcher::on_readFileCheckBox_stateChanged(int state)
}
}
void SceneSwitcher::on_readPathLineEdit_textChanged(const QString &text)
void AdvSceneSwitcher::on_readPathLineEdit_textChanged(const QString &text)
{
if (loading)
return;
@@ -49,7 +49,7 @@ void SceneSwitcher::on_readPathLineEdit_textChanged(const QString &text)
switcher->fileIO.readPath = text.toUtf8().constData();
}
void SceneSwitcher::on_writePathLineEdit_textChanged(const QString &text)
void AdvSceneSwitcher::on_writePathLineEdit_textChanged(const QString &text)
{
if (loading)
return;
@@ -63,7 +63,7 @@ void SceneSwitcher::on_writePathLineEdit_textChanged(const QString &text)
switcher->fileIO.writePath = text.toUtf8().constData();
}
void SceneSwitcher::on_browseButton_2_clicked()
void AdvSceneSwitcher::on_browseButton_2_clicked()
{
QString path = QFileDialog::getOpenFileName(
this, tr("Select a file to read from ..."), QDir::currentPath(),
@@ -223,7 +223,7 @@ void SwitcherData::checkFileContent(bool &match, OBSWeakSource &scene,
}
}
void SceneSwitcher::on_browseButton_3_clicked()
void AdvSceneSwitcher::on_browseButton_3_clicked()
{
QString path = QFileDialog::getOpenFileName(
this, tr("Select a file to read from ..."), QDir::currentPath(),
@@ -232,7 +232,7 @@ void SceneSwitcher::on_browseButton_3_clicked()
ui->filePathLineEdit->setText(path);
}
void SceneSwitcher::on_fileType_currentIndexChanged(int idx)
void AdvSceneSwitcher::on_fileType_currentIndexChanged(int idx)
{
if (idx == -1)
return;
@@ -248,7 +248,7 @@ void SceneSwitcher::on_fileType_currentIndexChanged(int idx)
}
}
void SceneSwitcher::on_fileAdd_clicked()
void AdvSceneSwitcher::on_fileAdd_clicked()
{
QString sceneName = ui->fileScenes->currentText();
QString transitionName = ui->fileTransitions->currentText();
@@ -280,7 +280,7 @@ void SceneSwitcher::on_fileAdd_clicked()
useRegex, useTime);
}
void SceneSwitcher::on_fileRemove_clicked()
void AdvSceneSwitcher::on_fileRemove_clicked()
{
QListWidgetItem *item = ui->fileScenesList->currentItem();
if (!item)
@@ -299,7 +299,7 @@ void SceneSwitcher::on_fileRemove_clicked()
qDeleteAll(ui->fileScenesList->selectedItems());
}
void SceneSwitcher::on_fileScenesList_currentRowChanged(int idx)
void AdvSceneSwitcher::on_fileScenesList_currentRowChanged(int idx)
{
if (loading)
return;
@@ -327,7 +327,7 @@ void SceneSwitcher::on_fileScenesList_currentRowChanged(int idx)
ui->fileContentTimeCheckBox->setChecked(s.useTime);
}
void SceneSwitcher::on_fileUp_clicked()
void AdvSceneSwitcher::on_fileUp_clicked()
{
int index = ui->fileScenesList->currentRow();
if (index != -1 && index != 0) {
@@ -342,7 +342,7 @@ void SceneSwitcher::on_fileUp_clicked()
}
}
void SceneSwitcher::on_fileDown_clicked()
void AdvSceneSwitcher::on_fileDown_clicked()
{
int index = ui->fileScenesList->currentRow();
if (index != -1 && index != ui->fileScenesList->count() - 1) {
@@ -431,7 +431,7 @@ void SwitcherData::loadFileSwitches(obs_data_t *obj)
switcher->fileIO.writePath = obs_data_get_string(obj, "writePath");
}
void SceneSwitcher::setupFileTab()
void AdvSceneSwitcher::setupFileTab()
{
populateSceneSelection(ui->fileScenes, false);
populateTransitionSelection(ui->fileTransitions);

8
src/switch-generic.cpp
View File

@@ -20,8 +20,8 @@ void SceneSwitcherEntry::logMatch()
obs_source_t *s = obs_weak_source_get_source(scene);
const char *sceneName = obs_source_get_name(s);
obs_source_release(s);
blog(LOG_INFO, "match for '%s' - switch to scene '%s'",
getType(), sceneName);
blog(LOG_INFO, "match for '%s' - switch to scene '%s'", getType(),
sceneName);
}
SwitchWidget::SwitchWidget(SceneSwitcherEntry *s, bool usePreviousScene)
@@ -35,8 +35,8 @@ SwitchWidget::SwitchWidget(SceneSwitcherEntry *s, bool usePreviousScene)
SIGNAL(currentTextChanged(const QString &)), this,
SLOT(TransitionChanged(const QString &)));
SceneSwitcher::populateSceneSelection(scenes, usePreviousScene);
SceneSwitcher::populateTransitionSelection(transitions);
AdvSceneSwitcher::populateSceneSelection(scenes, usePreviousScene);
AdvSceneSwitcher::populateTransitionSelection(transitions);
if (s) {
scenes->setCurrentText(GetWeakSourceName(s->scene).c_str());

22
src/switch-idle.cpp
View File

@@ -50,7 +50,7 @@ void SwitcherData::checkIdleSwitch(bool &match, OBSWeakSource &scene,
idleData.alreadySwitched = false;
}
void SceneSwitcher::on_idleCheckBox_stateChanged(int state)
void AdvSceneSwitcher::on_idleCheckBox_stateChanged(int state)
{
if (loading)
return;
@@ -74,13 +74,13 @@ void SceneSwitcher::on_idleCheckBox_stateChanged(int state)
}
}
void SceneSwitcher::UpdateIdleDataTransition(const QString &name)
void AdvSceneSwitcher::UpdateIdleDataTransition(const QString &name)
{
obs_weak_source_t *transition = GetWeakTransitionByQString(name);
switcher->idleData.transition = transition;
}
void SceneSwitcher::UpdateIdleDataScene(const QString &name)
void AdvSceneSwitcher::UpdateIdleDataScene(const QString &name)
{
switcher->idleData.usePreviousScene = (name == previous_scene_name);
obs_source_t *scene = obs_get_source_by_name(name.toUtf8().constData());
@@ -92,7 +92,7 @@ void SceneSwitcher::UpdateIdleDataScene(const QString &name)
obs_source_release(scene);
}
void SceneSwitcher::on_idleTransitions_currentTextChanged(const QString &text)
void AdvSceneSwitcher::on_idleTransitions_currentTextChanged(const QString &text)
{
if (loading)
return;
@@ -101,7 +101,7 @@ void SceneSwitcher::on_idleTransitions_currentTextChanged(const QString &text)
UpdateIdleDataTransition(text);
}
void SceneSwitcher::on_idleScenes_currentTextChanged(const QString &text)
void AdvSceneSwitcher::on_idleScenes_currentTextChanged(const QString &text)
{
if (loading)
return;
@@ -110,7 +110,7 @@ void SceneSwitcher::on_idleScenes_currentTextChanged(const QString &text)
UpdateIdleDataScene(text);
}
void SceneSwitcher::on_idleSpinBox_valueChanged(int i)
void AdvSceneSwitcher::on_idleSpinBox_valueChanged(int i)
{
if (loading)
return;
@@ -118,7 +118,7 @@ void SceneSwitcher::on_idleSpinBox_valueChanged(int i)
switcher->idleData.time = i;
}
void SceneSwitcher::on_ignoreIdleWindows_currentRowChanged(int idx)
void AdvSceneSwitcher::on_ignoreIdleWindows_currentRowChanged(int idx)
{
if (loading)
return;
@@ -138,7 +138,7 @@ void SceneSwitcher::on_ignoreIdleWindows_currentRowChanged(int idx)
}
}
void SceneSwitcher::on_ignoreIdleAdd_clicked()
void AdvSceneSwitcher::on_ignoreIdleAdd_clicked()
{
QString windowName = ui->ignoreIdleWindowsWindows->currentText();
@@ -162,7 +162,7 @@ void SceneSwitcher::on_ignoreIdleAdd_clicked()
}
}
void SceneSwitcher::on_ignoreIdleRemove_clicked()
void AdvSceneSwitcher::on_ignoreIdleRemove_clicked()
{
QListWidgetItem *item = ui->ignoreIdleWindows->currentItem();
if (!item)
@@ -187,7 +187,7 @@ void SceneSwitcher::on_ignoreIdleRemove_clicked()
delete item;
}
int SceneSwitcher::IgnoreIdleWindowsFindByData(const QString &window)
int AdvSceneSwitcher::IgnoreIdleWindowsFindByData(const QString &window)
{
int count = ui->ignoreIdleWindows->count();
int idx = -1;
@@ -264,7 +264,7 @@ void SwitcherData::loadIdleSwitches(obs_data_t *obj)
(idleSceneName == previous_scene_name);
}
void SceneSwitcher::setupIdleTab()
void AdvSceneSwitcher::setupIdleTab()
{
populateSceneSelection(ui->idleScenes, true);
populateTransitionSelection(ui->idleTransitions);

13
src/switch-media.cpp
View File

@@ -2,7 +2,7 @@
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_mediaAdd_clicked()
void AdvSceneSwitcher::on_mediaAdd_clicked()
{
ui->mediaAdd->disconnect(addPulse);
@@ -18,7 +18,7 @@ void SceneSwitcher::on_mediaAdd_clicked()
ui->mediaSwitches->setItemWidget(item, sw);
}
void SceneSwitcher::on_mediaRemove_clicked()
void AdvSceneSwitcher::on_mediaRemove_clicked()
{
QListWidgetItem *item = ui->mediaSwitches->currentItem();
if (!item)
@@ -34,7 +34,7 @@ void SceneSwitcher::on_mediaRemove_clicked()
delete item;
}
void SceneSwitcher::on_mediaUp_clicked()
void AdvSceneSwitcher::on_mediaUp_clicked()
{
int index = ui->mediaSwitches->currentRow();
if (!listMoveUp(ui->mediaSwitches))
@@ -54,7 +54,7 @@ void SceneSwitcher::on_mediaUp_clicked()
switcher->mediaSwitches[index - 1]);
}
void SceneSwitcher::on_mediaDown_clicked()
void AdvSceneSwitcher::on_mediaDown_clicked()
{
int index = ui->mediaSwitches->currentRow();
@@ -81,6 +81,7 @@ void SwitcherData::checkMediaSwitch(bool &match, OBSWeakSource &scene,
for (MediaSwitch &mediaSwitch : mediaSwitches) {
if (!mediaSwitch.initialized())
continue;
OBSSource source =
obs_weak_source_get_source(mediaSwitch.source);
auto duration = obs_source_media_get_duration(source);
@@ -185,7 +186,7 @@ void SwitcherData::loadMediaSwitches(obs_data_t *obj)
obs_data_array_release(mediaArray);
}
void SceneSwitcher::setupMediaTab()
void AdvSceneSwitcher::setupMediaTab()
{
for (auto &s : switcher->mediaSwitches) {
QListWidgetItem *item;
@@ -259,7 +260,7 @@ MediaSwitchWidget::MediaSwitchWidget(MediaSwitch *s) : SwitchWidget(s)
QWidget::connect(time, SIGNAL(valueChanged(int)), this,
SLOT(TimeChanged(int)));
SceneSwitcher::populateMediaSelection(meidaSources);
AdvSceneSwitcher::populateMediaSelection(meidaSources);
populateMediaStates(states);
populateTimeRestrictions(timeRestrictions);

18
src/switch-pause.cpp
View File

@@ -2,7 +2,7 @@
#include "headers/advanced-scene-switcher.hpp"
void SceneSwitcher::on_pauseScenesAdd_clicked()
void AdvSceneSwitcher::on_pauseScenesAdd_clicked()
{
QString sceneName = ui->pauseScenesScenes->currentText();
@@ -26,7 +26,7 @@ void SceneSwitcher::on_pauseScenesAdd_clicked()
}
}
void SceneSwitcher::on_pauseScenesRemove_clicked()
void AdvSceneSwitcher::on_pauseScenesRemove_clicked()
{
QListWidgetItem *item = ui->pauseScenes->currentItem();
if (!item)
@@ -51,7 +51,7 @@ void SceneSwitcher::on_pauseScenesRemove_clicked()
delete item;
}
void SceneSwitcher::on_pauseWindowsAdd_clicked()
void AdvSceneSwitcher::on_pauseWindowsAdd_clicked()
{
QString windowName = ui->pauseWindowsWindows->currentText();
@@ -75,7 +75,7 @@ void SceneSwitcher::on_pauseWindowsAdd_clicked()
}
}
void SceneSwitcher::on_pauseWindowsRemove_clicked()
void AdvSceneSwitcher::on_pauseWindowsRemove_clicked()
{
QListWidgetItem *item = ui->pauseWindows->currentItem();
if (!item)
@@ -100,7 +100,7 @@ void SceneSwitcher::on_pauseWindowsRemove_clicked()
delete item;
}
void SceneSwitcher::on_pauseScenes_currentRowChanged(int idx)
void AdvSceneSwitcher::on_pauseScenes_currentRowChanged(int idx)
{
if (loading)
return;
@@ -121,7 +121,7 @@ void SceneSwitcher::on_pauseScenes_currentRowChanged(int idx)
}
}
void SceneSwitcher::on_pauseWindows_currentRowChanged(int idx)
void AdvSceneSwitcher::on_pauseWindows_currentRowChanged(int idx)
{
if (loading)
return;
@@ -141,7 +141,7 @@ void SceneSwitcher::on_pauseWindows_currentRowChanged(int idx)
}
}
int SceneSwitcher::PauseScenesFindByData(const QString &scene)
int AdvSceneSwitcher::PauseScenesFindByData(const QString &scene)
{
int count = ui->pauseScenes->count();
int idx = -1;
@@ -159,7 +159,7 @@ int SceneSwitcher::PauseScenesFindByData(const QString &scene)
return idx;
}
int SceneSwitcher::PauseWindowsFindByData(const QString &window)
int AdvSceneSwitcher::PauseWindowsFindByData(const QString &window)
{
int count = ui->pauseWindows->count();
int idx = -1;
@@ -300,7 +300,7 @@ void SwitcherData::loadPauseSwitches(obs_data_t *obj)
obs_data_array_release(pauseWindowsArray);
}
void SceneSwitcher::setupPauseTab()
void AdvSceneSwitcher::setupPauseTab()
{
populateSceneSelection(ui->pauseScenesScenes, false);
populateWindowSelection(ui->pauseWindowsWindows);

6
src/switch-priority.cpp
View File

@@ -2,7 +2,7 @@
#include "headers/advanced-scene-switcher.hpp"
void SceneSwitcher::on_threadPriority_currentTextChanged(const QString &text)
void AdvSceneSwitcher::on_threadPriority_currentTextChanged(const QString &text)
{
if (loading || ui->threadPriority->count() !=
(int)switcher->threadPriorities.size())
@@ -18,7 +18,7 @@ void SceneSwitcher::on_threadPriority_currentTextChanged(const QString &text)
}
}
void SceneSwitcher::on_priorityUp_clicked()
void AdvSceneSwitcher::on_priorityUp_clicked()
{
int currentIndex = ui->priorityList->currentRow();
if (currentIndex != -1 && currentIndex != 0) {
@@ -35,7 +35,7 @@ void SceneSwitcher::on_priorityUp_clicked()
}
}
void SceneSwitcher::on_priorityDown_clicked()
void AdvSceneSwitcher::on_priorityDown_clicked()
{
int currentIndex = ui->priorityList->currentRow();
if (currentIndex != -1 &&

6
src/switch-random.cpp
View File

@@ -4,7 +4,7 @@
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_randomAdd_clicked()
void AdvSceneSwitcher::on_randomAdd_clicked()
{
ui->randomAdd->disconnect(addPulse);
@@ -20,7 +20,7 @@ void SceneSwitcher::on_randomAdd_clicked()
ui->randomSwitches->setItemWidget(item, sw);
}
void SceneSwitcher::on_randomRemove_clicked()
void AdvSceneSwitcher::on_randomRemove_clicked()
{
QListWidgetItem *item = ui->randomSwitches->currentItem();
if (!item)
@@ -118,7 +118,7 @@ void SwitcherData::loadRandomSwitches(obs_data_t *obj)
obs_data_array_release(randomArray);
}
void SceneSwitcher::setupRandomTab()
void AdvSceneSwitcher::setupRandomTab()
{
for (auto &s : switcher->randomSwitches) {
QListWidgetItem *item;

16
src/switch-screen-region.cpp
View File

@@ -24,7 +24,7 @@ void showCurrentFrame(QListWidget *list)
sw->showFrame();
}
void SceneSwitcher::on_showFrame_clicked()
void AdvSceneSwitcher::on_showFrame_clicked()
{
switcher->showFrame = !switcher->showFrame;
@@ -37,7 +37,7 @@ void SceneSwitcher::on_showFrame_clicked()
}
}
void SceneSwitcher::on_screenRegionSwitches_currentRowChanged(int idx)
void AdvSceneSwitcher::on_screenRegionSwitches_currentRowChanged(int idx)
{
UNUSED_PARAMETER(idx);
if (loading)
@@ -49,7 +49,7 @@ void SceneSwitcher::on_screenRegionSwitches_currentRowChanged(int idx)
}
}
void SceneSwitcher::on_screenRegionAdd_clicked()
void AdvSceneSwitcher::on_screenRegionAdd_clicked()
{
ui->screenRegionAdd->disconnect(addPulse);
@@ -65,7 +65,7 @@ void SceneSwitcher::on_screenRegionAdd_clicked()
ui->screenRegionSwitches->setItemWidget(item, sw);
}
void SceneSwitcher::on_screenRegionRemove_clicked()
void AdvSceneSwitcher::on_screenRegionRemove_clicked()
{
QListWidgetItem *item = ui->screenRegionSwitches->currentItem();
if (!item)
@@ -81,7 +81,7 @@ void SceneSwitcher::on_screenRegionRemove_clicked()
delete item;
}
void SceneSwitcher::on_screenRegionUp_clicked()
void AdvSceneSwitcher::on_screenRegionUp_clicked()
{
int index = ui->screenRegionSwitches->currentRow();
if (!listMoveUp(ui->screenRegionSwitches))
@@ -101,7 +101,7 @@ void SceneSwitcher::on_screenRegionUp_clicked()
switcher->screenRegionSwitches[index - 1]);
}
void SceneSwitcher::on_screenRegionDown_clicked()
void AdvSceneSwitcher::on_screenRegionDown_clicked()
{
int index = ui->screenRegionSwitches->currentRow();
@@ -149,7 +149,7 @@ void SwitcherData::checkScreenRegionSwitch(bool &match, OBSWeakSource &scene,
}
}
void SceneSwitcher::updateScreenRegionCursorPos()
void AdvSceneSwitcher::updateScreenRegionCursorPos()
{
std::pair<int, int> position = getCursorPos();
ui->cursorXPosition->setText(QString::number(position.first));
@@ -219,7 +219,7 @@ void SwitcherData::loadScreenRegionSwitches(obs_data_t *obj)
obs_data_array_release(screenRegionArray);
}
void SceneSwitcher::setupRegionTab()
void AdvSceneSwitcher::setupRegionTab()
{
for (auto &s : switcher->screenRegionSwitches) {
QListWidgetItem *item;

18
src/switch-sequence.cpp
View File

@@ -6,7 +6,7 @@
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_sceneSequenceAdd_clicked()
void AdvSceneSwitcher::on_sceneSequenceAdd_clicked()
{
ui->sceneSequenceAdd->disconnect(addPulse);
@@ -22,7 +22,7 @@ void SceneSwitcher::on_sceneSequenceAdd_clicked()
ui->sceneSequenceSwitches->setItemWidget(item, sw);
}
void SceneSwitcher::on_sceneSequenceRemove_clicked()
void AdvSceneSwitcher::on_sceneSequenceRemove_clicked()
{
QListWidgetItem *item = ui->sceneSequenceSwitches->currentItem();
if (!item)
@@ -38,7 +38,7 @@ void SceneSwitcher::on_sceneSequenceRemove_clicked()
delete item;
}
void SceneSwitcher::on_sceneSequenceUp_clicked()
void AdvSceneSwitcher::on_sceneSequenceUp_clicked()
{
int index = ui->sceneSequenceSwitches->currentRow();
if (!listMoveUp(ui->sceneSequenceSwitches))
@@ -58,7 +58,7 @@ void SceneSwitcher::on_sceneSequenceUp_clicked()
switcher->sceneSequenceSwitches[index - 1]);
}
void SceneSwitcher::on_sceneSequenceDown_clicked()
void AdvSceneSwitcher::on_sceneSequenceDown_clicked()
{
int index = ui->sceneSequenceSwitches->currentRow();
@@ -79,7 +79,7 @@ void SceneSwitcher::on_sceneSequenceDown_clicked()
switcher->sceneSequenceSwitches[index + 1]);
}
void SceneSwitcher::on_sceneSequenceSave_clicked()
void AdvSceneSwitcher::on_sceneSequenceSave_clicked()
{
QString directory = QFileDialog::getSaveFileName(
this, tr("Save Scene Sequence to file ..."),
@@ -96,7 +96,7 @@ void SceneSwitcher::on_sceneSequenceSave_clicked()
obs_data_release(obj);
}
void SceneSwitcher::on_sceneSequenceLoad_clicked()
void AdvSceneSwitcher::on_sceneSequenceLoad_clicked()
{
std::lock_guard<std::mutex> lock(switcher->m);
@@ -249,7 +249,7 @@ void SwitcherData::loadSceneSequenceSwitches(obs_data_t *obj)
obs_data_array_release(sceneSequenceArray);
}
void SceneSwitcher::setupSequenceTab()
void AdvSceneSwitcher::setupSequenceTab()
{
for (auto &s : switcher->sceneSequenceSwitches) {
QListWidgetItem *item;
@@ -287,7 +287,7 @@ void populateDelayUnits(QComboBox *list)
list->addItem("hours");
}
SequenceWidget::SequenceWidget(SceneSequenceSwitch *s) : SwitchWidget(s, false)
SequenceWidget::SequenceWidget(SceneSequenceSwitch *s) : SwitchWidget(s)
{
delay = new QDoubleSpinBox();
delayUnits = new QComboBox();
@@ -307,7 +307,7 @@ SequenceWidget::SequenceWidget(SceneSequenceSwitch *s) : SwitchWidget(s, false)
SLOT(StartSceneChanged(const QString &)));
delay->setMaximum(99999.000000);
SceneSwitcher::populateSceneSelection(startScenes, false);
AdvSceneSwitcher::populateSceneSelection(startScenes, false);
populateDelayUnits(delayUnits);
if (s) {

10
src/switch-time.cpp
View File

@@ -2,7 +2,7 @@
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_timeAdd_clicked()
void AdvSceneSwitcher::on_timeAdd_clicked()
{
ui->timeAdd->disconnect(addPulse);
@@ -18,7 +18,7 @@ void SceneSwitcher::on_timeAdd_clicked()
ui->timeSwitches->setItemWidget(item, sw);
}
void SceneSwitcher::on_timeRemove_clicked()
void AdvSceneSwitcher::on_timeRemove_clicked()
{
QListWidgetItem *item = ui->timeSwitches->currentItem();
if (!item)
@@ -34,7 +34,7 @@ void SceneSwitcher::on_timeRemove_clicked()
delete item;
}
void SceneSwitcher::on_timeUp_clicked()
void AdvSceneSwitcher::on_timeUp_clicked()
{
int index = ui->timeSwitches->currentRow();
if (!listMoveUp(ui->timeSwitches))
@@ -52,7 +52,7 @@ void SceneSwitcher::on_timeUp_clicked()
switcher->timeSwitches[index - 1]);
}
void SceneSwitcher::on_timeDown_clicked()
void AdvSceneSwitcher::on_timeDown_clicked()
{
int index = ui->timeSwitches->currentRow();
@@ -196,7 +196,7 @@ void SwitcherData::loadTimeSwitches(obs_data_t *obj)
obs_data_array_release(timeArray);
}
void SceneSwitcher::setupTimeTab()
void AdvSceneSwitcher::setupTimeTab()
{
for (auto &s : switcher->timeSwitches) {
QListWidgetItem *item;

31
src/switch-transitions.cpp
View File

@@ -1,6 +1,6 @@
#include "headers/advanced-scene-switcher.hpp"
void SceneSwitcher::on_transitionsAdd_clicked()
void AdvSceneSwitcher::on_transitionsAdd_clicked()
{
std::lock_guard<std::mutex> lock(switcher->m);
switcher->sceneTransitions.emplace_back();
@@ -14,7 +14,7 @@ void SceneSwitcher::on_transitionsAdd_clicked()
ui->sceneTransitions->setItemWidget(item, sw);
}
void SceneSwitcher::on_transitionsRemove_clicked()
void AdvSceneSwitcher::on_transitionsRemove_clicked()
{
QListWidgetItem *item = ui->sceneTransitions->currentItem();
if (!item)
@@ -30,7 +30,7 @@ void SceneSwitcher::on_transitionsRemove_clicked()
delete item;
}
void SceneSwitcher::on_transitionsUp_clicked()
void AdvSceneSwitcher::on_transitionsUp_clicked()
{
int index = ui->sceneTransitions->currentRow();
if (!listMoveUp(ui->sceneTransitions))
@@ -50,7 +50,7 @@ void SceneSwitcher::on_transitionsUp_clicked()
switcher->sceneTransitions[index - 1]);
}
void SceneSwitcher::on_transitionsDown_clicked()
void AdvSceneSwitcher::on_transitionsDown_clicked()
{
int index = ui->sceneTransitions->currentRow();
@@ -71,7 +71,7 @@ void SceneSwitcher::on_transitionsDown_clicked()
switcher->sceneTransitions[index + 1]);
}
void SceneSwitcher::on_defaultTransitionsAdd_clicked()
void AdvSceneSwitcher::on_defaultTransitionsAdd_clicked()
{
std::lock_guard<std::mutex> lock(switcher->m);
switcher->defaultSceneTransitions.emplace_back();
@@ -85,7 +85,7 @@ void SceneSwitcher::on_defaultTransitionsAdd_clicked()
ui->defaultTransitions->setItemWidget(item, sw);
}
void SceneSwitcher::on_defaultTransitionsRemove_clicked()
void AdvSceneSwitcher::on_defaultTransitionsRemove_clicked()
{
QListWidgetItem *item = ui->defaultTransitions->currentItem();
if (!item)
@@ -101,7 +101,7 @@ void SceneSwitcher::on_defaultTransitionsRemove_clicked()
delete item;
}
void SceneSwitcher::on_defaultTransitionsUp_clicked()
void AdvSceneSwitcher::on_defaultTransitionsUp_clicked()
{
int index = ui->defaultTransitions->currentRow();
if (!listMoveUp(ui->defaultTransitions))
@@ -121,7 +121,7 @@ void SceneSwitcher::on_defaultTransitionsUp_clicked()
switcher->defaultSceneTransitions[index - 1]);
}
void SceneSwitcher::on_defaultTransitionsDown_clicked()
void AdvSceneSwitcher::on_defaultTransitionsDown_clicked()
{
int index = ui->defaultTransitions->currentRow();
@@ -149,6 +149,9 @@ void SwitcherData::setDefaultSceneTransitions()
for (DefaultSceneTransition &s : defaultSceneTransitions) {
if (s.scene == ws) {
if (!s.initialized())
continue;
obs_source_t *transition =
obs_weak_source_get_source(s.transition);
//This might cancel the current transition
@@ -156,8 +159,7 @@ void SwitcherData::setDefaultSceneTransitions()
obs_frontend_set_current_transition(transition);
if (verbose)
if (verbose)
s.logMatch();
s.logMatch();
obs_source_release(transition);
break;
@@ -167,7 +169,7 @@ void SwitcherData::setDefaultSceneTransitions()
obs_weak_source_release(ws);
}
void SceneSwitcher::on_transitionOverridecheckBox_stateChanged(int state)
void AdvSceneSwitcher::on_transitionOverridecheckBox_stateChanged(int state)
{
if (loading)
return;
@@ -186,6 +188,9 @@ obs_weak_source_t *getNextTransition(obs_weak_source_t *scene1,
obs_weak_source_t *ws = nullptr;
if (scene1 && scene2) {
for (SceneTransition &t : switcher->sceneTransitions) {
if (!t.initialized())
continue;
if (t.scene == scene1 && t.scene2 == scene2)
ws = t.transition;
}
@@ -363,7 +368,7 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj)
obs_data_get_bool(obj, "tansitionOverrideOverride");
}
void SceneSwitcher::setupTransitionsTab()
void AdvSceneSwitcher::setupTransitionsTab()
{
for (auto &s : switcher->sceneTransitions) {
QListWidgetItem *item;
@@ -411,7 +416,7 @@ TransitionSwitchWidget::TransitionSwitchWidget(SceneTransition *s)
QWidget::connect(scenes2, SIGNAL(currentTextChanged(const QString &)),
this, SLOT(Scene2Changed(const QString &)));
SceneSwitcher::populateSceneSelection(scenes2, false);
AdvSceneSwitcher::populateSceneSelection(scenes2, false);
if (s) {
scenes2->setCurrentText(GetWeakSourceName(s->scene2).c_str());

20
src/switch-window.cpp
View File

@@ -2,7 +2,7 @@
static QMetaObject::Connection addPulse;
void SceneSwitcher::on_windowAdd_clicked()
void AdvSceneSwitcher::on_windowAdd_clicked()
{
ui->windowAdd->disconnect(addPulse);
@@ -18,7 +18,7 @@ void SceneSwitcher::on_windowAdd_clicked()
ui->windowSwitches->setItemWidget(item, sw);
}
void SceneSwitcher::on_windowRemove_clicked()
void AdvSceneSwitcher::on_windowRemove_clicked()
{
QListWidgetItem *item = ui->windowSwitches->currentItem();
if (!item)
@@ -34,7 +34,7 @@ void SceneSwitcher::on_windowRemove_clicked()
delete item;
}
void SceneSwitcher::on_windowUp_clicked()
void AdvSceneSwitcher::on_windowUp_clicked()
{
int index = ui->windowSwitches->currentRow();
if (!listMoveUp(ui->windowSwitches))
@@ -54,7 +54,7 @@ void SceneSwitcher::on_windowUp_clicked()
switcher->windowSwitches[index - 1]);
}
void SceneSwitcher::on_windowDown_clicked()
void AdvSceneSwitcher::on_windowDown_clicked()
{
int index = ui->windowSwitches->currentRow();
@@ -75,7 +75,7 @@ void SceneSwitcher::on_windowDown_clicked()
switcher->windowSwitches[index + 1]);
}
void SceneSwitcher::on_ignoreWindowsAdd_clicked()
void AdvSceneSwitcher::on_ignoreWindowsAdd_clicked()
{
QString windowName = ui->ignoreWindowsWindows->currentText();
@@ -98,7 +98,7 @@ void SceneSwitcher::on_ignoreWindowsAdd_clicked()
}
}
void SceneSwitcher::on_ignoreWindowsRemove_clicked()
void AdvSceneSwitcher::on_ignoreWindowsRemove_clicked()
{
QListWidgetItem *item = ui->ignoreWindows->currentItem();
if (!item)
@@ -123,7 +123,7 @@ void SceneSwitcher::on_ignoreWindowsRemove_clicked()
delete item;
}
int SceneSwitcher::IgnoreWindowsFindByData(const QString &window)
int AdvSceneSwitcher::IgnoreWindowsFindByData(const QString &window)
{
int count = ui->ignoreWindows->count();
int idx = -1;
@@ -141,7 +141,7 @@ int SceneSwitcher::IgnoreWindowsFindByData(const QString &window)
return idx;
}
void SceneSwitcher::on_ignoreWindows_currentRowChanged(int idx)
void AdvSceneSwitcher::on_ignoreWindows_currentRowChanged(int idx)
{
if (loading)
return;
@@ -344,7 +344,7 @@ void SwitcherData::loadWindowTitleSwitches(obs_data_t *obj)
obs_data_array_release(ignoreWindowsArray);
}
void SceneSwitcher::setupTitleTab()
void AdvSceneSwitcher::setupTitleTab()
{
for (auto &s : switcher->windowSwitches) {
QListWidgetItem *item;
@@ -385,7 +385,7 @@ WindowSwitchWidget::WindowSwitchWidget(WindowSwitch *s) : SwitchWidget(s, false)
QWidget::connect(focused, SIGNAL(stateChanged(int)), this,
SLOT(FocusChanged(int)));
SceneSwitcher::populateWindowSelection(windows);
AdvSceneSwitcher::populateWindowSelection(windows);
windows->setEditable(true);
windows->setMaxVisibleItems(20);