Remove unneeded HAVE_MIXERX checks.
This commit is contained in:
parent
f021d35e7e
commit
b37c3a414a
|
@ -312,9 +312,7 @@ 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;
|
menu_t OP_SoundAdvancedDef;
|
||||||
#endif
|
|
||||||
|
|
||||||
//Misc
|
//Misc
|
||||||
menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef;
|
menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef;
|
||||||
|
@ -1360,13 +1358,9 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
||||||
{IT_HEADER, NULL, "Accessibility", NULL, 102},
|
{IT_HEADER, NULL, "Accessibility", NULL, 102},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 114},
|
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 114},
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 144},
|
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 144},
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
#define OPENMPT_MENUOFFSET 16
|
#define OPENMPT_MENUOFFSET 16
|
||||||
#else
|
#else
|
||||||
|
@ -1403,7 +1397,6 @@ static menuitem_t OP_SoundAdvancedMenu[] =
|
||||||
|
|
||||||
#undef OPENMPT_MENUOFFSET
|
#undef OPENMPT_MENUOFFSET
|
||||||
#undef MIXERX_MENUOFFSET
|
#undef MIXERX_MENUOFFSET
|
||||||
#endif
|
|
||||||
|
|
||||||
static menuitem_t OP_DataOptionsMenu[] =
|
static menuitem_t OP_DataOptionsMenu[] =
|
||||||
{
|
{
|
||||||
|
@ -1995,9 +1988,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);
|
||||||
#ifdef HAVE_MIXERX
|
|
||||||
menu_t OP_SoundAdvancedDef = DEFAULTSCROLLMENUSTYLE(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
|
|
||||||
|
|
||||||
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