Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-25 15:34:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix media and audio condition unexpectedly returning true after unpause

Browse Source
This commit is contained in:
WarmUpTill 2022-05-11 16:14:45 +02:00 committed by WarmUpTill
parent 8da1e3ad40
commit a2e4580970
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/macro-condition-audio.cpp
View File

@ -212,6 +212,10 @@ void MacroConditionAudio::SetVolumeLevel(void *data, const float *,
const float *) const float *)
{ {
MacroConditionAudio *c = static_cast<MacroConditionAudio *>(data); MacroConditionAudio *c = static_cast<MacroConditionAudio *>(data);
const auto macro = c->GetMacro();
if (macro && macro->Paused()) {
return;
}
for (int i = 0; i < MAX_AUDIO_CHANNELS; i++) { for (int i = 0; i < MAX_AUDIO_CHANNELS; i++) {
if (peak[i] > c->_peak) { if (peak[i] > c->_peak) {

12
src/macro-condition-media.cpp
View File

@ -329,18 +329,30 @@ void MacroConditionMedia::ResetSignalHandler()
void MacroConditionMedia::MediaStopped(void *data, calldata_t *) void MacroConditionMedia::MediaStopped(void *data, calldata_t *)
{ {
MacroConditionMedia *media = static_cast<MacroConditionMedia *>(data); MacroConditionMedia *media = static_cast<MacroConditionMedia *>(data);
const auto macro = media->GetMacro();
if (macro && macro->Paused()) {
return;
}
media->_stopped = true; media->_stopped = true;
} }
void MacroConditionMedia::MediaEnded(void *data, calldata_t *) void MacroConditionMedia::MediaEnded(void *data, calldata_t *)
{ {
MacroConditionMedia *media = static_cast<MacroConditionMedia *>(data); MacroConditionMedia *media = static_cast<MacroConditionMedia *>(data);
const auto macro = media->GetMacro();
if (macro && macro->Paused()) {
return;
}
media->_ended = true; media->_ended = true;
} }
void MacroConditionMedia::MediaNext(void *data, calldata_t *) void MacroConditionMedia::MediaNext(void *data, calldata_t *)
{ {
MacroConditionMedia *media = static_cast<MacroConditionMedia *>(data); MacroConditionMedia *media = static_cast<MacroConditionMedia *>(data);
const auto macro = media->GetMacro();
if (macro && macro->Paused()) {
return;
}
media->_next = true; media->_next = true;
} }