diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/sky/music/gmmusic.h | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/sky/music/gmmusic.h')
| -rw-r--r-- | engines/sky/music/gmmusic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sky/music/gmmusic.h b/engines/sky/music/gmmusic.h index 0f54a930e4..068601ba1f 100644 --- a/engines/sky/music/gmmusic.h +++ b/engines/sky/music/gmmusic.h @@ -31,7 +31,7 @@ namespace Sky { class GmMusic : public MusicBase { public: - GmMusic(MidiDriver *pMidiDrv, Disk *pDisk); + GmMusic(MidiDriver *pMidiDrv, Audio::Mixer *pMixer, Disk *pDisk); ~GmMusic(); virtual void setVolume(uint16 param); private: |