diff options
| -rw-r--r-- | sound/mods/tfmx.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sound/mods/tfmx.h b/sound/mods/tfmx.h index 539a36e4d0..07e8138864 100644 --- a/sound/mods/tfmx.h +++ b/sound/mods/tfmx.h @@ -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 @@ public: 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 @@ private: } } - + 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); |