Reorganize sound options.
This commit is contained in:
parent
2d509eff47
commit
f587069d0e
44
src/m_menu.c
44
src/m_menu.c
|
@ -1348,37 +1348,33 @@ static menuitem_t OP_OpenGLColorMenu[] =
|
||||||
static menuitem_t OP_SoundOptionsMenu[] =
|
static menuitem_t OP_SoundOptionsMenu[] =
|
||||||
{
|
{
|
||||||
{IT_HEADER, NULL, "Game Audio", NULL, 0},
|
{IT_HEADER, NULL, "Game Audio", NULL, 0},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Sound Effects", &cv_gamesounds, 6},
|
{IT_STRING | IT_CVAR, NULL, "Sound Effects", &cv_gamesounds, 12},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Sound Volume", &cv_soundvolume, 11},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Sound Volume", &cv_soundvolume, 22},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Digital Music", &cv_gamedigimusic, 21},
|
{IT_STRING | IT_CVAR, NULL, "Digital Music", &cv_gamedigimusic, 42},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Digital Music Volume", &cv_digmusicvolume, 26},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Digital Music Volume", &cv_digmusicvolume, 52},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 36},
|
{IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 72},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 41},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 82},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Accessibility", NULL, 50},
|
{IT_HEADER, NULL, "Accessibility", NULL, 102},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 56},
|
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 114},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 61},
|
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Play Sound Effects if Unfocused", &cv_playsoundsifunfocused, 71},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Play Music if Unfocused", &cv_playmusicifunfocused, 76},
|
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
#ifdef HAVE_MIXERX
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 94},
|
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 144},
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
#ifdef HAVE_MIXERX
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
#define OPENMPT_MENUOFFSET 32
|
#define OPENMPT_MENUOFFSET 16
|
||||||
#else
|
#else
|
||||||
#define OPENMPT_MENUOFFSET 0
|
#define OPENMPT_MENUOFFSET 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
#ifdef HAVE_MIXERX
|
||||||
#define MIXERX_MENUOFFSET 81
|
#define MIXERX_MENUOFFSET 40
|
||||||
#else
|
#else
|
||||||
#define MIXERX_MENUOFFSET 0
|
#define MIXERX_MENUOFFSET 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -1387,18 +1383,22 @@ static menuitem_t OP_SoundAdvancedMenu[] =
|
||||||
{
|
{
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
{IT_HEADER, NULL, "OpenMPT Settings", NULL, 10},
|
{IT_HEADER, NULL, "OpenMPT Settings", NULL, 10},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Instrument Filter", &cv_modfilter, 22},
|
{IT_STRING | IT_CVAR, NULL, "Instrument Filter", &cv_modfilter, 16},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
#ifdef HAVE_MIXERX
|
||||||
{IT_HEADER, NULL, "MIDI Settings", NULL, OPENMPT_MENUOFFSET+10},
|
{IT_HEADER, NULL, "MIDI Settings", NULL, OPENMPT_MENUOFFSET+10},
|
||||||
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, OPENMPT_MENUOFFSET+22},
|
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, OPENMPT_MENUOFFSET+16},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "FluidSynth Sound Font File", &cv_midisoundfontpath, OPENMPT_MENUOFFSET+34},
|
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "FluidSynth Sound Font File", &cv_midisoundfontpath, OPENMPT_MENUOFFSET+21},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, OPENMPT_MENUOFFSET+61},
|
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, OPENMPT_MENUOFFSET+35},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Miscellaneous", NULL, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+10},
|
{IT_HEADER, NULL, "Miscellaneous", NULL, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+10},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Let Levels Force Reset Music", &cv_resetmusicbyheader, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+22},
|
{IT_STRING | IT_CVAR, NULL, "Play Sound Effects if Unfocused", &cv_playsoundsifunfocused, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+16},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Play Music if Unfocused", &cv_playmusicifunfocused, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+21},
|
||||||
|
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+31},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Let Levels Force Reset Music", &cv_resetmusicbyheader, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+36},
|
||||||
};
|
};
|
||||||
|
|
||||||
#undef OPENMPT_MENUOFFSET
|
#undef OPENMPT_MENUOFFSET
|
||||||
|
@ -1992,11 +1992,11 @@ menu_t OP_ColorOptionsDef =
|
||||||
0,
|
0,
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
menu_t OP_SoundOptionsDef = DEFAULTSCROLLMENUSTYLE(
|
menu_t OP_SoundOptionsDef = DEFAULTMENUSTYLE(
|
||||||
MN_OP_MAIN + (MN_OP_SOUND << 6),
|
MN_OP_MAIN + (MN_OP_SOUND << 6),
|
||||||
"M_SOUND", OP_SoundOptionsMenu, &OP_MainDef, 30, 30);
|
"M_SOUND", OP_SoundOptionsMenu, &OP_MainDef, 30, 30);
|
||||||
#ifdef HAVE_MIXERX
|
#ifdef HAVE_MIXERX
|
||||||
menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE(MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
|
menu_t OP_SoundAdvancedDef = DEFAULTSCROLLMENUSTYLE(MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE(
|
menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE(
|
||||||
|
|
Loading…
Reference in a new issue