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

[fingolfin at users.sourceforge.net]

Revision: 34308
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34308&view=rev
Author:   fingolfin
Date:     2008-09-03 15:22:19 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
Some cleanup by peres

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/backends/saves/default/default-saves.cpp
    scummvm/trunk/sound/flac.cpp
    scummvm/trunk/sound/flac.h
    scummvm/trunk/sound/mp3.h
    scummvm/trunk/sound/vorbis.h

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-09-03 14:55:19 UTC (rev 34307)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-09-03 15:22:19 UTC (rev 34308)
@@ -34,7 +34,6 @@
 #include "backends/platform/sdl/sdl.h"
 #include "common/config-manager.h"
 #include "common/events.h"
-#include "common/file.h"
 #include "common/util.h"
 
 #include "backends/saves/default/default-saves.h"
@@ -516,7 +515,7 @@
 		// Generate samples and put them into the next buffer
 		nextSoundBuffer = _activeSoundBuf ^ 1;
 		_mixer->mixCallback(_soundBuffers[nextSoundBuffer], _soundBufSize);
-		
+
 		// Swap buffers
 		_activeSoundBuf = nextSoundBuffer;
 	}
@@ -560,7 +559,7 @@
 		SDL_CondBroadcast(_soundCond);
 		SDL_WaitThread(_soundThread, NULL);
 
-		// Kill the mutex & cond variables. 
+		// Kill the mutex & cond variables.
 		// Attention: AT this point, the mixer callback must not be running
 		// anymore, else we will crash!
 		SDL_DestroyMutex(_soundMutex);
@@ -583,10 +582,10 @@
 
 	// Lock mutex, to ensure our data is not overwritten by the producer thread
 	SDL_LockMutex(this_->_soundMutex);
-	
+
 	// Copy data from the current sound buffer
 	memcpy(samples, this_->_soundBuffers[this_->_activeSoundBuf], len);
-	
+
 	// Unlock mutex and wake up the produced thread
 	SDL_UnlockMutex(this_->_soundMutex);
 	SDL_CondSignal(this_->_soundCond);
@@ -646,7 +645,7 @@
 		// even if it didn't. Probably only happens for "weird" rates, though.
 		_samplesPerSec = obtained.freq;
 		debug(1, "Output sample rate: %d Hz", _samplesPerSec);
-	
+
 		// Tell the mixer that we are ready and start the sound processing
 		_mixer->setOutputRate(_samplesPerSec);
 		_mixer->setReady(true);

Modified: scummvm/trunk/backends/saves/default/default-saves.cpp
===================================================================
--- scummvm/trunk/backends/saves/default/default-saves.cpp	2008-09-03 14:55:19 UTC (rev 34307)
+++ scummvm/trunk/backends/saves/default/default-saves.cpp	2008-09-03 15:22:19 UTC (rev 34308)
@@ -28,7 +28,6 @@
 #include "common/savefile.h"
 #include "common/util.h"
 #include "common/fs.h"
-#include "common/file.h"
 #include "common/config-manager.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/saves/compressed/compressed-saves.h"

Modified: scummvm/trunk/sound/flac.cpp
===================================================================
--- scummvm/trunk/sound/flac.cpp	2008-09-03 14:55:19 UTC (rev 34307)
+++ scummvm/trunk/sound/flac.cpp	2008-09-03 15:22:19 UTC (rev 34308)
@@ -72,9 +72,6 @@
 #endif
 
 
-using Common::File;
-
-
 namespace Audio {
 
 #pragma mark -

Modified: scummvm/trunk/sound/flac.h
===================================================================
--- scummvm/trunk/sound/flac.h	2008-09-03 14:55:19 UTC (rev 34307)
+++ scummvm/trunk/sound/flac.h	2008-09-03 15:22:19 UTC (rev 34308)
@@ -31,7 +31,6 @@
 #ifdef USE_FLAC
 
 namespace Common {
-	class File;
 	class SeekableReadStream;
 }
 

Modified: scummvm/trunk/sound/mp3.h
===================================================================
--- scummvm/trunk/sound/mp3.h	2008-09-03 14:55:19 UTC (rev 34307)
+++ scummvm/trunk/sound/mp3.h	2008-09-03 15:22:19 UTC (rev 34308)
@@ -31,7 +31,6 @@
 #ifdef USE_MAD
 
 namespace Common {
-	class File;
 	class SeekableReadStream;
 }
 

Modified: scummvm/trunk/sound/vorbis.h
===================================================================
--- scummvm/trunk/sound/vorbis.h	2008-09-03 14:55:19 UTC (rev 34307)
+++ scummvm/trunk/sound/vorbis.h	2008-09-03 15:22:19 UTC (rev 34308)
@@ -31,7 +31,6 @@
 #ifdef USE_VORBIS
 
 namespace Common {
-	class File;
 	class SeekableReadStream;
 }
 


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