Mixer X menu touchup
This commit is contained in:
parent
fbaf5106fd
commit
fd4d3a6a69
34
src/m_menu.c
34
src/m_menu.c
|
@ -1308,24 +1308,36 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
||||||
{IT_HEADER, NULL, "Accessibility", NULL, 103}, // 50
|
{IT_HEADER, NULL, "Accessibility", NULL, 103}, // 50
|
||||||
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 115}, // 56
|
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 115}, // 56
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#if defined(HAVE_OPENMPT) || defined(HAVE_MIXERX)
|
||||||
{IT_HEADER, NULL, "OpenMPT Settings", NULL, 133},
|
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 133},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Instrument Filter", &cv_modfilter, 145},
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_MIXERX
|
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 163},
|
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAVE_MIXERX
|
#if defined(HAVE_OPENMPT) || defined(HAVE_MIXERX)
|
||||||
|
|
||||||
|
#ifdef HAVE_OPENMPT
|
||||||
|
#define OPENMPT_MENUOFFSET 32
|
||||||
|
#else
|
||||||
|
#define OPENMPT_MENUOFFSET 0
|
||||||
|
#endif
|
||||||
|
|
||||||
static menuitem_t OP_SoundAdvancedMenu[] =
|
static menuitem_t OP_SoundAdvancedMenu[] =
|
||||||
{
|
{
|
||||||
{IT_HEADER, NULL, "MIDI", NULL, 10},
|
#ifdef HAVE_OPENMPT
|
||||||
|
{IT_HEADER, NULL, "OpenMPT Settings", NULL, 10},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Instrument Filter", &cv_modfilter, 22},
|
||||||
|
#endif
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, 22},
|
#ifdef HAVE_MIXERX
|
||||||
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "FluidSynth Sound Font File", &cv_midisoundfontpath, 32},
|
{IT_HEADER, NULL, "MIDI Settings", NULL, OPENMPT_MENUOFFSET+10},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, 60}
|
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, OPENMPT_MENUOFFSET+22},
|
||||||
|
{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, "TiMidity++ Config Folder", &cv_miditimiditypath, OPENMPT_MENUOFFSET+61}
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#undef OPENMPT_MENUOFFSET
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static menuitem_t OP_DataOptionsMenu[] =
|
static menuitem_t OP_DataOptionsMenu[] =
|
||||||
|
|
|
@ -190,7 +190,7 @@ static void MidiSoundfontPath_Onchange(void)
|
||||||
// which happens when: defined(HAVE_MIXERX) && !defined(HAVE_MIXER)
|
// which happens when: defined(HAVE_MIXERX) && !defined(HAVE_MIXER)
|
||||||
static CV_PossibleValue_t midiplayer_cons_t[] = {{MIDI_OPNMIDI, "OPNMIDI"}, {MIDI_Fluidsynth, "Fluidsynth"}, {MIDI_Timidity, "Timidity"}, {MIDI_Native, "Native"}, {0, NULL}};
|
static CV_PossibleValue_t midiplayer_cons_t[] = {{MIDI_OPNMIDI, "OPNMIDI"}, {MIDI_Fluidsynth, "Fluidsynth"}, {MIDI_Timidity, "Timidity"}, {MIDI_Native, "Native"}, {0, NULL}};
|
||||||
consvar_t cv_midiplayer = {"midiplayer", "OPNMIDI" /*MIDI_OPNMIDI*/, CV_CALL|CV_NOINIT|CV_SAVE, midiplayer_cons_t, Midiplayer_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_midiplayer = {"midiplayer", "OPNMIDI" /*MIDI_OPNMIDI*/, CV_CALL|CV_NOINIT|CV_SAVE, midiplayer_cons_t, Midiplayer_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_midisoundfontpath = {"midisoundfont", "sf2/8bit.sf2", CV_CALL|CV_NOINIT|CV_SAVE, NULL, MidiSoundfontPath_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_midisoundfontpath = {"midisoundfont", "sf2/8bitsf.SF2", CV_CALL|CV_NOINIT|CV_SAVE, NULL, MidiSoundfontPath_Onchange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_miditimiditypath = {"midisoundbank", "./timidity", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_miditimiditypath = {"midisoundbank", "./timidity", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue