aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-04-30 13:40:35 +0000
committerMax Horn2006-04-30 13:40:35 +0000
commitccfb74431b48fc9c8ee75173c0bdbd0123ed1803 (patch)
treed16b73e66eca6d83a8caa86e60ee859951368b33
parentc34e30ea79d146dd67ce0067bc96098b87fbfcbf (diff)
downloadscummvm-rg350-ccfb74431b48fc9c8ee75173c0bdbd0123ed1803.tar.gz
scummvm-rg350-ccfb74431b48fc9c8ee75173c0bdbd0123ed1803.tar.bz2
scummvm-rg350-ccfb74431b48fc9c8ee75173c0bdbd0123ed1803.zip
cleanup
svn-id: r22244
-rw-r--r--sound/audiocd.h1
-rw-r--r--sound/vorbis.cpp38
2 files changed, 19 insertions, 20 deletions
diff --git a/sound/audiocd.h b/sound/audiocd.h
index c7d5fd15e0..2083ffdf39 100644
--- a/sound/audiocd.h
+++ b/sound/audiocd.h
@@ -33,7 +33,6 @@ namespace Audio {
class DigitalTrackInfo {
public:
- virtual bool error() = 0;
virtual void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) = 0;
virtual ~DigitalTrackInfo() { }
};
diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp
index 002d75c170..eaa8e80b27 100644
--- a/sound/vorbis.cpp
+++ b/sound/vorbis.cpp
@@ -48,25 +48,6 @@ namespace Audio {
static AudioStream *makeVorbisStream(OggVorbis_File *file, int duration);
-#pragma mark -
-#pragma mark --- Ogg Vorbis Audio CD emulation ---
-#pragma mark -
-
-class VorbisTrackInfo : public DigitalTrackInfo {
-private:
- File *_file;
- OggVorbis_File _ov_file;
- bool _error_flag;
-
-public:
- VorbisTrackInfo(File *file);
- ~VorbisTrackInfo();
- bool openTrack();
- bool error() { return _error_flag; }
- void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
-};
-
-
// These are wrapper functions to allow using a File object to
// provide data to the OggVorbis_File object.
@@ -164,6 +145,25 @@ static ov_callbacks g_File_wrap = {
};
+#pragma mark -
+#pragma mark --- Ogg Vorbis Audio CD emulation ---
+#pragma mark -
+
+class VorbisTrackInfo : public DigitalTrackInfo {
+private:
+ File *_file;
+ OggVorbis_File _ov_file;
+ bool _error_flag;
+
+public:
+ VorbisTrackInfo(File *file);
+ ~VorbisTrackInfo();
+ bool openTrack();
+ bool error() { return _error_flag; }
+ void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
+};
+
+
VorbisTrackInfo::VorbisTrackInfo(File *file) {
//debug(5, "" __FILE__ ":%i", __LINE__);