diff --git a/src/switch-audio.cpp b/src/switch-audio.cpp index d7dc5cea..2276c971 100644 --- a/src/switch-audio.cpp +++ b/src/switch-audio.cpp @@ -176,12 +176,6 @@ void SwitcherData::loadAudioSwitches(obs_data_t *obj) void SceneSwitcher::setupAudioTab() { for (auto &s : switcher->audioSwitches) { - std::string sceneName = (s.usePreviousScene) - ? previous_scene_name - : GetWeakSourceName(s.scene); - std::string transitionName = GetWeakSourceName(s.transition); - std::string audioSourceName = GetWeakSourceName(s.audioSource); - QListWidgetItem *item; item = new QListWidgetItem(ui->audioSwitches); ui->audioSwitches->addItem(item); diff --git a/src/switch-executable.cpp b/src/switch-executable.cpp index 4bac0ce2..37f72257 100644 --- a/src/switch-executable.cpp +++ b/src/switch-executable.cpp @@ -186,9 +186,6 @@ void SwitcherData::loadExecutableSwitches(obs_data_t *obj) void SceneSwitcher::setupExecutableTab() { for (auto &s : switcher->executableSwitches) { - std::string sceneName = GetWeakSourceName(s.scene); - std::string transitionName = GetWeakSourceName(s.transition); - QListWidgetItem *item; item = new QListWidgetItem(ui->executables); ui->executables->addItem(item); diff --git a/src/switch-media.cpp b/src/switch-media.cpp index 7afbb332..82c6b9af 100644 --- a/src/switch-media.cpp +++ b/src/switch-media.cpp @@ -77,7 +77,7 @@ void SwitcherData::checkMediaSwitch(bool &match, OBSWeakSource &scene, for (MediaSwitch &mediaSwitch : mediaSwitches) { if (!mediaSwitch.initialized()) continue; - obs_source_t *source = + OBSSource source = obs_weak_source_get_source(mediaSwitch.source); auto duration = obs_source_media_get_duration(source); auto time = obs_source_media_get_time(source); @@ -108,7 +108,6 @@ void SwitcherData::checkMediaSwitch(bool &match, OBSWeakSource &scene, mediaSwitch.logMatch(); break; } - obs_source_release(source); } } @@ -185,12 +184,6 @@ void SwitcherData::loadMediaSwitches(obs_data_t *obj) void SceneSwitcher::setupMediaTab() { for (auto &s : switcher->mediaSwitches) { - std::string sourceName = GetWeakSourceName(s.source); - std::string sceneName = (s.usePreviousScene) - ? previous_scene_name - : GetWeakSourceName(s.scene); - std::string transitionName = GetWeakSourceName(s.transition); - QListWidgetItem *item; item = new QListWidgetItem(ui->mediaSwitches); ui->mediaSwitches->addItem(item);