Skip to content

Commit 99f815a

Browse files
committed
plugins: Enable extra ASIO monitoring track for transitions and slideshow
Modifies obs-transitions and image-source. This allows the audio of transitions such as stingers and slideshows to be heard on the ASIO monitoring track. Signed-off-by: pkv <pkv@obsproject.com>
1 parent 7132d8e commit 99f815a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

plugins/image-source/obs-slideshow-mk2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ static inline bool ss_audio_render_(obs_source_t *transition, uint64_t *ts_out,
896896
return false;
897897

898898
obs_source_get_audio_mix(transition, &child_audio);
899-
for (size_t mix = 0; mix < MAX_AUDIO_MIXES; mix++) {
899+
for (size_t mix = 0; mix < MAX_AUDIO_MIXES + MAX_AUDIO_MONITORING_MIXES; mix++) {
900900
if ((mixers & (1 << mix)) == 0)
901901
continue;
902902

plugins/image-source/obs-slideshow.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ static inline bool ss_audio_render_(obs_source_t *transition, uint64_t *ts_out,
783783
return false;
784784

785785
obs_source_get_audio_mix(transition, &child_audio);
786-
for (size_t mix = 0; mix < MAX_AUDIO_MIXES; mix++) {
786+
for (size_t mix = 0; mix < MAX_AUDIO_MIXES + MAX_AUDIO_MONITORING_MIXES; mix++) {
787787
if ((mixers & (1 << mix)) == 0)
788788
continue;
789789

plugins/obs-transitions/transition-stinger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ static bool stinger_audio_render(void *data, uint64_t *ts_out, struct obs_source
504504
struct obs_source_audio_mix child_audio;
505505
obs_source_get_audio_mix(s->media_source, &child_audio);
506506

507-
for (size_t mix = 0; mix < MAX_AUDIO_MIXES; mix++) {
507+
for (size_t mix = 0; mix < MAX_AUDIO_MIXES + MAX_AUDIO_MONITORING_MIXES; mix++) {
508508
if ((mixers & (1 << mix)) == 0)
509509
continue;
510510

0 commit comments

Comments
 (0)