Skip to content

Commit 2f54867

Browse files
committed
0.31.15
1 parent 7bc9b25 commit 2f54867

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

buildspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
"uuids": {
4848
"windowsApp": "ad885c58-5ca9-44de-8f4f-1c12676626a9"
4949
},
50-
"version": "0.31.14",
50+
"version": "0.31.15",
5151
"website": "https://www.atkaudio.com"
5252
}

lib/atkaudio/src/atkaudio/PluginHost2/Core/ObsSource.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,9 @@ class ObsSourceAudioProcessor
515515
if (followMute && currentObsSource)
516516
{
517517
bool obsMuted = obs_source_muted(currentObsSource);
518-
if (obsMuted)
518+
int monitoringType = (int)obs_source_get_monitoring_type(currentObsSource);
519+
bool effectiveMuted = obsMuted || (monitoringType == OBS_MONITORING_TYPE_MONITOR_ONLY);
520+
if (effectiveMuted)
519521
buffer.clear();
520522
}
521523
}

src/device_io.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,12 @@ static void tick(void* data, float seconds)
292292

293293
if (adio->followSourceVolume.load(std::memory_order_acquire) && parent)
294294
{
295+
bool obsMuted = obs_source_muted(parent);
296+
int monitoringType = (int)obs_source_get_monitoring_type(parent);
297+
bool effectiveMuted = obsMuted || (monitoringType == OBS_MONITORING_TYPE_MONITOR_ONLY);
298+
295299
auto fader = obs_source_get_volume(parent);
296-
if (obs_source_muted(parent))
300+
if (effectiveMuted)
297301
fader = 0.0f;
298302
outputGain *= fader;
299303
}

src/device_io2.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,12 @@ static void tick(void* data, float seconds)
284284

285285
if (adio->followSourceVolume.load(std::memory_order_acquire) && parent)
286286
{
287+
bool obsMuted = obs_source_muted(parent);
288+
int monitoringType = (int)obs_source_get_monitoring_type(parent);
289+
bool effectiveMuted = obsMuted || (monitoringType == OBS_MONITORING_TYPE_MONITOR_ONLY);
290+
287291
auto fader = obs_source_get_volume(parent);
288-
if (obs_source_muted(parent))
292+
if (effectiveMuted)
289293
fader = 0.0f;
290294
outputGain *= fader;
291295
}

0 commit comments

Comments
 (0)