[Scummvm-cvs-logs] SF.net SVN: scummvm:[49830] scummvm/trunk/engines/sci

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Jun 15 14:17:47 CEST 2010


Revision: 49830
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49830&view=rev
Author:   fingolfin
Date:     2010-06-15 12:17:47 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SCI: Move _audioCompression(Type|OffsetMapping) to AudioVolumeResourceSource

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/resource.h
    scummvm/trunk/engines/sci/resource_audio.cpp
    scummvm/trunk/engines/sci/resource_intern.h

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:17:25 UTC (rev 49829)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:17:47 UTC (rev 49830)
@@ -163,17 +163,19 @@
 	stream->write(data, size);
 }
 
-uint32 Resource::getAudioCompressionType() {
-	return _source->_audioCompressionType;
+uint32 Resource::getAudioCompressionType() const {
+	return _source->getAudioCompressionType();
 }
 
+uint32 AudioVolumeResourceSource::getAudioCompressionType() const {
+	return _audioCompressionType;
+}
 
+
 ResourceSource::ResourceSource(ResSourceType type, const Common::String &name, int volNum, const Common::FSNode *resFile)
  : _sourceType(type), _name(name), _volumeNumber(volNum), _resourceFile(resFile) {
 	_scanned = false;
 	_associatedMap = NULL;
-	_audioCompressionType = 0;
-	_audioCompressionOffsetMapping = NULL;
 }
 
 ResourceSource::~ResourceSource() {

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-06-15 12:17:25 UTC (rev 49829)
+++ scummvm/trunk/engines/sci/resource.h	2010-06-15 12:17:47 UTC (rev 49830)
@@ -190,7 +190,7 @@
 	 * This method is used only by the "dump" debugger command.
 	 */
 	void writeToStream(Common::WriteStream *stream) const;
-	uint32 getAudioCompressionType();
+	uint32 getAudioCompressionType() const;
 
 protected:
 	int32 _fileOffset; /**< Offset in file */

Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-15 12:17:25 UTC (rev 49829)
+++ scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-15 12:17:47 UTC (rev 49830)
@@ -36,6 +36,9 @@
 AudioVolumeResourceSource::AudioVolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum)
 	: VolumeResourceSource(name, map, volNum, kSourceAudioVolume) {
 
+	_audioCompressionType = 0;
+	_audioCompressionOffsetMapping = NULL;
+
 	/*
 	 * Check if this audio volume got compressed by our tool. If that is the
 	 * case, set _audioCompressionType and read in the offset translation

Modified: scummvm/trunk/engines/sci/resource_intern.h
===================================================================
--- scummvm/trunk/engines/sci/resource_intern.h	2010-06-15 12:17:25 UTC (rev 49829)
+++ scummvm/trunk/engines/sci/resource_intern.h	2010-06-15 12:17:47 UTC (rev 49830)
@@ -57,8 +57,6 @@
 	const Common::FSNode * const _resourceFile;
 	const int _volumeNumber;
 	ResourceSource *_associatedMap;	// TODO: Move to VolumeResourceSource
-	uint32 _audioCompressionType;	// TODO: Move to AudioVolumeResourceSource
-	int32 *_audioCompressionOffsetMapping;	// TODO: Move to AudioVolumeResourceSource
 
 protected:
 	ResourceSource(ResSourceType type, const Common::String &name, int volNum = 0, const Common::FSNode *resFile = 0);
@@ -87,6 +85,9 @@
 	 * Load a resource.
 	 */
 	virtual void loadResource(Resource *res);
+
+	virtual uint32 getAudioCompressionType() const { return 0; }
+
 };
 
 class DirectoryResourceSource : public ResourceSource {
@@ -141,10 +142,16 @@
 };
 
 class AudioVolumeResourceSource : public VolumeResourceSource {
+protected:
+	uint32 _audioCompressionType;
+	int32 *_audioCompressionOffsetMapping;
+
 public:
 	AudioVolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum);
 
 	virtual void loadResource(Resource *res);
+
+	virtual uint32 getAudioCompressionType() const;
 };
 
 class ExtAudioMapResourceSource : public ResourceSource {


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




More information about the Scummvm-git-logs mailing list