Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Default to timidity (so as not to break existing applications)
  • Loading branch information
slouken committed Aug 19, 2001
1 parent 72cb36e commit 041a2a3
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions music.c
Expand Up @@ -308,7 +308,6 @@ int open_music(SDL_AudioSpec *mixer)
}
md_mode |= DMODE_STEREO;
}
samplesize = mixer->size/mixer->samples;
md_mixfreq = mixer->freq;
md_device = 0;
md_volume = 96;
Expand All @@ -325,21 +324,18 @@ int open_music(SDL_AudioSpec *mixer)
#endif
#ifdef MID_MUSIC
samplesize = mixer->size/mixer->samples;
#ifdef USE_NATIVE_MIDI
if ( native_midi_init() ) {
native_midi_ok = 1;
if ( Timidity_Init(mixer->freq, mixer->format,
mixer->channels, mixer->samples) != 0 ) {
timidity_ok = 1;
} else {
native_midi_ok = 0;
}
timidity_ok = !native_midi_ok;
#else
timidity_ok = 1;
#endif
if ( timidity_ok &&
(Timidity_Init(mixer->freq, mixer->format,
mixer->channels, mixer->samples) != 0) ) {
timidity_ok = 0;
}
#ifdef USE_NATIVE_MIDI
native_midi_ok = !timidity_ok;
if ( native_midi_ok ) {
native_midi_ok = native_midi_init();
}
#endif
#endif
#ifdef OGG_MUSIC
if ( OGG_init(mixer) < 0 ) {
Expand Down

0 comments on commit 041a2a3

Please sign in to comment.