aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/music.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/saga/music.h')
-rw-r--r--engines/saga/music.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/music.h b/engines/saga/music.h
index 470b6e18b3..c7fef7225b 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -28,9 +28,9 @@
#ifndef SAGA_MUSIC_H
#define SAGA_MUSIC_H
-#include "sound/mixer.h"
#include "sound/mididrv.h"
#include "sound/midiparser.h"
+#include "sound/mixer.h"
#include "sound/decoders/mp3.h"
#include "sound/decoders/vorbis.h"
#include "sound/decoders/flac.h"
@@ -106,8 +106,7 @@ public:
void setVolume(int volume, int time = 1);
int getVolume() { return _currentVolume; }
- int32 *_songTable;
- int _songTableLen;
+ Common::Array<int32> _songTable;
private:
SagaEngine *_vm;
@@ -126,11 +125,12 @@ private:
ResourceContext *_digitalMusicContext;
MidiParser *_parser;
- byte *_midiMusicData;
static void musicVolumeGaugeCallback(void *refCon);
static void onTimer(void *refCon);
void musicVolumeGauge();
+ ByteArray *_currentMusicBuffer;
+ ByteArray _musicBuffer[2];
};
} // End of namespace Saga