[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.55,1.56 imuse_digi.cpp,1.18,1.19 imuse_digi.h,1.2,1.3 player_v2.cpp,2.14,2.15 player_v2.h,2.4,2.5
Max Horn
fingolfin at users.sourceforge.net
Sat Jun 14 18:01:07 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv22579
Modified Files:
dialogs.cpp imuse_digi.cpp imuse_digi.h player_v2.cpp
player_v2.h
Log Message:
cleanup
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- dialogs.cpp 14 Jun 2003 21:18:14 -0000 1.55
+++ dialogs.cpp 15 Jun 2003 01:00:43 -0000 1.56
@@ -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"
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- imuse_digi.cpp 15 Jun 2003 00:54:13 -0000 1.18
+++ imuse_digi.cpp 15 Jun 2003 01:00:43 -0000 1.19
@@ -90,7 +90,7 @@
}
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;
Index: imuse_digi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imuse_digi.h 6 Mar 2003 21:46:01 -0000 1.2
+++ imuse_digi.h 15 Jun 2003 01:00:43 -0000 1.3
@@ -32,19 +32,19 @@
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 @@
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 @@
bool _used;
bool _toBeRemoved;
bool _initialized;
- } _channel[MAX_DIGITAL_CHANNELS];
+ };
+
+ Channel _channel[MAX_DIGITAL_CHANNELS];
Scumm *_scumm;
bool _pause;
Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -d -r2.14 -r2.15
--- player_v2.cpp 7 Jun 2003 09:48:10 -0000 2.14
+++ player_v2.cpp 15 Jun 2003 01:00:43 -0000 2.15
@@ -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!
Index: player_v2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- player_v2.h 6 Jun 2003 21:56:37 -0000 2.4
+++ player_v2.h 15 Jun 2003 01:00:43 -0000 2.5
@@ -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,11 +54,19 @@
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 {
More information about the Scummvm-git-logs
mailing list