diff options
| author | Jamieson Christian | 2003-08-11 05:25:33 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-11 05:25:33 +0000 |
| commit | 5a1b0ac24ac4d3c060ddc6336f39dbf05f2672ac (patch) | |
| tree | 8209d64a12eadd9877ebf9d78fbc2d97c36af509 /simon/midi.h | |
| parent | 45f3db95fd0b5163042e5f385d05fa760a000591 (diff) | |
| download | scummvm-rg350-5a1b0ac24ac4d3c060ddc6336f39dbf05f2672ac.tar.gz scummvm-rg350-5a1b0ac24ac4d3c060ddc6336f39dbf05f2672ac.tar.bz2 scummvm-rg350-5a1b0ac24ac4d3c060ddc6336f39dbf05f2672ac.zip | |
More music volume management fixes
svn-id: r9636
Diffstat (limited to 'simon/midi.h')
| -rw-r--r-- | simon/midi.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/simon/midi.h b/simon/midi.h index de80e253c3..331bbce02f 100644 --- a/simon/midi.h +++ b/simon/midi.h @@ -34,7 +34,9 @@ struct MusicInfo { byte num_songs; // For Type 1 SMF resources byte * songs[16]; // For Type 1 SMF resources uint32 song_sizes[16]; // For Type 1 SMF resources + MidiChannel *channel[16]; // Dynamic remapping of channels to resolve conflicts + byte volume[16]; // Current channel volume MusicInfo() { clear(); } void clear() { @@ -57,7 +59,6 @@ protected: MusicInfo *_current; // Allows us to establish current context for operations. // These are maintained for both music and SFX - byte _volumeTable[16]; // 0-127 byte _masterVolume; // 0-255 bool _paused; @@ -67,9 +68,11 @@ protected: byte _queuedTrack; bool _loopQueuedTrack; +protected: static void onTimer (void *data); void clearConstructs(); void clearConstructs (MusicInfo &info); + void resetVolumeTable(); public: bool _enable_sfx; |