[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.85,1.86 sound.h,1.25,1.26
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 17:05:43 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 sound.cpp,1.60,1.61 sound.h,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky intro.h,1.9,1.10 sound.cpp,1.51,1.52 sound.h,1.28,1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv451/simon
Modified Files:
sound.cpp sound.h
Log Message:
Moved some more stuff to namespace Audio (enough for tonight)
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- sound.cpp 10 May 2005 23:48:43 -0000 1.85
+++ sound.cpp 11 May 2005 00:01:32 -0000 1.86
@@ -47,25 +47,25 @@
BaseSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false);
BaseSound(Audio::Mixer *mixer, File *file, uint32 *offsets, bool bigendian = false);
virtual ~BaseSound();
- virtual void playSound(uint sound, SoundHandle *handle, byte flags) = 0;
+ virtual void playSound(uint sound, Audio::SoundHandle *handle, byte flags) = 0;
};
class WavSound : public BaseSound {
public:
WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {};
- void playSound(uint sound, SoundHandle *handle, byte flags);
+ void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
};
class VocSound : public BaseSound {
public:
VocSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
- void playSound(uint sound, SoundHandle *handle, byte flags);
+ void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
};
class RawSound : public BaseSound {
public:
RawSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
- void playSound(uint sound, SoundHandle *handle, byte flags);
+ void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
};
BaseSound::BaseSound(Audio::Mixer *mixer, File *file, uint32 base, bool bigendian) {
@@ -119,7 +119,7 @@
delete _file;
}
-void WavSound::playSound(uint sound, SoundHandle *handle, byte flags) {
+void WavSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
if (_offsets == NULL)
return;
@@ -134,7 +134,7 @@
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, stream);
}
-void VocSound::playSound(uint sound, SoundHandle *handle, byte flags) {
+void VocSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
if (_offsets == NULL)
return;
@@ -146,7 +146,7 @@
_mixer->playRaw(handle, buffer, size, samples_per_sec, flags | Audio::Mixer::FLAG_AUTOFREE);
}
-void RawSound::playSound(uint sound, SoundHandle *handle, byte flags) {
+void RawSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
if (_offsets == NULL)
return;
@@ -163,10 +163,10 @@
class MP3Sound : public BaseSound {
public:
MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
- void playSound(uint sound, SoundHandle *handle, byte flags);
+ void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
};
-void MP3Sound::playSound(uint sound, SoundHandle *handle, byte flags)
+void MP3Sound::playSound(uint sound, Audio::SoundHandle *handle, byte flags)
{
if (_offsets == NULL)
return;
@@ -187,10 +187,10 @@
class VorbisSound : public BaseSound {
public:
VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
- void playSound(uint sound, SoundHandle *handle, byte flags);
+ void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
};
-void VorbisSound::playSound(uint sound, SoundHandle *handle, byte flags)
+void VorbisSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags)
{
if (_offsets == NULL)
return;
@@ -211,10 +211,10 @@
class FlacSound : public BaseSound {
public:
FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
- void playSound(uint sound, SoundHandle *handle, byte flags);
+ void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
};
-void FlacSound::playSound(uint sound, SoundHandle *handle, byte flags)
+void FlacSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags)
{
if (_offsets == NULL)
return;
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sound.h 10 May 2005 23:48:43 -0000 1.25
+++ sound.h 11 May 2005 00:01:33 -0000 1.26
@@ -44,9 +44,9 @@
uint32 *_offsets;
uint16 _lastVoiceFile;
- SoundHandle _voiceHandle;
- SoundHandle _effectsHandle;
- SoundHandle _ambientHandle;
+ Audio::SoundHandle _voiceHandle;
+ Audio::SoundHandle _effectsHandle;
+ Audio::SoundHandle _ambientHandle;
bool _hasEffectsFile;
bool _hasVoiceFile;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 sound.cpp,1.60,1.61 sound.h,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky intro.h,1.9,1.10 sound.cpp,1.51,1.52 sound.h,1.28,1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list