[Scummvm-cvs-logs] SF.net SVN: scummvm:[42986] scummvm/branches/gsoc2009-mods/sound/mods/tfmx. h

[nolange at users.sourceforge.net]

Revision: 42986
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42986&view=rev
Author:   nolange
Date:     2009-08-02 00:39:06 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
made some unused methods private

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-02 00:27:15 UTC (rev 42985)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-02 00:39:06 UTC (rev 42986)
@@ -31,8 +31,6 @@
 namespace Audio {
 
 class Tfmx : public Paula {
-private:
-	struct MdatResource;
 public:
 	Tfmx(int rate, bool stereo);
 	virtual ~Tfmx();
@@ -49,20 +47,11 @@
 	void freeResources() { _deleteResource = true; freeResourceDataImpl(); }
 	bool load(Common::SeekableReadStream &musicData, Common::SeekableReadStream &sampleData, bool autoDelete = true);
 	void setModuleData(Tfmx &otherPlayer);
-	/* must be called with resources loaded by loadMdatFile */
-	void setModuleDataVoid(const void *resource, const int8 *sampleData, uint32 sampleLen, bool autoDelete = true) {
-		setModuleData((const MdatResource *)resource, sampleData, sampleLen, autoDelete);
-	}
-	
-	static const MdatResource *loadMdatFile(Common::SeekableReadStream &musicData);
-	static const int8 *loadSampleFile(uint32 &sampleLen, Common::SeekableReadStream &sampleStream);
 
 protected:
 	void interrupt();
 
 private:
-	void setModuleData(const MdatResource *resource, const int8 *sampleData, uint32 sampleLen, bool autoDelete = true);
-
 	enum { kPalDefaultCiaVal = 11822, kNtscDefaultCiaVal = 14320, kCiaBaseInterval = 0x1B51F8 };
 	enum { kNumVoices = 4, kNumChannels = 8, kNumSubsongs = 32, kMaxPatternOffsets = 128, kMaxMacroOffsets = 128 };
 	static const uint16 noteIntervalls[64];
@@ -302,7 +291,9 @@
 		}
 	}
 
-	
+	void setModuleData(const MdatResource *resource, const int8 *sampleData, uint32 sampleLen, bool autoDelete = true);
+	static const MdatResource *loadMdatFile(Common::SeekableReadStream &musicData);
+	static const int8 *loadSampleFile(uint32 &sampleLen, Common::SeekableReadStream &sampleStream);	
 	void freeResourceDataImpl();
 	void effects(ChannelContext &channel);
 	void macroRun(ChannelContext &channel);


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