stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-07 08:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Advanced submenu for sound options

Browse source
This commit is contained in:
mazmazz 2018-08-26 23:58:43 -04:00
parent cc9d554dfd
commit 535aed24bb
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/m_menu.c
View file

@ -328,6 +328,9 @@ menu_t OP_VideoOptionsDef, OP_VideoModeDef, OP_ColorOptionsDef;
menu_t OP_OpenGLOptionsDef, OP_OpenGLFogDef, OP_OpenGLColorDef; menu_t OP_OpenGLOptionsDef, OP_OpenGLFogDef, OP_OpenGLColorDef;
#endif #endif
menu_t OP_SoundOptionsDef; menu_t OP_SoundOptionsDef;
#ifdef HAVE_MIXERX
menu_t OP_SoundAdvancedDef;
#endif
static void M_ToggleSFX(INT32 choice); static void M_ToggleSFX(INT32 choice);
static void M_ToggleDigital(INT32 choice); static void M_ToggleDigital(INT32 choice);
static void M_ToggleMIDI(INT32 choice); static void M_ToggleMIDI(INT32 choice);
@ -1320,14 +1323,21 @@ static menuitem_t OP_SoundOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 100}, {IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 100},
#ifdef HAVE_MIXERX #ifdef HAVE_MIXERX
{IT_HEADER, NULL, "Advanced", NULL, 118}, {IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 120},
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, 130},
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "FluidSynth Sound Font File", &cv_midisoundfontpath, 140},
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, 168}
#endif #endif
}; };
#ifdef HAVE_MIXERX
static menuitem_t OP_SoundAdvancedMenu[] =
{
{IT_HEADER, NULL, "MIDI", NULL, 10},
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, 22},
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "FluidSynth Sound Font File", &cv_midisoundfontpath, 32},
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, 60}
};
#endif
static menuitem_t OP_DataOptionsMenu[] = static menuitem_t OP_DataOptionsMenu[] =
{ {
{IT_STRING | IT_CALL, NULL, "Add-on Options...", M_AddonsOptions, 10}, {IT_STRING | IT_CALL, NULL, "Add-on Options...", M_AddonsOptions, 10},
@ -1842,6 +1852,9 @@ menu_t OP_SoundOptionsDef =
0, 0,
NULL NULL
}; };
#ifdef HAVE_MIXERX
menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
#endif
menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 30, 30); menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 30, 30);