Ticket #9071: scummvm_siddump.patch

engines/engine.h

@@ -72 +72 @@
         OSystem *_system;
         Audio::Mixer *_mixer;
 
+        const Common::String _targetName; // target name for saves
+
 protected:
         Common::TimerManager *_timer;
         Common::EventManager *_eventMan;
@@ -80 +82 @@
         GUI::Dialog *_mainMenuDialog;
         virtual int runDialog(GUI::Dialog &dialog);
 
-        const Common::String _targetName; // target name for saves
 
         const Common::FSNode _gameDataDir;      // FIXME: Get rid of this
 

engines/scumm/player_v0.cpp

@@ +1 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/scumm/player_v1.cpp $
+ * $Id: player_v1.cpp 28966 2007-09-19 08:40:12Z peres001 $
+ *
+ */
+
+
+#include "engines/engine.h"
+#include "scumm/Player_v0.h"
+#include "scumm/scumm.h"
+#include "sound/mixer.h"
+
+namespace Scumm {
+
+Player_V0::Player_V0(ScummEngine *scumm, Audio::Mixer *mixer) {
+        _vm = scumm;
+        _mixer = mixer;
+        _sample_rate = _mixer->getOutputRate();
+
+        _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
+}
+
+Player_V0::~Player_V0() {
+        _mixer->stopHandle(_soundHandle);
+}
+
+void Player_V0::setMusicVolume (int vol) {
+        _maxvol = vol;
+}
+
+int Player_V0::readBuffer(int16 *buffer, const int numSamples) {
+        return 0;
+}
+void Player_V0::stopAllSounds() {
+}
+
+void Player_V0::stopSound(int nr) {
+        if (nr == -1)
+                return;
+}
+
+void Player_V0::startSound(int nr) {
+        char sbuf[512];
+        byte *data = _vm->getResourceAddress(rtSound, nr);
+        assert(data);
+
+        int size = _vm->getResourceSize(rtSound, nr);
+        sprintf(sbuf, "%s-%d.bin", _vm->_targetName.c_str(), nr);
+        FILE* f = fopen(sbuf, "wb");
+        fwrite(data, size, 1, f);
+        fclose(f);
+}
+
+int Player_V0::getSoundStatus(int nr) const {
+        return 0;
+}
+
+} // End of namespace Scumm

engines/scumm/player_v0.h

@@ +1 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/scumm/player_v1.h $
+ * $Id: player_v1.h 27024 2007-05-30 21:56:52Z fingolfin $
+ *
+ */
+
+#ifndef SCUMM_PLAYER_V0_H
+#define SCUMM_PLAYER_V0_H
+
+#include "common/scummsys.h"
+#include "scumm/music.h"
+#include "sound/audiostream.h"
+#include "sound/mixer.h"
+
+namespace Scumm {
+
+class ScummEngine;
+
+/**
+ * Scumm V0/V1 SID player.
+ */
+class Player_V0 : public Audio::AudioStream, public MusicEngine {
+public:
+        Player_V0(ScummEngine *scumm, Audio::Mixer *mixer);
+        ~Player_V0();
+
+        virtual void setMusicVolume(int vol);
+        virtual void startSound(int sound);
+        virtual void stopSound(int sound);
+        virtual void stopAllSounds();
+        virtual int  getSoundStatus(int sound) const;
+
+        // AudioStream API
+        int readBuffer(int16 *buffer, const int numSamples);
+        bool isStereo() const { return false; }
+        bool endOfData() const { return false; }
+        int getRate() const { return _sample_rate; }
+
+private:
+
+        ScummEngine *_vm;
+        Audio::Mixer *_mixer;
+        Audio::SoundHandle _soundHandle;
+        int _sample_rate;
+        int _samples_per_frame;
+        int _current_sample;
+        int _maxvol;
+};
+
+} // End of namespace Scumm
+
+#endif

engines/scumm/scumm.cpp

@@ -52 +52 @@
 #include "scumm/he/sound_he.h"
 #include "scumm/object.h"
 #include "scumm/player_nes.h"
+#include "scumm/player_v0.h"
 #include "scumm/player_v1.h"
 #include "scumm/player_v2.h"
 #include "scumm/player_v2a.h"
@@ -1675 +1676 @@
         } else if (_game.platform == Common::kPlatformApple2GS && _game.version == 0){
                 // TODO: Add support for music format
         } else if (_game.platform == Common::kPlatformC64 && _game.version <= 1) {
-                // TODO: Add support for music format
+                _musicEngine = new Player_V0(this, _mixer);
         } else if (_game.platform == Common::kPlatformNES && _game.version == 1) {
                 _musicEngine = new Player_NES(this, _mixer);
         } else if (_game.platform == Common::kPlatformAmiga && _game.version == 2) {

engines/scumm/scumm.h

@@ -789 +789 @@
 //      byte *createResource(int type, int index, uint32 size);
         int loadResource(int type, int i);
 //      void nukeResource(int type, int i);
-        int getResourceSize(int type, int idx);
 
 public:
+        int getResourceSize(int type, int idx);
         byte *getResourceAddress(int type, int i);
         virtual byte *getStringAddress(int i);
         byte *getStringAddressVar(int i);