[Scummvm-cvs-logs] CVS: scummvm/sound fmopl.cpp,1.2,1.3 mididrv.cpp,1.3,1.4 mididrv.h,1.1.1.1,1.2 mixer.cpp,1.6,1.7 mixer.h,1.3,1.4

Max Horn fingolfin at users.sourceforge.net
Sat Sep 7 18:09:05 CEST 2002


Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv12143/sound

Modified Files:
	fmopl.cpp mididrv.cpp mididrv.h mixer.cpp mixer.h 
Log Message:
rewrote config class; cleanup; code restructuring

Index: fmopl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fmopl.cpp	21 Aug 2002 17:13:17 -0000	1.2
+++ fmopl.cpp	8 Sep 2002 01:08:12 -0000	1.3
@@ -24,13 +24,15 @@
 
 #include "stdafx.h"
 
-#include "scumm.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <math.h>
+
 #include "fmopl.h"
+
+#include "common/engine.h"	// for warning/error/debug
 
 #ifndef PI
 #define PI 3.14159265358979323846

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mididrv.cpp	24 Aug 2002 15:31:37 -0000	1.3
+++ mididrv.cpp	8 Sep 2002 01:08:12 -0000	1.4
@@ -31,15 +31,16 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
 #include "mididrv.h"
 #include "fmopl.h"
 #include "mixer.h"
+#include "common/engine.h"	// for warning/error/debug
+#include "common/util.h"
 
 #if defined(WIN32) && !defined(_WIN32_WCE)
 
 /* Windows MIDI driver */
-class MidiDriver_WIN:public MidiDriver {
+class MidiDriver_WIN : public MidiDriver {
 public:
 	int open(int mode);
 	void close();

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- mididrv.h	21 Aug 2002 16:07:42 -0000	1.1.1.1
+++ mididrv.h	8 Sep 2002 01:08:12 -0000	1.2
@@ -20,6 +20,11 @@
  *
  */
 
+#ifndef SOUND_MIDIDRV_H
+#define SOUND_MIDIDRV_H
+
+#include "scummsys.h"
+
 struct MidiEvent {
 	uint32 delta;
 	uint32 event;
@@ -122,3 +127,5 @@
 extern MidiDriver *MidiDriver_AMIDI_create();
 extern MidiDriver *MidiDriver_MIDIEMU_create();
 extern MidiDriver *MidiDriver_ALSA_create();
+
+#endif

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mixer.cpp	2 Sep 2002 20:15:14 -0000	1.6
+++ mixer.cpp	8 Sep 2002 01:08:12 -0000	1.7
@@ -21,8 +21,9 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
 #include "mixer.h"
+#include "common/engine.h"	// for warning/error/debug
+#include "common/file.h"
 
 SoundMixer::SoundMixer() {
 	_volumeTable = (int16 *)calloc(256 * sizeof(int16), 1);

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mixer.h	2 Sep 2002 07:53:43 -0000	1.3
+++ mixer.h	8 Sep 2002 01:08:12 -0000	1.4
@@ -29,6 +29,9 @@
 #include <mad.h>
 #endif
 
+#include "common/scummsys.h"
+#include "common/system.h"
+
 typedef uint32 PlayingSoundHandle;
 
 class File;
@@ -60,7 +63,8 @@
 		byte _flags;
 
 	public:
-		ChannelRaw(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags);
+		ChannelRaw(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags);
+
 		void mix(int16 * data, uint len);
 		void realDestroy();
 	};
@@ -77,7 +81,8 @@
 		byte _flags;
 
 	public:
-		ChannelStream(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags);
+		ChannelStream(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags);
+
 		void append(void * sound, uint32 size);
 		void mix(int16 * data, uint len);
 		void realDestroy();
@@ -98,7 +103,8 @@
 		byte _flags;
 
 	public:
-		ChannelMP3(SoundMixer * mixer, void *sound, uint size, byte flags);
+		ChannelMP3(SoundMixer * mixer, void *sound, uint size, byte flags);
+
 		void mix(int16 * data, uint len);
 		void realDestroy();
 
@@ -116,9 +122,11 @@
 		mad_timer_t _duration;
 		File * _file;
 		bool _initialized;
-
+
+
 	public:
-		ChannelMP3CDMusic(SoundMixer * mixer, File * file, mad_timer_t duration);
+		ChannelMP3CDMusic(SoundMixer * mixer, File * file, mad_timer_t duration);
+
 		void mix(int16 * data, uint len);
 		void realDestroy();
 		bool soundFinished();





More information about the Scummvm-git-logs mailing list