diff options
author | Max Horn | 2003-06-15 01:00:43 +0000 |
---|---|---|
committer | Max Horn | 2003-06-15 01:00:43 +0000 |
commit | acec45a4834c4254a3e43427a204690414e8d6c8 (patch) | |
tree | 46e14cd026be1ff3ef2dc73bc6a925f1d26c67a0 /scumm | |
parent | f1fc68773d32783eea28d9ae711a26dd461cea1a (diff) | |
download | scummvm-rg350-acec45a4834c4254a3e43427a204690414e8d6c8.tar.gz scummvm-rg350-acec45a4834c4254a3e43427a204690414e8d6c8.tar.bz2 scummvm-rg350-acec45a4834c4254a3e43427a204690414e8d6c8.zip |
cleanup
svn-id: r8494
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/dialogs.cpp | 3 | ||||
-rw-r--r-- | scumm/imuse_digi.cpp | 2 | ||||
-rw-r--r-- | scumm/imuse_digi.h | 16 | ||||
-rw-r--r-- | scumm/player_v2.cpp | 1 | ||||
-rw-r--r-- | scumm/player_v2.h | 14 |
5 files changed, 25 insertions, 11 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index c010e00d17..849e63bee4 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -21,11 +21,12 @@ #include "stdafx.h" #include "dialogs.h" #include "sound.h" -#include "sound/mididrv.h" #include "scumm.h" #include "imuse.h" #include "player_v2.h" #include "verbs.h" +#include "sound/mididrv.h" +#include "sound/mixer.h" #ifndef DISABLE_HELP #include "help.h" diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index e09abb6acd..3e9ec67cd5 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -90,7 +90,7 @@ static void imus_digital_handler(void *engine) { } IMuseDigital::IMuseDigital(Scumm *scumm) { - memset(_channel, 0, sizeof(channel) * MAX_DIGITAL_CHANNELS); + memset(_channel, 0, sizeof(Channel) * MAX_DIGITAL_CHANNELS); _scumm = scumm; for (int32 l = 0; l < MAX_DIGITAL_CHANNELS; l++) { _channel[l]._initialized = false; diff --git a/scumm/imuse_digi.h b/scumm/imuse_digi.h index 15349023cf..280815b93d 100644 --- a/scumm/imuse_digi.h +++ b/scumm/imuse_digi.h @@ -32,19 +32,19 @@ class Scumm; class IMuseDigital { private: - struct region { + struct Region { uint32 _offset; // begin of region - uint32 _length; // lenght of region + uint32 _length; // length of region }; - struct jump { + struct Jump { uint32 _offset; // jump position uint32 _dest; // jump to uint32 _id; // id of jump uint32 _numLoops; // allmost 500 except one value: 2 }; - struct channel { + struct Channel { int8 _volumeRight; int8 _volume; int8 _volumeFade; @@ -54,9 +54,9 @@ private: bool _isJump; uint32 _numLoops; uint32 _offsetStop; - jump _jump[MAX_IMUSE_JUMPS]; + Jump _jump[MAX_IMUSE_JUMPS]; uint32 _numJumps; - region _region[MAX_IMUSE_REGIONS]; + Region _region[MAX_IMUSE_REGIONS]; uint32 _numRegions; uint32 _offset; byte *_data; @@ -70,7 +70,9 @@ private: bool _used; bool _toBeRemoved; bool _initialized; - } _channel[MAX_DIGITAL_CHANNELS]; + }; + + Channel _channel[MAX_DIGITAL_CHANNELS]; Scumm *_scumm; bool _pause; diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp index c572724d7e..4edb17293e 100644 --- a/scumm/player_v2.cpp +++ b/scumm/player_v2.cpp @@ -22,6 +22,7 @@ #include "common/engine.h" #include "player_v2.h" #include "scumm.h" +#include "sound/mixer.h" #define FREQ_HZ 236 // Don't change! diff --git a/scumm/player_v2.h b/scumm/player_v2.h index b532f8c7b6..32ec8345f9 100644 --- a/scumm/player_v2.h +++ b/scumm/player_v2.h @@ -24,8 +24,10 @@ #define PLAYER_V2_H #include "common/scummsys.h" -#include "sound/mixer.h" -class Scumm; + +#if !defined(__GNUC__) + #pragma START_PACK_STRUCTS +#endif struct channel_data { uint16 time_left; // 00 @@ -52,12 +54,20 @@ struct channel_data { uint16 music_script_nr; // 48 } GCC_PACK; +#if !defined(__GNUC__) + #pragma END_PACK_STRUCTS +#endif + + union ChannelInfo { channel_data d; uint16 array[sizeof(channel_data)/2]; }; +class Scumm; +class SoundMixer; + class Player_V2 { public: |