Ticket #7983: mp3volume.diff

scummvm/gui.cpp

@@ -609 +609 @@
                 imuse->set_music_volume(_s->_sound_volume_music);
                 imuse->set_master_volume(_s->_sound_volume_master);
                 _s->_mixer->set_volume(_s->_sound_volume_sfx);
+                _s->_mixer->set_music_volume(_s->_sound_volume_music);
                 scummcfg->set("master_volume", _s->_sound_volume_master);
                 scummcfg->set("music_volume", _s->_sound_volume_music);
                 scummcfg->set("sfx_volume", _s->_sound_volume_sfx);

scummvm/scummvm.cpp

@@ -1492 +1492 @@
                 }   
         } 
         scumm->_mixer->set_volume(128);
+        scumm->_mixer->set_music_volume(128);
 
         /* HACK !!! */
         g_scumm = scumm;

scummvm/sound/mixer.cpp

@@ -200 +200 @@
                 _volume_table[i] = ((int8)i) * volume;
 }
 
+void SoundMixer::set_music_volume(int volume)
+{
+        _music_volume = volume;
+}
+
 #ifdef COMPRESSED_SOUND_FILE
 bool SoundMixer::Channel::sound_finished()
 {
@@ -709 +714 @@
 {
         mad_fixed_t const *ch;
         mad_timer_t frame_duration;
-        const int16 *vol_tab = _mixer->_volume_table;
-        unsigned char volume = ((int)vol_tab[1]) * 32 / 255;
+        unsigned char volume = _mixer->_music_volume * 32 / 255;
 
         if (_to_be_destroyed) {
                 real_destroy();

scummvm/sound/mixer.h

@@ -131 +131 @@
         uint _output_rate;
 
         int16 *_volume_table;
+        int _music_volume;
 
         bool _paused;
 
@@ -192 +193 @@
 
         /* set the volume, 0-256 */
         void set_volume(int volume);
+        void set_music_volume(int volume);
 
         /* pause - unpause */
         void pause(bool paused);

scummvm/sound.cpp

@@ -527 +527 @@
                 se->set_master_volume(_sound_volume_master);
                 se->set_music_volume(_sound_volume_music);
                 _mixer->set_volume(_sound_volume_sfx);
+                _mixer->set_music_volume(_sound_volume_music);
         }
         _sfxFile = openSfxFile();
 }