Re-reorganize sound options.
This commit is contained in:
parent
b37c3a414a
commit
5a7ebb3ba6
31
src/m_menu.c
31
src/m_menu.c
|
@ -1355,20 +1355,21 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
||||||
{IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 72},
|
{IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 72},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 82},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 82},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Accessibility", NULL, 102},
|
{IT_HEADER, NULL, "Miscellaneous", NULL, 102},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 114},
|
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 114},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 124},
|
||||||
|
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 144},
|
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 144},
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
#define OPENMPT_MENUOFFSET 16
|
#define OPENMPT_MENUOFFSET 32
|
||||||
#else
|
#else
|
||||||
#define OPENMPT_MENUOFFSET 0
|
#define OPENMPT_MENUOFFSET 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
#ifdef HAVE_MIXERX
|
||||||
#define MIXERX_MENUOFFSET 40
|
#define MIXERX_MENUOFFSET 81
|
||||||
#else
|
#else
|
||||||
#define MIXERX_MENUOFFSET 0
|
#define MIXERX_MENUOFFSET 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -1376,23 +1377,21 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
||||||
static menuitem_t OP_SoundAdvancedMenu[] =
|
static menuitem_t OP_SoundAdvancedMenu[] =
|
||||||
{
|
{
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
{IT_HEADER, NULL, "OpenMPT Settings", NULL, 10},
|
{IT_HEADER, NULL, "OpenMPT Settings", NULL, 0},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Instrument Filter", &cv_modfilter, 16},
|
{IT_STRING | IT_CVAR, NULL, "Instrument Filter", &cv_modfilter, 12},
|
||||||
#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},
|
||||||
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, OPENMPT_MENUOFFSET+16},
|
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, OPENMPT_MENUOFFSET+12},
|
||||||
{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, "FluidSynth Sound Font File", &cv_midisoundfontpath, OPENMPT_MENUOFFSET+24},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, OPENMPT_MENUOFFSET+35},
|
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, OPENMPT_MENUOFFSET+51},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Miscellaneous", NULL, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+10},
|
{IT_HEADER, NULL, "Miscellaneous", NULL, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Play Sound Effects if Unfocused", &cv_playsoundsifunfocused, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+16},
|
{IT_STRING | IT_CVAR, NULL, "Play Sound Effects if Unfocused", &cv_playsoundsifunfocused, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+12},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Play Music if Unfocused", &cv_playmusicifunfocused, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+21},
|
{IT_STRING | IT_CVAR, NULL, "Play Music if Unfocused", &cv_playmusicifunfocused, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+22},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Let Levels Force Reset Music", &cv_resetmusicbyheader, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+32},
|
||||||
{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
|
||||||
|
@ -1988,7 +1987,7 @@ menu_t OP_ColorOptionsDef =
|
||||||
menu_t OP_SoundOptionsDef = DEFAULTMENUSTYLE(
|
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);
|
||||||
menu_t OP_SoundAdvancedDef = DEFAULTSCROLLMENUSTYLE(MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
|
menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE(MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
|
||||||
|
|
||||||
menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE(
|
menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE(
|
||||||
MN_OP_MAIN + (MN_OP_SERVER << 6),
|
MN_OP_MAIN + (MN_OP_SERVER << 6),
|
||||||
|
|
Loading…
Reference in a new issue