Merge pull request #89 from kondrak/music_volume (music volume slider)

Added music volume slider. (fixes #88)

.travis.yml

@@ -5,7 +5,7 @@ branches:
     - master
 
 before_install:
-  - export VK_VERSION=1.1.126.0
+  - export VK_VERSION=1.2.131.2
 
 matrix:
   include:

appveyor.yml

@@ -5,7 +5,7 @@ branches:
   - master
 
 environment:
-  VK_VERSION: 1.1.126.0
+  VK_VERSION: 1.2.131.2
   VULKAN_SDK: c:\VulkanSDK\%VK_VERSION%
 
 skip_tags: true

client/menu.c

@@ -1055,8 +1055,8 @@ static menulist_s		s_options_lookspring_box;
 static menulist_s		s_options_lookstrafe_box;
 static menulist_s		s_options_crosshair_box;
 static menuslider_s		s_options_sfxvolume_slider;
+static menuslider_s		s_options_cdvolume_slider;
 static menulist_s		s_options_joystick_box;
-static menulist_s		s_options_cdvolume_box;
 static menulist_s		s_options_quality_list;
 static menulist_s		s_options_compatibility_list;
 static menulist_s		s_options_console_action;
@@ -1106,7 +1106,7 @@ static float ClampCvar( float min, float max, float value )
 static void ControlsSetMenuItemValues( void )
 {
 	s_options_sfxvolume_slider.curvalue		= Cvar_VariableValue( "s_volume" ) * 10;
-	s_options_cdvolume_box.curvalue 		= !Cvar_VariableValue("cd_nocd");
+	s_options_cdvolume_slider.curvalue		= Cvar_VariableValue("cd_volume") * 10;
 	s_options_quality_list.curvalue			= !Cvar_VariableValue( "s_loadas8bit" );
 	s_options_sensitivity_slider.curvalue	= ( sensitivity->value ) * 2;
 
@@ -1163,7 +1163,7 @@ static void UpdateVolumeFunc( void *unused )
 
 static void UpdateCDVolumeFunc( void *unused )
 {
-	Cvar_SetValue( "cd_nocd", !s_options_cdvolume_box.curvalue );
+	Cvar_SetValue("cd_volume", s_options_cdvolume_slider.curvalue / 10);
 }
 
 static void ConsoleFunc( void *unused )
@@ -1206,12 +1206,6 @@ static void UpdateSoundQualityFunc( void *unused )
 
 void Options_MenuInit( void )
 {
-	static const char *cd_music_items[] =
-	{
-		"disabled",
-		"enabled",
-		0
-	};
 	static const char *quality_items[] =
 	{
 		"low", "high", 0
@@ -1256,13 +1250,14 @@ void Options_MenuInit( void )
 	s_options_sfxvolume_slider.maxvalue		= 10;
 	s_options_sfxvolume_slider.curvalue		= Cvar_VariableValue( "s_volume" ) * 10;
 
-	s_options_cdvolume_box.generic.type	= MTYPE_SPINCONTROL;
-	s_options_cdvolume_box.generic.x		= 0;
-	s_options_cdvolume_box.generic.y		= 10 * vid_hudscale->value;
-	s_options_cdvolume_box.generic.name	= "CD music";
-	s_options_cdvolume_box.generic.callback	= UpdateCDVolumeFunc;
-	s_options_cdvolume_box.itemnames		= cd_music_items;
-	s_options_cdvolume_box.curvalue 		= !Cvar_VariableValue("cd_nocd");
+	s_options_cdvolume_slider.generic.type	= MTYPE_SLIDER;
+	s_options_cdvolume_slider.generic.x		= 0;
+	s_options_cdvolume_slider.generic.y		= 10 * vid_hudscale->value;
+	s_options_cdvolume_slider.generic.name	= "music volume";
+	s_options_cdvolume_slider.generic.callback	= UpdateCDVolumeFunc;
+	s_options_cdvolume_slider.minvalue		= 0;
+	s_options_cdvolume_slider.maxvalue		= 10;
+	s_options_cdvolume_slider.curvalue		= Cvar_VariableValue("cd_volume") * 10;
 
 	s_options_quality_list.generic.type	= MTYPE_SPINCONTROL;
 	s_options_quality_list.generic.x		= 0;
@@ -1358,7 +1353,7 @@ void Options_MenuInit( void )
 	ControlsSetMenuItemValues();
 
 	Menu_AddItem( &s_options_menu, ( void * ) &s_options_sfxvolume_slider );
-	Menu_AddItem( &s_options_menu, ( void * ) &s_options_cdvolume_box );
+	Menu_AddItem( &s_options_menu, ( void * ) &s_options_cdvolume_slider);
 	Menu_AddItem( &s_options_menu, ( void * ) &s_options_quality_list );
 	Menu_AddItem( &s_options_menu, ( void * ) &s_options_compatibility_list );
 	Menu_AddItem( &s_options_menu, ( void * ) &s_options_sensitivity_slider );