[Scummvm-cvs-logs] SF.net SVN: scummvm: [22244] scummvm/trunk/sound

[fingolfin at users.sourceforge.net]

Revision: 22244
Author:   fingolfin
Date:     2006-04-30 06:40:35 -0700 (Sun, 30 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22244&view=rev

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/sound/audiocd.h
    scummvm/trunk/sound/vorbis.cpp
Modified: scummvm/trunk/sound/audiocd.h
===================================================================
--- scummvm/trunk/sound/audiocd.h	2006-04-30 12:56:13 UTC (rev 22243)
+++ scummvm/trunk/sound/audiocd.h	2006-04-30 13:40:35 UTC (rev 22244)
@@ -33,7 +33,6 @@
 
 class DigitalTrackInfo {
 public:
-	virtual bool error() = 0;
 	virtual void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) = 0;
 	virtual ~DigitalTrackInfo() { }
 };

Modified: scummvm/trunk/sound/vorbis.cpp
===================================================================
--- scummvm/trunk/sound/vorbis.cpp	2006-04-30 12:56:13 UTC (rev 22243)
+++ scummvm/trunk/sound/vorbis.cpp	2006-04-30 13:40:35 UTC (rev 22244)
@@ -48,25 +48,6 @@
 
 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 @@
 };
 
 
+#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__);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.