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

[fingolfin at users.sourceforge.net]

Revision: 47468
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47468&view=rev
Author:   fingolfin
Date:     2010-01-23 13:32:45 +0000 (Sat, 23 Jan 2010)

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

Modified Paths:
--------------
    scummvm/trunk/sound/iff_sound.cpp
    scummvm/trunk/sound/iff_sound.h

Modified: scummvm/trunk/sound/iff_sound.cpp
===================================================================
--- scummvm/trunk/sound/iff_sound.cpp	2010-01-23 13:05:46 UTC (rev 47467)
+++ scummvm/trunk/sound/iff_sound.cpp	2010-01-23 13:32:45 UTC (rev 47468)
@@ -27,17 +27,35 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "sound/raw.h"
+#include "common/iff_container.h"
 #include "common/func.h"
 
 namespace Audio {
 
+struct Voice8Header {
+	uint32	oneShotHiSamples;
+	uint32	repeatHiSamples;
+	uint32	samplesPerHiCycle;
+	uint16	samplesPerSec;
+	byte	octaves;
+	byte	compression;
+	uint32	volume;
+
+	Voice8Header() {
+		memset(this, 0, sizeof(Voice8Header));
+	}
+
+	void load(Common::ReadStream &stream);
+};
+
 void Voice8Header::load(Common::ReadStream &stream) {
-	stream.read(this, sizeof(Voice8Header));
-	oneShotHiSamples = FROM_BE_32(oneShotHiSamples);
-	repeatHiSamples = FROM_BE_32(repeatHiSamples);
-	samplesPerHiCycle = FROM_BE_32(samplesPerHiCycle);
-	samplesPerSec = FROM_BE_16(samplesPerSec);
-	volume = FROM_BE_32(volume);
+	oneShotHiSamples = stream.readUint32BE();
+	repeatHiSamples = stream.readUint32BE();
+	samplesPerHiCycle = stream.readUint32BE();
+	samplesPerSec = stream.readUint16BE();
+	octaves = stream.readByte();
+	compression = stream.readByte();
+	volume = stream.readUint32BE();
 }
 
 

Modified: scummvm/trunk/sound/iff_sound.h
===================================================================
--- scummvm/trunk/sound/iff_sound.h	2010-01-23 13:05:46 UTC (rev 47467)
+++ scummvm/trunk/sound/iff_sound.h	2010-01-23 13:32:45 UTC (rev 47468)
@@ -32,30 +32,16 @@
 #ifndef SOUND_IFF_H
 #define SOUND_IFF_H
 
-#include "common/iff_container.h"
-#include "sound/audiostream.h"
+namespace Common {
+	class ReadStream;
+}
 
 namespace Audio {
 
-struct Voice8Header {
-	uint32	oneShotHiSamples;
-	uint32	repeatHiSamples;
-	uint32	samplesPerHiCycle;
-	uint16	samplesPerSec;
-	byte	octaves;
-	byte	compression;
-	uint32	volume;
+class AudioStream;
 
-	Voice8Header() {
-		memset(this, 0, sizeof(Voice8Header));
-	}
-
-	void load(Common::ReadStream &stream);
-};
-
 AudioStream *make8SVXStream(Common::ReadStream &stream, bool loop);
 
-
 }
 
 #endif


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