MEGA65: mixer refinements #272

[DEPLOYMENT]

Author: lgblgblgb

targets/mega65/audio65.c

@@ -351,7 +351,7 @@ static void recalulate_scalers ( void )
 	scalers_right[8] = scalers_right[9] = GETMIXFL(0x3C) * master_right;
 	if (XEMU_UNLIKELY(mono_downmix))
 		for (int c = 0; c < MIXED_CHANNELS; c++)
-			scalers_left[c] = scalers_right[c] = (scalers_left[c] + scalers_right[c]) / 2;
+			scalers_left[c] = scalers_right[c] = (scalers_left[c] + scalers_right[c]) / 2.0;
 }
 
 
@@ -423,9 +423,10 @@ static void default_mixer_helper ( const int basereg, const Uint16 value_l, cons
 }
 
 
-static void print_audio_info ( void )
+static void print_audio_info ( const char *msg )
 {
-	DEBUGPRINT("AUDIO: emu-volume = %d%%, mono-downmix = %s, output-reg-shift = $%02X" NL,
+	DEBUGPRINT("AUDIO: emu-setup [%s] event; emu-volume = %d%%, mono-downmix = %s, output-reg-shift = $%02X" NL,
+		msg ? msg : "-",
 		xemu_volume_int,
 		mono_downmix ? "ON" : "off",
 		output_selection
@@ -445,6 +446,7 @@ void audio65_reset_mixer ( void )
 	default_mixer_helper(0x1C, 0xBEBE, 0xBEBE);	// OPL FM! On MEGA65 OPL channel is maybe muted by default, btw ...
 	default_mixer_helper(0x1E, 0xFFFF, 0xFFFF);	// master volume
 	recalulate_scalers();
+	print_audio_info("reset-mixer");
 }
 
 
@@ -461,7 +463,7 @@ void audio65_set_volume ( int vol )
 {
 	set_volume(vol);
 	recalulate_scalers();
-	print_audio_info();
+	print_audio_info("set-volume");
 }
 
 
@@ -475,7 +477,7 @@ void audio65_set_mono_downmix ( const bool status )
 {
 	mono_downmix = status;
 	recalulate_scalers();
-	print_audio_info();
+	print_audio_info("mono-downmix");
 }
 
 
@@ -489,7 +491,7 @@ void audio65_set_output ( const int val )
 {
 	output_selection = val;
 	recalulate_scalers();
-	print_audio_info();
+	print_audio_info("set-output");
 }
 
 
@@ -499,6 +501,38 @@ int audio65_get_output ( void )
 }
 
 
+#define GETMIXPCNT(n)  (int)(mixer_floats[((n) + output_selection) >> 1] * 100.0)
+
+
+size_t audio65_get_description ( char *buffer, const size_t buffer_size )
+{
+	const char *output_name;
+	switch (output_selection) {
+		case AUDIO_OUTPUT_SPEAKERS:
+			output_name = "HDMI/speakers";
+			break;
+		case AUDIO_OUTPUT_HEADPHONES:
+			output_name = "heaphones";
+			break;
+		default:
+			output_name = "UNKNOWN";
+			break;
+	}
+	return snprintf(
+		buffer, buffer_size,
+		"Sampling: %dHz, emulation volume: %d%%, emulated output: %s\n"
+		"SIDL   L=%03d%% R=%03d%%     SIDR   L=%03d%% R=%03d%%\n"
+		"DIGL   L=%03d%% R=%03d%%     DIGR   L=%03d%% R=%03d%%\n"
+		"OPLFM  L=%03d%% R=%03d%%     MASTER L=%03d%% R=%03d%%"
+		,
+		system_sound_mix_freq, xemu_volume_int, output_name,
+		GETMIXPCNT(0x00), GETMIXPCNT(0x20), GETMIXPCNT(0x02), GETMIXPCNT(0x22),
+		GETMIXPCNT(0x10), GETMIXPCNT(0x30), GETMIXPCNT(0x12), GETMIXPCNT(0x32),
+		GETMIXPCNT(0x1C), GETMIXPCNT(0x3C), GETMIXPCNT(0x1E), GETMIXPCNT(0x3E)
+	);
+}
+
+
 void audio65_init ( int sid_cycles_per_sec, int sound_mix_freq, int volume, unsigned int buffer_size )
 {
 	static volatile int initialized = 0;
@@ -512,7 +546,6 @@ void audio65_init ( int sid_cycles_per_sec, int sound_mix_freq, int volume, unsi
 	mono_downmix = false;
 	set_volume(volume);
 	audio65_reset_mixer();
-	print_audio_info();
 	for (int i = 0; i < NUMBER_OF_SIDS; i++)
 		UNLOCK_SID("INIT", i);
 	UNLOCK_OPL("INIT");

targets/mega65/audio65.h

@@ -56,5 +56,6 @@ extern void  audio65_set_mono_downmix ( const bool status );
 extern bool  audio65_get_mono_downmix ( void );
 extern void  audio65_set_output ( const int val );
 extern int   audio65_get_output ( void );
+extern size_t audio65_get_description ( char *buffer, const size_t buffer_size );
 
 #endif

targets/mega65/hypervisor.c

@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #include "rom.h"
 #define  XEMU_MEGA65_HDOS_H_ALLOWED
 #include "hdos.h"
+#include "audio65.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -306,6 +307,7 @@ static inline void first_leave ( void )
 	hdos_notify_system_start_end();
 	xemu_sleepless_temporary_mode(0);	// turn off temporary sleepless mode which may have been enabled before
 	vic_frame_counter_since_boot = 0;
+	audio65_reset_mixer();
 	//memory_reset_unwritten_debug_stat();	// FIXME/TODO: commented out since it generates a **tons** of warnings then with the "unwritten mem read" debug mode (-ramcheckread emu option)
 	DEBUGPRINT("HYPERVISOR: first return after RESET, end of processing workarounds." NL);
 }

targets/mega65/matrix_mode.c

@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #include "mega65.h"
 #include "io_mapper.h"
 #include "memory_mapper.h"
+#include "audio65.h"
 
 #include <ctype.h>
 #include <string.h>
@@ -583,6 +584,14 @@ static void cmd_shade ( char *p )
 }
 
 
+static void cmd_audio ( char * p )
+{
+	char buffer[4096];
+	audio65_get_description(buffer, sizeof buffer);
+	MATRIX("%s", buffer);
+}
+
+
 static void cmd_help ( char *p );
 
 
@@ -605,6 +614,7 @@ static const struct command_tab_st {
 	{ "write",	cmd_write,	"w"	},
 	{ "map",	cmd_map,	"m"	},
 	{ "shade",	cmd_shade,	NULL	},
+	{ "audio",	cmd_audio,	NULL	},
 	{ .cmdname = NULL			},
 };
 

targets/mega65/ui.c

@@ -1072,10 +1072,10 @@ static const struct menu_st menu_audio[] = {
 					XEMUGUI_MENUFLAG_QUERYBACK,	xemugui_cb_toggle_int_inverted, (void*)&configdb.nosound },
 	{ "Force mono downmix",		XEMUGUI_MENUID_CALLABLE |
 					XEMUGUI_MENUFLAG_QUERYBACK,	ui_cb_mono_downmix, NULL },
+	{ "Restore mixer to default",	XEMUGUI_MENUID_CALLABLE,	xemugui_cb_call_user_data, audio65_reset_mixer },
+	{ "Clear audio registers",	XEMUGUI_MENUID_CALLABLE,	xemugui_cb_call_user_data, audio65_clear_regs },
 	{ "OPL3 emulation",		XEMUGUI_MENUID_CALLABLE |
 					XEMUGUI_MENUFLAG_QUERYBACK,	xemugui_cb_toggle_int_inverted, (void*)&configdb.noopl3 },
-	{ "Clear audio registers",	XEMUGUI_MENUID_CALLABLE,	xemugui_cb_call_user_data, audio65_clear_regs },
-	{ "Restore mixer to default",	XEMUGUI_MENUID_CALLABLE,	xemugui_cb_call_user_data, audio65_reset_mixer },
 	{ "Emulated SIDs",		XEMUGUI_MENUID_SUBMENU,		NULL, menu_audio_sids   },
 	{ "Emulator volume level",	XEMUGUI_MENUID_SUBMENU,		NULL, menu_audio_volume },
 	{ "Emulated audio output",	XEMUGUI_MENUID_SUBMENU,		NULL, menu_audio_output },