[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.71,1.72 flac.cpp,1.7,1.8 flac.h,1.3,1.4 mixer.h,1.103,1.104 mp3.cpp,1.18,1.19 mp3.h,1.9,1.10 vorbis.cpp,1.22,1.23 vorbis.h,1.9,1.10
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:00:20 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.h,1.46,1.47
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.35,1.36 compact.h,1.16,1.17 disk.cpp,1.66,1.67 disk.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17315/sound
Modified Files:
audiostream.cpp flac.cpp flac.h mixer.h mp3.cpp mp3.h
vorbis.cpp vorbis.h
Log Message:
Moved class File and the MD5 stuff to namespace Common
Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- audiostream.cpp 9 Jan 2005 15:48:27 -0000 1.71
+++ audiostream.cpp 10 May 2005 22:56:19 -0000 1.72
@@ -36,7 +36,7 @@
* Pointer to a function which tries to open a file of type StreamFormat.
* Return NULL in case of an error (invalid/nonexisting file).
*/
- AudioStream* (*openStreamFile)(File *file, uint32 size);
+ AudioStream* (*openStreamFile)(Common::File *file, uint32 size);
};
static const StreamFileFormat STREAM_FILEFORMATS[] = {
@@ -66,7 +66,7 @@
char *ext = &buffer[len+1];
AudioStream* stream = NULL;
- File *fileHandle = new File();
+ Common::File *fileHandle = new Common::File();
for (int i = 0; i < ARRAYSIZE(STREAM_FILEFORMATS)-1 && stream == NULL; ++i) {
strcpy(ext, STREAM_FILEFORMATS[i].fileExtension);
Index: flac.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/flac.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- flac.cpp 12 Mar 2005 18:56:06 -0000 1.7
+++ flac.cpp 10 May 2005 22:56:19 -0000 1.8
@@ -32,6 +32,10 @@
#define FLAC__NO_DLL // that MS-magic gave me headaches - just link the library you like
#include <FLAC/seekable_stream_decoder.h>
+
+using Common::File;
+
+
#pragma mark -
#pragma mark --- Flac stream ---
#pragma mark -
Index: flac.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/flac.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flac.h 1 Jan 2005 16:09:22 -0000 1.3
+++ flac.h 10 May 2005 22:56:20 -0000 1.4
@@ -29,11 +29,13 @@
class AudioStream;
class DigitalTrackInfo;
-class File;
+namespace Common {
+ class File;
+}
DigitalTrackInfo *getFlacTrack(int track);
-AudioStream *makeFlacStream(File *file, uint32 size);
+AudioStream *makeFlacStream(Common::File *file, uint32 size);
#endif // #ifdef USE_FLAC
#endif // #ifndef SOUND_FLAC_H
Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- mixer.h 5 May 2005 15:59:23 -0000 1.103
+++ mixer.h 10 May 2005 22:56:20 -0000 1.104
@@ -30,7 +30,6 @@
class AudioStream;
class Channel;
-class File;
class OSystem;
class SoundHandle {
Index: mp3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mp3.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mp3.cpp 12 Mar 2005 18:56:06 -0000 1.18
+++ mp3.cpp 10 May 2005 22:56:20 -0000 1.19
@@ -32,6 +32,9 @@
#include <mad.h>
+using Common::File;
+
+
#pragma mark -
#pragma mark --- MP3 (MAD) stream ---
#pragma mark -
Index: mp3.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mp3.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mp3.h 1 Jan 2005 16:09:23 -0000 1.9
+++ mp3.h 10 May 2005 22:56:20 -0000 1.10
@@ -29,11 +29,13 @@
class AudioStream;
class DigitalTrackInfo;
-class File;
+namespace Common {
+ class File;
+}
DigitalTrackInfo *getMP3Track(int track);
-AudioStream *makeMP3Stream(File *file, uint32 size);
+AudioStream *makeMP3Stream(Common::File *file, uint32 size);
#endif
Index: vorbis.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- vorbis.cpp 12 Mar 2005 18:56:06 -0000 1.22
+++ vorbis.cpp 10 May 2005 22:56:20 -0000 1.23
@@ -32,9 +32,11 @@
#include <vorbis/vorbisfile.h>
-static AudioStream *makeVorbisStream(OggVorbis_File *file, int duration);
+using Common::File;
+static AudioStream *makeVorbisStream(OggVorbis_File *file, int duration);
+
#pragma mark -
#pragma mark --- Ogg Vorbis Audio CD emulation ---
#pragma mark -
Index: vorbis.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vorbis.h 1 Jan 2005 16:09:23 -0000 1.9
+++ vorbis.h 10 May 2005 22:56:20 -0000 1.10
@@ -29,11 +29,13 @@
class AudioStream;
class DigitalTrackInfo;
-class File;
+namespace Common {
+ class File;
+}
DigitalTrackInfo *getVorbisTrack(int track);
-AudioStream *makeVorbisStream(File *file, uint32 size);
+AudioStream *makeVorbisStream(Common::File *file, uint32 size);
#endif
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.h,1.46,1.47
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.35,1.36 compact.h,1.16,1.17 disk.cpp,1.66,1.67 disk.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list