Subversion Repositories eduke32

Rev

Rev 8763 | Rev 8765 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8763 Rev 8764
Line 1239... Line 1239...
1239
static MenuOption_t MEO_SOUND_OPL3STEREO = MAKE_MENUOPTION(&MF_Redfont, &MEOS_NoYes, &opl3stereo);
1239
static MenuOption_t MEO_SOUND_OPL3STEREO = MAKE_MENUOPTION(&MF_Redfont, &MEOS_NoYes, &opl3stereo);
1240
static MenuEntry_t ME_SOUND_OPL3STEREO = MAKE_MENUENTRY( "OPL3 stereo mode:", &MF_Redfont, &MEF_BigOptionsRtSections, &MEO_SOUND_OPL3STEREO, Option );
1240
static MenuEntry_t ME_SOUND_OPL3STEREO = MAKE_MENUENTRY( "OPL3 stereo mode:", &MF_Redfont, &MEF_BigOptionsRtSections, &MEO_SOUND_OPL3STEREO, Option );
1241
1241
1242
static MenuRangeInt32_t MEO_SOUND_NUMVOICES = MAKE_MENURANGE( &soundvoices, &MF_Redfont, 16, 128, 0, 8, 1 );
1242
static MenuRangeInt32_t MEO_SOUND_NUMVOICES = MAKE_MENURANGE( &soundvoices, &MF_Redfont, 16, 128, 0, 8, 1 );
1243
static MenuEntry_t ME_SOUND_NUMVOICES = MAKE_MENUENTRY( "Voices:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_NUMVOICES, RangeInt32 );
1243
static MenuEntry_t ME_SOUND_NUMVOICES = MAKE_MENUENTRY( "Voices:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_NUMVOICES, RangeInt32 );
1244
#endif
-
 
1245
1244
1246
static char const *MEOSN_SOUND_MIDIDRIVER[] = {
1245
static char const *MEOSN_SOUND_MIDIDRIVER[] = {
1247
    "OPL3 emu.",
1246
    "OPL3 emu.",
1248
#ifdef _WIN32
1247
#ifdef _WIN32
1249
    "Windows MME",
1248
    "Windows MME",
Line 1260... Line 1259...
1260
1259
1261
static MenuOptionSet_t MEOS_SOUND_MIDIDRIVER = MAKE_MENUOPTIONSET( MEOSN_SOUND_MIDIDRIVER, MEOSV_SOUND_MIDIDRIVER, 0x2 );
1260
static MenuOptionSet_t MEOS_SOUND_MIDIDRIVER = MAKE_MENUOPTIONSET( MEOSN_SOUND_MIDIDRIVER, MEOSV_SOUND_MIDIDRIVER, 0x2 );
1262
static MenuOption_t MEO_SOUND_MIDIDRIVER = MAKE_MENUOPTION( &MF_Redfont, &MEOS_SOUND_MIDIDRIVER, &musicdevice );
1261
static MenuOption_t MEO_SOUND_MIDIDRIVER = MAKE_MENUOPTION( &MF_Redfont, &MEOS_SOUND_MIDIDRIVER, &musicdevice );
1263
static MenuEntry_t ME_SOUND_MIDIDRIVER = MAKE_MENUENTRY( "MIDI driver:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_MIDIDRIVER, Option );
1262
static MenuEntry_t ME_SOUND_MIDIDRIVER = MAKE_MENUENTRY( "MIDI driver:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_MIDIDRIVER, Option );
1264
1263
1265
static MenuEntry_t ME_SOUND_RESTART = MAKE_MENUENTRY( "Apply Changes", &MF_Redfont, &MEF_BigOptions_Apply, &MEO_NULL, Link );
-
 
1266
-
 
1267
#ifndef EDUKE32_RETAIL_MENU
-
 
1268
static MenuLink_t MEO_SOUND_DEVSETUP = { MENU_SOUND_DEVSETUP, MA_Advance, };
1264
static MenuLink_t MEO_SOUND_DEVSETUP = { MENU_SOUND_DEVSETUP, MA_Advance, };
1269
static MenuEntry_t ME_SOUND_DEVSETUP = MAKE_MENUENTRY( "Device configuration", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_DEVSETUP, Link );
1265
static MenuEntry_t ME_SOUND_DEVSETUP = MAKE_MENUENTRY( "Device configuration", &MF_Redfont, &MEF_BigOptionsRt, &MEO_SOUND_DEVSETUP, Link );
1270
1266
1271
static MenuLink_t MEO_SOUND_SF2 = { MENU_SOUND_SF2, MA_Advance, };
1267
static MenuLink_t MEO_SOUND_SF2 = { MENU_SOUND_SF2, MA_Advance, };
1272
static MenuEntry_t ME_SOUND_SF2 = MAKE_MENUENTRY( sf2bankfile, &MF_Redfont, &MEF_BigOptionsRtSections, &MEO_SOUND_SF2, Link );
1268
static MenuEntry_t ME_SOUND_SF2 = MAKE_MENUENTRY( sf2bankfile, &MF_Redfont, &MEF_BigOptionsRtSections, &MEO_SOUND_SF2, Link );
1273
#endif
1269
#endif
1274
1270
-
 
1271
static MenuEntry_t ME_SOUND_RESTART = MAKE_MENUENTRY( "Apply Changes", &MF_Redfont, &MEF_BigOptions_Apply, &MEO_NULL, Link );
-
 
1272
1275
static MenuEntry_t *MEL_SOUND[] = {
1273
static MenuEntry_t *MEL_SOUND[] = {
1276
    &ME_SOUND,
1274
    &ME_SOUND,
1277
    &ME_SOUND_VOLUME_FX,
1275
    &ME_SOUND_VOLUME_FX,
1278
    &ME_SOUND_MUSIC,
1276
    &ME_SOUND_MUSIC,
1279
    &ME_SOUND_VOLUME_MUSIC,
1277
    &ME_SOUND_VOLUME_MUSIC,
Line 1587... Line 1585...
1587
    { &M_NETWAITMASTER, MENU_NETWAITMASTER, MENU_MAIN, MA_Return, Message },
1585
    { &M_NETWAITMASTER, MENU_NETWAITMASTER, MENU_MAIN, MA_Return, Message },
1588
    { &M_NETWAITVOTES, MENU_NETWAITVOTES, MENU_MAIN, MA_Return, Message },
1586
    { &M_NETWAITVOTES, MENU_NETWAITVOTES, MENU_MAIN, MA_Return, Message },
1589
    { &M_SOUND, MENU_SOUND, MENU_OPTIONS, MA_Return, Menu },
1587
    { &M_SOUND, MENU_SOUND, MENU_OPTIONS, MA_Return, Menu },
1590
    { &M_SOUND, MENU_SOUND_INGAME, MENU_CLOSE, MA_Return, Menu },
1588
    { &M_SOUND, MENU_SOUND_INGAME, MENU_CLOSE, MA_Return, Menu },
1591
    { &M_SOUND_DEVSETUP, MENU_SOUND_DEVSETUP, MENU_SOUND, MA_Return, Menu },
1589
    { &M_SOUND_DEVSETUP, MENU_SOUND_DEVSETUP, MENU_SOUND, MA_Return, Menu },
-
 
1590
#ifndef EDUKE32_RETAIL_MENU
1592
    { &M_SOUND_SF2, MENU_SOUND_SF2, MENU_SOUND_DEVSETUP, MA_Return, FileSelect },
1591
    { &M_SOUND_SF2, MENU_SOUND_SF2, MENU_SOUND_DEVSETUP, MA_Return, FileSelect },
-
 
1592
#endif
1593
    { &M_SAVESETUP, MENU_SAVESETUP, MENU_OPTIONS, MA_Return, Menu },
1593
    { &M_SAVESETUP, MENU_SAVESETUP, MENU_OPTIONS, MA_Return, Menu },
1594
    { &M_SAVECLEANVERIFY, MENU_SAVECLEANVERIFY, MENU_SAVESETUP, MA_None, Verify },
1594
    { &M_SAVECLEANVERIFY, MENU_SAVECLEANVERIFY, MENU_SAVESETUP, MA_None, Verify },
1595
    { &M_RESETSTATSVERIFY, MENU_RESETSTATSVERIFY, MENU_SAVESETUP, MA_None, Verify },
1595
    { &M_RESETSTATSVERIFY, MENU_RESETSTATSVERIFY, MENU_SAVESETUP, MA_None, Verify },
1596
#ifdef EDUKE32_RETAIL_MENU
1596
#ifdef EDUKE32_RETAIL_MENU
1597
    { &M_CHEATS, MENU_CHEATS, MENU_OPTIONS, MA_Return, Menu },
1597
    { &M_CHEATS, MENU_CHEATS, MENU_OPTIONS, MA_Return, Menu },
Line 4178... Line 4178...
4178
                Menu_AnimateChange(MENU_SKILL, MA_Advance);
4178
                Menu_AnimateChange(MENU_SKILL, MA_Advance);
4179
            else
4179
            else
4180
                Menu_StartGameWithoutSkill();
4180
                Menu_StartGameWithoutSkill();
4181
        }
4181
        }
4182
        break;
4182
        break;
-
 
4183
#ifndef EDUKE32_RETAIL_MENU
4183
    case MENU_SOUND_SF2:
4184
    case MENU_SOUND_SF2:
4184
        Menu_AnimateChange(MENU_SOUND_DEVSETUP, MA_Advance);
4185
        Menu_AnimateChange(MENU_SOUND_DEVSETUP, MA_Advance);
4185
        break;
4186
        break;
-
 
4187
#endif
4186
    default:
4188
    default:
4187
        break;
4189
        break;
4188
    }
4190
    }
4189
}
4191
}
4190
4192
Line 4448... Line 4450...
4448
        newfullscreen = fullscreen;
4450
        newfullscreen = fullscreen;
4449
        newvsync = vsync;
4451
        newvsync = vsync;
4450
        newborderless = r_borderless;
4452
        newborderless = r_borderless;
4451
        break;
4453
        break;
4452
4454
-
 
4455
#ifndef EDUKE32_RETAIL_MENU
4453
    case MENU_SOUND:
4456
    case MENU_SOUND:
4454
    case MENU_SOUND_SF2:
4457
    case MENU_SOUND_SF2:
4455
        Bstrcpy(sf2bankfile, SF2_BankFile);
4458
        Bstrcpy(sf2bankfile, SF2_BankFile);
4456
        break;
4459
        break;
4457
4460
4458
    case MENU_SOUND_DEVSETUP:
4461
    case MENU_SOUND_DEVSETUP:
-
 
4462
        ME_SOUND_SF2.name = (!sf2bankfile[0]) ? "Select sound bank..." : sf2bankfile;
4459
        if (m_previousMenu->menuID != MENU_SOUND_SF2)
4463
        if (m_previousMenu->menuID != MENU_SOUND_SF2)
-
 
4464
#endif
4460
        {
4465
        {
4461
            soundrate   = ud.config.MixRate;
4466
            soundrate   = ud.config.MixRate;
4462
            soundvoices = ud.config.NumVoices;
4467
            soundvoices = ud.config.NumVoices;
4463
            musicdevice = ud.config.MusicDevice;
4468
            musicdevice = ud.config.MusicDevice;
4464
            opl3stereo  = AL_Stereo;
4469
            opl3stereo  = AL_Stereo;
4465
        }
4470
        }
4466
        ME_SOUND_SF2.name = (!sf2bankfile[0]) ? "Select sound bank..." : sf2bankfile;
-
 
4467
        break;
4471
        break;
4468
4472
4469
    default:
4473
    default:
4470
        break;
4474
        break;
4471
    }
4475
    }