From ccfb74431b48fc9c8ee75173c0bdbd0123ed1803 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 30 Apr 2006 13:40:35 +0000
Subject: cleanup

svn-id: r22244
---
 sound/audiocd.h  |  1 -
 sound/vorbis.cpp | 38 +++++++++++++++++++-------------------
 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__);
 
-- 
cgit v1.2.3