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

clean up setup of audio/exe/media and fix slight leak in media

Browse Source
This commit is contained in:
WarmUpTill
2020-10-13 20:37:02 +02:00
parent 26697faa9f
commit 7c561797af
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch-audio.cpp
View File

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

3
src/switch-executable.cpp
View File

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

9
src/switch-media.cpp
View File

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