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

13
plugins/base/macro-action-audio.cpp
View File

@@ -273,7 +273,7 @@ bool MacroActionAudio::PerformAction()
setSyncOffsetHelper(s, _syncOffset * nsPerMs);
break;
case Action::MONITOR:
obs_source_set_monitoring_type(s, _monitorType);
SetMonitoringType(s, _monitorType);
break;
case Action::BALANCE:
obs_source_set_balance_value(s, _balance);
@@ -337,8 +337,9 @@ bool MacroActionAudio::Load(obs_data_t *obj)
_duration.Load(obj);
_audioSource.Load(obj, "audioSource");
_action = static_cast<Action>(obs_data_get_int(obj, "action"));
_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")) {
_syncOffset = obs_data_get_int(obj, "syncOffset");
_balance = obs_data_get_double(obj, "balance");
@@ -658,7 +659,8 @@ void MacroActionAudioEdit::UpdateEntryData()
_actions->setCurrentIndex(
_actions->findData(static_cast<int>(_entryData->_action)));
_syncOffset->SetValue(_entryData->_syncOffset);
_monitorTypes->setCurrentIndex(_entryData->_monitorType);
_monitorTypes->setCurrentIndex(
_monitorTypes->findData(_entryData->_monitorType));
_balance->SetDoubleValue(_entryData->_balance);
_track->SetValue(_entryData->_track);
_volumePercent->SetValue(_entryData->_volume);
@@ -697,7 +699,8 @@ void MacroActionAudioEdit::SyncOffsetChanged(const NumberVariable<int> &value)
void MacroActionAudioEdit::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 MacroActionAudioEdit::BalanceChanged(const NumberVariable<double> &value)