win-asio: Enable monitoring track for output

This enables a monitoring track for output.

Signed-off-by: pkv <[email protected]>

Author: pkviet

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

@@ -5,6 +5,8 @@ Reset.Device="Reload driver"
 Reset.Device.Hint="Reloads manually the driver. This is useful in case of driver settings being modified (sample rate, buffer, ...)"
 
 Asio.Input.Capture="ASIO input"
+ASIO.Output="ASIO Output"
+ASIO.Output.Hint="Any channel from the 6 audio tracks can be selected.\nAn additional monitoring track is provided which mixes all sources which are not set to 'Monitor Off'.\n"
 
 OBS.Channels.0="OBS Channel 1"
 OBS.Channels.1="OBS Channel 2"
@@ -95,4 +97,12 @@ Track5.3=" Track 6 Channel 4"
 Track5.4=" Track 6 Channel 5"
 Track5.5=" Track 6 Channel 6"
 Track5.6=" Track 6 Channel 7"
-Track5.7=" Track 6 Channel 8"
+Track5.7=" Track 6 Channel 8"
+Track6.0=" Monitoring Track Channel 1"
+Track6.1=" Monitoring Track Channel 2"
+Track6.2=" Monitoring Track Channel 3"
+Track6.3=" Monitoring Track Channel 4"
+Track6.4=" Monitoring Track Channel 5"
+Track6.5=" Monitoring Track Channel 6"
+Track6.6=" Monitoring Track Channel 7"
+Track6.7=" Monitoring Track Channel 8"

plugins/win-asio/win-asio.c

@@ -489,7 +489,7 @@ static void asio_output_update(void *vptr, obs_data_t *settings)
 			data->asio_device->obs_track[i] = -1;         // device does not use track i
 			data->asio_device->obs_track_channel[i] = -1; // device does not use any channel from track i
 			if (data->out_mix_channels[i] >= 0) {
-				for (int j = 0; j < MAX_AUDIO_MIXES; j++) {
+				for (int j = 0; j < MAX_AUDIO_MIXES_NEW; j++) {
 					for (int k = 0; k < data->obs_track_channels; k++) {
 						int64_t idx = (int64_t)k + (1LL << (j + 4));
 						if (data->out_mix_channels[i] == idx) {
@@ -523,8 +523,8 @@ static void *asio_output_create(obs_data_t *settings, obs_output_t *output)
 	for (int i = 0; i < MAX_DEVICE_CHANNELS; i++)
 		data->out_mix_channels[i] = -1;
 
-	// allow all tracks for asio output
-	obs_output_set_mixers(output, (1 << 6) - 1);
+	// allow all tracks for asio output + extra monitoring track
+	obs_output_set_mixers(output, (1 << 7) - 1);
 
 	os_atomic_set_bool(&data->active, true);
 	os_atomic_set_bool(&data->stopping, false);
@@ -662,7 +662,7 @@ static bool on_asio_output_device_changed(void *priv, obs_properties_t *props, o
 								    OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 			obs_property_set_long_description(p, obs_module_text("ASIO.Output.Hint"));
 			obs_property_list_add_int(p, obs_module_text("Mute"), -1);
-			for (int j = 0; j < MAX_AUDIO_MIXES; j++) {
+			for (int j = 0; j < MAX_AUDIO_MIXES_NEW; j++) {
 				for (int k = 0; k < global_output_asio_data->obs_track_channels; k++) {
 					long long idx = k + (1ULL << (j + 4));
 					char label[32];
@@ -720,7 +720,7 @@ static obs_properties_t *asio_output_properties(void *vptr)
 							    OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 		obs_property_list_add_int(p, obs_module_text("Mute"), -1);
 		obs_property_set_long_description(p, obs_module_text("ASIO.Output.Hint"));
-		for (int j = 0; j < MAX_AUDIO_MIXES; j++) {
+		for (int j = 0; j < MAX_AUDIO_MIXES_NEW; j++) {
 			for (int k = 0; k < global_output_asio_data->obs_track_channels; k++) {
 				long long idx = k + (1ULL << (j + 4));
 				char label[32];
@@ -729,7 +729,6 @@ static obs_properties_t *asio_output_properties(void *vptr)
 			}
 		}
 	}
-
 	return props;
 }