mixer.c
changeset 797 b4b6adff699a
parent 782 e7d3a8f73e88
child 800 cc4aef7fef64
     1.1 --- a/mixer.c	Fri Oct 20 21:55:03 2017 -0700
     1.2 +++ b/mixer.c	Fri Oct 20 23:39:04 2017 -0700
     1.3 @@ -259,9 +259,7 @@
     1.4  #endif
     1.5  
     1.6      /* Mix the music (must be done before the channels are added) */
     1.7 -    if (music_active || (mix_music != music_mixer)) {
     1.8 -        mix_music(music_data, stream, len);
     1.9 -    }
    1.10 +    mix_music(music_data, stream, len);
    1.11  
    1.12      /* Mix any playing channels... */
    1.13      sdl_ticks = SDL_GetTicks();
    1.14 @@ -548,7 +546,6 @@
    1.15      MusicFragment *first = NULL, *last = NULL, *fragment = NULL;
    1.16      int count = 0;
    1.17      int fragment_size;
    1.18 -    int original_volume;
    1.19  
    1.20      *spec = mixer;
    1.21  
    1.22 @@ -579,12 +576,6 @@
    1.23              break;
    1.24          }
    1.25  
    1.26 -        if (interface->api == MIX_MUSIC_SMPEG) {
    1.27 -            /* Uh oh, if SMPEG couldn't create anything, it freed the src */
    1.28 -            freesrc = SDL_FALSE;
    1.29 -            break;
    1.30 -        }
    1.31 -
    1.32          /* Reset the stream for the next decoder */
    1.33          SDL_RWseek(src, start, RW_SEEK_SET);
    1.34      }
    1.35 @@ -598,14 +589,9 @@
    1.36      }
    1.37  
    1.38      Mix_LockAudio();
    1.39 -    original_volume = music_volume;
    1.40 - 
    1.41 -    if (interface->SetVolume) {
    1.42 -        interface->SetVolume(music, MIX_MAX_VOLUME);
    1.43 -    }
    1.44  
    1.45      if (interface->Play) {
    1.46 -        interface->Play(music);
    1.47 +        interface->Play(music, 1);
    1.48  	}
    1.49      playing = SDL_TRUE;
    1.50  
    1.51 @@ -647,10 +633,6 @@
    1.52          interface->Stop(music);
    1.53      }
    1.54  
    1.55 -    if (interface->SetVolume) {
    1.56 -        interface->SetVolume(music, original_volume);
    1.57 -    }
    1.58 -
    1.59      if (music) {
    1.60          interface->Delete(music);
    1.61      }