[Scummvm-cvs-logs] SF.net SVN: scummvm: [25794] scummvm/trunk/sound
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Feb 22 19:35:58 CET 2007
Revision: 25794
http://scummvm.svn.sourceforge.net/scummvm/?rev=25794&view=rev
Author: fingolfin
Date: 2007-02-22 10:35:57 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
cleanup
Modified Paths:
--------------
scummvm/trunk/sound/mp3.cpp
scummvm/trunk/sound/vorbis.cpp
Modified: scummvm/trunk/sound/mp3.cpp
===================================================================
--- scummvm/trunk/sound/mp3.cpp 2007-02-22 18:33:01 UTC (rev 25793)
+++ scummvm/trunk/sound/mp3.cpp 2007-02-22 18:35:57 UTC (rev 25794)
@@ -145,7 +145,6 @@
return;
do {
-
// If necessary, load more data
if (_stream.buffer == NULL || _stream.error == MAD_ERROR_BUFLEN) {
if (!readMP3Data()) {
@@ -288,6 +287,11 @@
}
+#pragma mark -
+#pragma mark --- MP3 factory functions ---
+#pragma mark -
+
+
AudioStream *makeMP3Stream(Common::File *file, uint32 size) {
assert(file);
@@ -345,7 +349,6 @@
void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
};
-
MP3TrackInfo::MP3TrackInfo(const char *filename) :
_filename(filename),
_errorFlag(false) {
@@ -416,11 +419,6 @@
return NULL;
}
-
-// Closing note: we added File::incRef and File::decRef mainly for the sake of the input streams
-// If we could but get rid of it...
-
-
} // End of namespace Audio
#endif // #ifdef USE_MAD
Modified: scummvm/trunk/sound/vorbis.cpp
===================================================================
--- scummvm/trunk/sound/vorbis.cpp 2007-02-22 18:33:01 UTC (rev 25793)
+++ scummvm/trunk/sound/vorbis.cpp 2007-02-22 18:35:57 UTC (rev 25794)
@@ -41,9 +41,6 @@
#endif
-using Common::File;
-
-
namespace Audio {
// These are wrapper functions to allow using a SeekableReadStream object to
@@ -260,7 +257,7 @@
_bufferEnd = (int16 *)read_pos;
}
-AudioStream *makeVorbisStream(File *file, uint32 size) {
+AudioStream *makeVorbisStream(Common::File *file, uint32 size) {
assert(file);
// FIXME: For now, just read the whole data into memory, and be done
@@ -290,11 +287,11 @@
}
-
#pragma mark -
#pragma mark --- Ogg Vorbis Audio CD emulation ---
#pragma mark -
+
class VorbisTrackInfo : public DigitalTrackInfo {
private:
Common::String _filename;
@@ -306,7 +303,6 @@
void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
};
-
VorbisTrackInfo::VorbisTrackInfo(const char *filename) :
_filename(filename),
_errorFlag(false) {
@@ -342,7 +338,7 @@
}
// Convert startFrame & duration from frames (1/75 s) to milliseconds (1/1000s),
- // i.e. multiple with a factor of 1000/75 = 40/3
+ // i.e. multiply with a factor of 1000/75 = 40/3.
uint start = startFrame * 40 / 3;
uint end = duration ? ((startFrame + duration) * 40 / 3) : 0;
@@ -371,7 +367,6 @@
}
-
} // End of namespace Audio
#endif // #ifdef USE_VORBIS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list