Ticket #8904: bs2-archive-pre.patch

animation.cpp

@@ -865 +865 @@
 // Factory function for creating the appropriate cutscene player
 ///////////////////////////////////////////////////////////////////////////////
 
-MoviePlayer *makeMoviePlayer(Sword2Engine *vm, const char *name) {
+MoviePlayer *Sword2Engine::makeMoviePlayer(const char *name) {
         static char filename[20];
 
 #ifdef USE_ZLIB
         snprintf(filename, sizeof(filename), "%s.dxa", name);
 
         if (Common::File::exists(filename)) {
-                return new MoviePlayerDXA(vm, name);
+                return new MoviePlayerDXA(this, name);
         }
 #endif
 
@@ -880 +880 @@
         snprintf(filename, sizeof(filename), "%s.mp2", name);
 
         if (Common::File::exists(filename)) {
-                return new MoviePlayerMPEG(vm, name);
+                return new MoviePlayerMPEG(this, name);
         }
 #endif
 
-        return new MoviePlayerDummy(vm, name);
+        return new MoviePlayerDummy(this, name);
 }
 
 } // End of namespace Sword2

function.cpp

@@ -2139 +2139 @@
         // pause sfx during sequence
         _vm->_sound->pauseFx();
 
-        MoviePlayer *player = makeMoviePlayer(_vm, filename);
+        MoviePlayer *player = _vm->makeMoviePlayer(filename);
 
         if (player->load()) {
                 player->play(_sequenceTextList, _sequenceTextLines, _smackerLeadIn, _smackerLeadOut);

music.cpp

@@ -51 +51 @@
 
 static Audio::AudioStream *makeCLUStream(Common::File *fp, int size);
 
-static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd, uint32 id, uint32 *numSamples) {
-        bool alreadyOpen;
+Audio::AudioStream *resetAudioStream(SoundFileHandle *fh, const char *base, uint32 id, uint32 *numSamples, bool alreadyOpen) {
 
-        if (!fh->file.isOpen()) {
-                alreadyOpen = false;
-
-                struct {
-                        const char *ext;
-                        int mode;
-                } file_types[] = {
-        #ifdef USE_FLAC
-                        { "clf", kFlacMode },
-        #endif
-        #ifdef USE_VORBIS
-                        { "clg", kVorbisMode },
-        #endif
-        #ifdef USE_MAD
-                        { "cl3", kMP3Mode },
-        #endif
-                        { "clu", kCLUMode }
-                };
-
-                int soundMode = 0;
-                char filename[20];
-
-                for (int i = 0; i < ARRAYSIZE(file_types); i++) {
-                        sprintf(filename, "%s%d.%s", base, cd, file_types[i].ext);
-                        if (Common::File::exists(filename)) {
-                                soundMode = file_types[i].mode;
-                                break;
-                        }
-
-                        sprintf(filename, "%s.%s", base, file_types[i].ext);
-                        if (Common::File::exists(filename)) {
-                                soundMode = file_types[i].mode;
-                                break;
-                        }
-                }
-
-                if (soundMode == 0)
-                        return NULL;
-
-                fh->file.open(filename);
-                fh->fileType = soundMode;
-                if (!fh->file.isOpen()) {
-                        warning("BS2 getAudioStream: Failed opening file '%s'", filename);
-                        return NULL;
-                }
-                if (fh->fileSize != fh->file.size()) {
-                        if (fh->idxTab) {
-                                free(fh->idxTab);
-                                fh->idxTab = NULL;
-                        }
-                }
-        } else
-                alreadyOpen = true;
-
         uint32 entrySize = (fh->fileType == kCLUMode) ? 2 : 3;
 
         if (!fh->idxTab) {
@@ -173 +118 @@
         default:
                 return NULL;
         }
+
 }
 
+Audio::AudioStream *Sound::getAudioStream(SoundFileHandle *fh, const char *base, int cd, uint32 id, uint32 *numSamples) {
+        bool alreadyOpen;
+
+        if (!fh->file.isOpen()) {
+                alreadyOpen = false;
+
+                struct {
+                        const char *ext;
+                        int mode;
+                } file_types[] = {
+        #ifdef USE_FLAC
+                        { "clf", kFlacMode },
+        #endif
+        #ifdef USE_VORBIS
+                        { "clg", kVorbisMode },
+        #endif
+        #ifdef USE_MAD
+                        { "cl3", kMP3Mode },
+        #endif
+                        { "clu", kCLUMode }
+                };
+
+                int soundMode = 0;
+                char filename[20];
+
+                for (int i = 0; i < ARRAYSIZE(file_types); i++) {
+                        sprintf(filename, "%s%d.%s", base, cd, file_types[i].ext);
+                        if (Common::File::exists(filename)) {
+                                soundMode = file_types[i].mode;
+                                break;
+                        }
+
+                        sprintf(filename, "%s.%s", base, file_types[i].ext);
+                        if (Common::File::exists(filename)) {
+                                soundMode = file_types[i].mode;
+                                break;
+                        }
+                }
+
+                if (soundMode == 0)
+                        return NULL;
+
+                fh->file.open(filename);
+                fh->fileType = soundMode;
+                if (!fh->file.isOpen()) {
+                        warning("BS2 getAudioStream: Failed opening file '%s'", filename);
+                        return NULL;
+                }
+                if (fh->fileSize != fh->file.size()) {
+                        if (fh->idxTab) {
+                                free(fh->idxTab);
+                                fh->idxTab = NULL;
+                        }
+                }
+        } else
+                alreadyOpen = true;
+
+        return resetAudioStream(fh, base, id, numSamples, alreadyOpen);
+}
+
+
 // ----------------------------------------------------------------------------
 // Custom AudioStream class to handle Broken Sword 2's audio compression.
 // ----------------------------------------------------------------------------
@@ -262 +269 @@
 // The length of a fade-in/out, in milliseconds.
 #define FADE_LENGTH 3000
 
-MusicInputStream::MusicInputStream(int cd, SoundFileHandle *fh, uint32 musicId, bool looping) {
-        _cd = cd;
+MusicInputStream::MusicInputStream(Audio::AudioStream *decoder, SoundFileHandle *fh, uint32 musicId, uint32 numSamples, bool looping) {
         _fh = fh;
         _musicId = musicId;
+        _numSamples = numSamples;
         _looping = looping;
 
         _bufferEnd = _buffer + BUFFER_SIZE;
         _remove = false;
         _fading = 0;
 
-        _decoder = getAudioStream(_fh, "music", _cd, _musicId, &_numSamples);
+        _decoder = decoder;
         if (_decoder) {
                 _samplesLeft = _numSamples;
                 _fadeSamples = (getRate() * FADE_LENGTH) / 1000;
@@ -283 +290 @@
         }
 }
 
+
 MusicInputStream::~MusicInputStream() {
         delete _decoder;
         _decoder = NULL;
@@ -390 +398 @@
         if (!_samplesLeft) {
                 if (_looping) {
                         delete _decoder;
-                        _decoder = getAudioStream(_fh, "music", _cd, _musicId, &_numSamples);
+                        _decoder = resetAudioStream(_fh, "music", _musicId, &_numSamples, true);
                         _samplesLeft = _numSamples;
                 } else
                         _remove = true;
@@ -617 +625 @@
         fh->inUse = true;
         _mutex.unlock();
 
-        MusicInputStream *tmp = new MusicInputStream(cd, fh, musicId, loop);
+        uint32 numSamples;
+        Audio::AudioStream *decoder = getAudioStream(fh, "music", cd, musicId, &numSamples);
+        MusicInputStream *tmp = new MusicInputStream(decoder, fh, musicId, numSamples, loop);
 
         if (tmp->isReady()) {
                 _mutex.lock();

sound.h

@@ -155 +155 @@
         }
 
 public:
-        MusicInputStream(int cd, SoundFileHandle *fh, uint32 musicId, bool looping);
+        MusicInputStream(Audio::AudioStream *decoder, SoundFileHandle *fh, uint32 musicId, uint32 numSamples, bool looping);
         ~MusicInputStream();
 
         int readBuffer(int16 *buffer, const int numSamples);
@@ -281 +281 @@
         int32 streamCompMusic(uint32 musicId, bool loop);
         void stopMusic(bool immediately);
         int32 musicTimeRemaining();
+
+        Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd, uint32 id, uint32 *numSamples);
 };
 
 } // End of namespace Sword2

sword2.h

@@ -62 +62 @@
 class FontRenderer;
 class Gui;
 class Debugger;
+class MoviePlayer;
 
 enum {
         RD_LEFTBUTTONDOWN               = 0x01,
@@ -228 +229 @@
 
         void runStart(int start);
 
+        MoviePlayer *makeMoviePlayer(const char *name);
+
         // Convenience alias for OSystem::getMillis().
         // This is a bit hackish, of course :-).
         uint32 getMillis();