aboutsummaryrefslogtreecommitdiff
path: root/queen/music.h
diff options
context:
space:
mode:
authorJoost Peters2004-03-09 00:52:07 +0000
committerJoost Peters2004-03-09 00:52:07 +0000
commit1020f97ceab9f1a606abf0bf6a0160b4136fab46 (patch)
tree07ac56b5bbe4fa0cf43e973a125079ebe0c8ff2e /queen/music.h
parent8b39133cab44244b6b4e3eeb303e91d0860a09b1 (diff)
downloadscummvm-rg350-1020f97ceab9f1a606abf0bf6a0160b4136fab46.tar.gz
scummvm-rg350-1020f97ceab9f1a606abf0bf6a0160b4136fab46.tar.bz2
scummvm-rg350-1020f97ceab9f1a606abf0bf6a0160b4136fab46.zip
Enable music volume slider in Journal
svn-id: r13222
Diffstat (limited to 'queen/music.h')
-rw-r--r--queen/music.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/queen/music.h b/queen/music.h
index 948efdb628..42d5429b6d 100644
--- a/queen/music.h
+++ b/queen/music.h
@@ -35,7 +35,9 @@ class MusicPlayer : public MidiDriver {
public:
MusicPlayer(MidiDriver *driver, byte *data, uint32 size);
~MusicPlayer();
-
+ void setVolume(int volume);
+ int getVolume() { return _masterVolume; }
+
void hasNativeMT32(bool b) { _nativeMT32 = b; }
void playMusic();
void stopMusic();
@@ -81,7 +83,7 @@ protected:
bool _isPlaying;
bool _looping;
bool _randomLoop;
- byte _volume;
+ byte _masterVolume;
uint8 _queuePos;
int16 _currentSong;
int16 _lastSong; //first song from previous queue
@@ -103,6 +105,9 @@ public:
void playMusic() { _player->playMusic(); }
void stopSong() { _player->stopMusic(); }
+ void setVolume(int vol) { _player->setVolume(vol); }
+ int volume() { return _player->getVolume(); }
+
protected:
byte *_musicData;
uint32 _musicDataSize;