Skip to content

Commit b5b6cac

Browse files
committed
win-asio: Enable monitoring track for output
This enables a monitoring track for output. Signed-off-by: pkv <[email protected]>
1 parent f157f00 commit b5b6cac

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

plugins/win-asio/data/locale/en-US.ini

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,11 @@ Track5.4=" Track 6 Channel 5"
103103
Track5.5=" Track 6 Channel 6"
104104
Track5.6=" Track 6 Channel 7"
105105
Track5.7=" Track 6 Channel 8"
106+
Track6.0=" Monitoring Track Channel 1"
107+
Track6.1=" Monitoring Track Channel 2"
108+
Track6.2=" Monitoring Track Channel 3"
109+
Track6.3=" Monitoring Track Channel 4"
110+
Track6.4=" Monitoring Track Channel 5"
111+
Track6.5=" Monitoring Track Channel 6"
112+
Track6.6=" Monitoring Track Channel 7"
113+
Track6.7=" Monitoring Track Channel 8"

plugins/win-asio/win-asio.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ static void asio_update(void *vptr, obs_data_t *settings, bool is_output)
289289
data->asio_device->obs_track[i] = -1; // device does not use track i
290290
data->asio_device->obs_track_channel[i] = -1; // device does not use any channel from track i
291291
if (data->out_mix_channels[i] >= 0) {
292-
for (int j = 0; j < MAX_AUDIO_MIXES; j++) {
292+
for (int j = 0; j < (MAX_AUDIO_MIXES + MAX_AUDIO_MONITORING_MIXES); j++) {
293293
for (int k = 0; k < data->obs_track_channels; k++) {
294294
int64_t idx = (int64_t)k + (1LL << (j + 4));
295295
if (data->out_mix_channels[i] == idx) {
@@ -524,7 +524,7 @@ static bool on_asio_device_changed(void *priv, obs_properties_t *props, obs_prop
524524

525525
obs_property_list_add_int(p, obs_module_text("Mute"), -1);
526526

527-
for (int j = 0; j < MAX_AUDIO_MIXES; j++) {
527+
for (int j = 0; j < (MAX_AUDIO_MIXES + MAX_AUDIO_MONITORING_MIXES); j++) {
528528
for (int k = 0; k < global_output_asio_data->obs_track_channels; k++) {
529529
long long idx = k + (1ULL << (j + 4));
530530
char label[32];
@@ -628,7 +628,7 @@ static obs_properties_t *asio_properties_internal(void *vptr, bool is_output)
628628
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
629629
obs_property_list_add_int(lp, obs_module_text("Mute"), -1);
630630

631-
for (int j = 0; j < MAX_AUDIO_MIXES; j++) {
631+
for (int j = 0; j < (MAX_AUDIO_MIXES + MAX_AUDIO_MONITORING_MIXES); j++) {
632632
for (int k = 0; k < global_output_asio_data->obs_track_channels; k++) {
633633
long long idx = k + (1ULL << (j + 4));
634634
char label[32];

0 commit comments

Comments
 (0)