Ticket #3053: sky-adlib2.diff

engines/sky/music/musicbase.h

@@ -58 +58 @@
         bool musicIsPlaying(void);
         uint8 giveVolume(void) { return (uint8)_musicVolume; };
         uint8 giveCurrentMusic(void) { return _currentMusic; };
-        void setVolume(uint16 param);
+        virtual void setVolume(uint16 param);
 
 protected:
 

engines/sky/music/adlibmusic.h

@@ -50 +50 @@
         virtual void setupPointers(void);
         virtual void setupChannels(uint8 *channelData);
         virtual void startDriver(void);
+        virtual void setVolume(uint16 param);
 
         void premixerCall(int16 *buf, uint len);
 };

engines/sky/music/adlibchannel.cpp

@@ -85 +85 @@
 }
 
 void AdlibChannel::updateVolume(uint16 pVolume) {
-        pVolume = (pVolume * 3) >> 1;
-        if (pVolume > 0x7F)
-                pVolume = 0x7F;
-        _musicVolume = pVolume | 128;
+
+        // Do nothing. The mixer handles the music volume for us.
 }
 
 /*      This class uses the same area for the register mirror as the original

engines/sky/music/adlibmusic.cpp

@@ -39 +39 @@
 
         _opl = makeAdlibOPL(_sampleRate);
 
-        _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
+        _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
 }
 
 AdlibMusic::~AdlibMusic(void) {
@@ -102 +102 @@
         for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
                 uint16 chDataStart = ((channelData[(cnt << 1) | 1] << 8) | channelData[cnt << 1]) + _musicDataLoc;
                 _channels[cnt] = new AdlibChannel(_opl, _musicData, chDataStart);
-                _channels[cnt]->updateVolume(_musicVolume);
         }
 }
 
+void AdlibMusic::setVolume(uint16 param) {
+        _musicVolume = param;
+        _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 2 * param);
+}
+
 void AdlibMusic::startDriver(void) {
 
         uint16 cnt = 0;

engines/sky/control.cpp

@@ -678 +678 @@
                         if (volume >= 128) volume = 0;
                         else volume = 127 - volume;
                         _skyMusic->setVolume(volume);
+                        ConfMan.setInt("music_volume", 2 * volume);
                 }
                 buttonControl(_slide2);
                 _text->drawToScreen(WITH_MASK);