[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.67,1.68 d_sound.h,1.24,1.25

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv1864/driver

Modified Files:
	d_sound.cpp d_sound.h 
Log Message:
Some renaming (ironic in the light of Fingolfin's recent namespace
suggestion, but I prepared the patch long before reading the mail :-).

Also, the remaining parts of the control panel etc. have been moved into a
class of their own.

This is still work in progress. I'm well aware that some of the classes
aren't as well separated as they ought to be, and that using global
variables to keep track of the different classes probably isn't pretty.


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- d_sound.cpp	2 Oct 2003 07:01:12 -0000	1.67
+++ d_sound.cpp	3 Oct 2003 06:54:44 -0000	1.68
@@ -63,7 +63,7 @@
 	143, 159, 175, 191, 207, 223, 239, 255
 };
 
-int16 MusicHandle::read() {
+int16 Sword2MusicHandle::read() {
 	uint8 in;
 	uint16 delta;
 	int16 out;
@@ -115,7 +115,7 @@
 	return out;
 }
 
-bool MusicHandle::eos() const {
+bool Sword2MusicHandle::eos() const {
 	if (!_streaming || _filePos >= _fileEnd)
 		return true;
 	return false;

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- d_sound.h	2 Oct 2003 07:01:12 -0000	1.24
+++ d_sound.h	3 Oct 2003 06:54:44 -0000	1.25
@@ -36,9 +36,9 @@
 	uint16 *_buf;
 	int32 _bufSize;
 	PlayingSoundHandle _handle;
-} FxHandle;
+} Sword2FxHandle;
 
-class MusicHandle : public MusicStream {
+class Sword2MusicHandle : public MusicStream {
 public:
 	uint32 _id;
 	bool _firstTime;
@@ -57,9 +57,9 @@
 	int16 read();
 	bool eos() const;
 
-	MusicHandle() : MusicStream(), _firstTime(false), _streaming(false),
-			_paused(false), _looping(false), _fading(0),
-			_fileStart(0), _filePos(0), _fileEnd(0),
+	Sword2MusicHandle() : MusicStream(), _firstTime(false),
+			_streaming(false), _paused(false), _looping(false),
+			_fading(0), _fileStart(0), _filePos(0), _fileEnd(0),
 			_lastSample(0) {}
 };
 
@@ -70,8 +70,8 @@
 	OSystem::MutexRef _mutex;
 	RateConverter *_converter;
 
-	FxHandle _fx[MAXFX];
-	MusicHandle _music[MAXMUS + 1];
+	Sword2FxHandle _fx[MAXFX];
+	Sword2MusicHandle _music[MAXMUS + 1];
 
 	uint8 _musicVol;