libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 20:51:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

EMI: Clean up EMISound header.

Browse Source
This commit is contained in:
Joni Vähämäki 2014-07-20 14:46:26 +03:00
parent bef2b6016f
commit 219e0a18dc
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
engines/grim/emi/sound/emisound.h
View File

@ -49,27 +49,6 @@ struct MusicEntry {
// from Actor, to allow for splitting that into EMI-sound and iMuse without
// changing iMuse.
class EMISound {
struct StackEntry {
int _state;
SoundTrack *_track;
};
SoundTrack **_channels;
int32 _musicChannel;
MusicEntry *_musicTable;
Common::String _musicPrefix;
Common::Stack<StackEntry> _stateStack;
Common::Mutex _mutex;
typedef Common::HashMap<int, SoundTrack *> TrackMap;
TrackMap _preloadedTrackMap;
static void timerHandler(void *refConf);
void removeItem(SoundTrack *item);
int32 getFreeChannel();
int32 getChannelByName(const Common::String &name);
void freeChannel(int32 channel);
void initMusicTable();
public:
EMISound(int fps);
~EMISound();
@ -108,10 +87,32 @@ public:
uint32 getMsPos(int stateId);
private:
struct StackEntry {
int _state;
SoundTrack *_track;
};
SoundTrack **_channels;
int32 _musicChannel;
MusicEntry *_musicTable;
Common::String _musicPrefix;
Common::Stack<StackEntry> _stateStack;
Common::Mutex _mutex;
typedef Common::HashMap<int, SoundTrack *> TrackMap;
TrackMap _preloadedTrackMap;
int _curMusicState;
int _callbackFps;
int _curTrackId;
static void timerHandler(void *refConf);
void removeItem(SoundTrack *item);
int32 getFreeChannel();
int32 getChannelByName(const Common::String &name);
void freeChannel(int32 channel);
void initMusicTable();
void callback();
void updateTrack(SoundTrack *track);
void freeAllChannels();