Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-11-15 03:36:53 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support OBS 33 audio monitoring API changes
Some checks failed
debian-build / build (push) Has been cancelled
Details
Push to master / Check Formatting 🔍 (push) Has been cancelled
Details
Push to master / Build Project 🧱 (push) Has been cancelled
Details
Push to master / Create Release 🛫 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
WarmUpTill
2026-10-28 19:32:07 +01:00
committed by WarmUpTill
parent e136086ca3
commit 1f2bbc0499
5 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/base/macro-condition-audio.cpp
View File

@@ -220,10 +220,10 @@ bool MacroConditionAudio::CheckMonitor()
bool ret = false;
OBSSourceAutoRelease source =
obs_weak_source_get_source(_audioSource.GetSource());
ret = obs_source_get_monitoring_type(source) == _monitorType;
const auto monitorType = GetMonitoringType(source);
ret = monitorType == _monitorType;
SetVariableValue("");
SetTempVarValue("monitor",
std::to_string(obs_source_get_monitoring_type(source)));
SetTempVarValue("monitor", std::to_string(monitorType));
return ret && source;
}
@@ -332,8 +332,9 @@ bool MacroConditionAudio::Load(obs_data_t *obj)
{
MacroCondition::Load(obj);
_audioSource.Load(obj, "audioSource");
_monitorType = static_cast<obs_monitoring_type>(
obs_data_get_int(obj, "monitor"));
_monitorType =
ToSupportedMonitoringType(static_cast<obs_monitoring_type>(
obs_data_get_int(obj, "monitor")));
if (!obs_data_has_user_value(obj, "version")) {
_volumePercent = obs_data_get_int(obj, "volume");
_syncOffset = obs_data_get_int(obj, "syncOffset");
@@ -620,7 +621,8 @@ void MacroConditionAudioEdit::SyncOffsetChanged(const NumberVariable<int> &value
void MacroConditionAudioEdit::MonitorTypeChanged(int value)
{
GUARD_LOADING_AND_LOCK();
_entryData->_monitorType = static_cast<obs_monitoring_type>(value);
_entryData->_monitorType = static_cast<obs_monitoring_type>(
_monitorTypes->itemData(value).toInt());
}
void MacroConditionAudioEdit::BalanceChanged(const NumberVariable<double> &value)
@@ -735,7 +737,8 @@ void MacroConditionAudioEdit::UpdateEntryData()
_volumePercent->SetValue(_entryData->_volumePercent);
_volumeDB->SetValue(_entryData->_volumeDB);
_syncOffset->SetValue(_entryData->_syncOffset);
_monitorTypes->setCurrentIndex(_entryData->_monitorType);
_monitorTypes->setCurrentIndex(
_monitorTypes->findData(_entryData->_monitorType));
_balance->SetDoubleValue(_entryData->_balance);
_track->SetValue(_entryData->_track);
_checkTypes->setCurrentIndex(