dsda: volumes

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.IEmulator.cs

@@ -151,6 +151,8 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 
 			PackedRenderInfo renderInfo = new PackedRenderInfo()
 			{
+				SfxVolume          = _settings.SfxVolume,
+				MusicVolume        = _settings.MusicVolume,
 				Gamma              = _settings.Gamma,
 				HeadsUpMode        = (int)_settings.HeadsUpMode,
 				MapDetails         = (int)_settings.MapDetails,

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.ISettable.cs

@@ -150,6 +150,18 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 			[TypeConverter(typeof(ConstrainedIntConverter))]
 			public int ScaleFactor { get; set; }
 			
+			[DisplayName("Sfx Volume")]
+			[Description("Sound effects volume [0 - 15].")]
+			[Range(0, 15)]
+			[DefaultValue(8)]
+			public int SfxVolume { get; set; }
+			
+			[DisplayName("Music Volume")]
+			[Description("[0 - 15]")]
+			[Range(0, 15)]
+			[DefaultValue(8)]
+			public int MusicVolume { get; set; }
+			
 			[DisplayName("Gamma Correction Level")]
 			[Description("Increases brightness [0 - 4].\n\nDefault value in vanilla is \"OFF\" (0).")]
 			[Range(0, 4)]

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.cs

@@ -94,6 +94,8 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 					_nativeResolution.X *     _settings.ScaleFactor}x{
 					_nativeResolution.Y *     _settings.ScaleFactor}\"\n"
 				+ $"usegamma {                _settings.Gamma}\n"
+				+ $"sfx_volume {              _settings.SfxVolume}\n"
+				+ $"music_volume {            _settings.MusicVolume}\n"
 				+ $"automap_overlay {    (int)_settings.MapOverlay}\n"
 				+ $"dsda_exhud {             (_settings.DsdaExHud            ? 1 : 0)}\n"
 				+ $"map_totals {             (_settings.MapTotals            ? 1 : 0)}\n"

src/BizHawk.Emulation.Cores/Computers/Doom/LibDSDA.cs

@@ -62,6 +62,8 @@ namespace BizHawk.Emulation.Cores.Computers.Doom
 			public int DoUpdate;
 			public int RenderVideo;
 			public int RenderAudio;
+			public int SfxVolume;
+			public int MusicVolume;
 			public int Gamma;
 			public int ShowMessages;
 			public int ReportSecrets;

waterbox/dsda/BizhawkInterface.c

@@ -161,16 +161,31 @@ ECL_EXPORT bool dsda_frame_advance(CommonButtons commonButtons, struct PackedPla
 {
   if (renderInfo->DoUpdate)
   {
+    if (renderInfo->Gamma != dsda_IntConfig(dsda_config_usegamma))
+    {
+      dsda_UpdateIntConfig(dsda_config_usegamma, renderInfo->Gamma, true);
+      dsda_AddMessage(usegamma == 0 ? GAMMALVL0 :
+                      usegamma == 1 ? GAMMALVL1 :
+                      usegamma == 2 ? GAMMALVL2 :
+                      usegamma == 3 ? GAMMALVL3 :
+                      GAMMALVL4);
+    }
+
     if (renderInfo->MapOverlay != dsda_IntConfig(dsda_config_automap_overlay))
     {
-      dsda_UpdateIntConfig(dsda_config_automap_overlay,  renderInfo->MapOverlay,         true);      
+      dsda_UpdateIntConfig(dsda_config_automap_overlay, renderInfo->MapOverlay, true);
       dsda_AddMessage(automap_overlay == 0 ? AMSTR_OVERLAYOFF :
                       automap_overlay == 1 ? AMSTR_OVERLAYON :
                       "Overlay Mode Dark");
     }
+
     if (renderInfo->ShowMessages != dsda_ShowMessages())
-      dsda_UpdateIntConfig(dsda_config_show_messages,    renderInfo->ShowMessages,       true);
-    dsda_UpdateIntConfig(dsda_config_usegamma,           renderInfo->Gamma,              true);
+      dsda_UpdateIntConfig(dsda_config_show_messages, renderInfo->ShowMessages, true);
+
+    dsda_UpdateIntConfig(dsda_config_screenblocks,       renderInfo->HeadsUpMode != HUD_VANILLA ? 11 : 10, true);
+    dsda_UpdateIntConfig(dsda_config_hud_displayed,      renderInfo->HeadsUpMode == HUD_NONE    ?  0 :  1, true);
+    dsda_UpdateIntConfig(dsda_config_sfx_volume,         renderInfo->SfxVolume,          true);
+    dsda_UpdateIntConfig(dsda_config_music_volume,       renderInfo->MusicVolume,        true);
     dsda_UpdateIntConfig(dsda_config_hudadd_secretarea,  renderInfo->ReportSecrets,      true);
     dsda_UpdateIntConfig(dsda_config_exhud,              renderInfo->DsdaExHud,          true);
     dsda_UpdateIntConfig(dsda_config_coordinate_display, renderInfo->DisplayCoordinates, true);
@@ -178,8 +193,6 @@ ECL_EXPORT bool dsda_frame_advance(CommonButtons commonButtons, struct PackedPla
     dsda_UpdateIntConfig(dsda_config_map_totals,         renderInfo->MapTotals,          true);
     dsda_UpdateIntConfig(dsda_config_map_time,           renderInfo->MapTime,            true);
     dsda_UpdateIntConfig(dsda_config_map_coordinates,    renderInfo->MapCoordinates,     true);
-    dsda_UpdateIntConfig(dsda_config_screenblocks,       renderInfo->HeadsUpMode != HUD_VANILLA ? 11 : 10, true);
-    dsda_UpdateIntConfig(dsda_config_hud_displayed,      renderInfo->HeadsUpMode == HUD_NONE    ?  0 :  1, true);
   }
 
   // Setting inputs

waterbox/dsda/BizhawkInterface.h

@@ -161,6 +161,8 @@ struct PackedRenderInfo
   int DoUpdate;
   int RenderVideo;
   int RenderAudio;
+  int SfxVolume;
+  int MusicVolume;
   int Gamma;
   int ShowMessages;
   int ReportSecrets;