diff options
author | Matthew Stewart | 2018-07-23 22:53:10 -0400 |
---|---|---|
committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
commit | fe98dbb69d1f8222eeb391111f59670658b0daad (patch) | |
tree | fdd8c33cb65529082f698e08e9d1a86d7cdc05e8 /engines/startrek/sound.h | |
parent | aa68655742c94026c701dafc1ef6efb032774434 (diff) | |
download | scummvm-rg350-fe98dbb69d1f8222eeb391111f59670658b0daad.tar.gz scummvm-rg350-fe98dbb69d1f8222eeb391111f59670658b0daad.tar.bz2 scummvm-rg350-fe98dbb69d1f8222eeb391111f59670658b0daad.zip |
STARTREK: Reformat with artistic style
Diffstat (limited to 'engines/startrek/sound.h')
-rw-r--r-- | engines/startrek/sound.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/startrek/sound.h b/engines/startrek/sound.h index 37100b467c..5354d92fd9 100644 --- a/engines/startrek/sound.h +++ b/engines/startrek/sound.h @@ -30,7 +30,7 @@ #include "audio/mixer.h" namespace Common { - class MacResManager; +class MacResManager; } namespace StarTrek { @@ -114,7 +114,7 @@ class Sound { public: Sound(StarTrekEngine *vm); ~Sound(); - + void clearAllMidiSlots(); /** * Plays a midi track as a sound effect (one of midi slots 1-7) @@ -131,21 +131,21 @@ public: void setMusicEnabled(bool enable); void setSfxEnabled(bool enable); void checkLoopMusic(); - + private: StarTrekEngine *_vm; Audio::SoundHandle *_soundHandle; - + void loadPCMusicFile(const Common::String &baseSoundName); void clearMidiSlot(int slot); - + // MIDI-Related Variables MidiDriver *_midiDriver; MidiPlaybackSlot _midiSlots[NUM_MIDI_SLOTS]; // 0 is for music; 1-7 are for sfx - Common::List<MidiPlaybackSlot*> _midiSlotList; // Sorts midi slots by most recently used + Common::List<MidiPlaybackSlot *> _midiSlotList; // Sorts midi slots by most recently used byte *loadedSoundData; - uint32 _midiDevice; + uint32 _midiDevice; // VOC-related variables Audio::SoundHandle _sfxHandles[MAX_SFX_PLAYING]; |