Ticket #9002: music.patch

music.cpp

@@ -187 +187 @@
 
         fh->file.seek(pos, SEEK_SET);
 
-        SafeSubReadStream *tmp = 0;
-
         switch (fh->fileType) {
         case kCLUMode:
                 if (Sword2Engine::isPsx())
@@ -197 +195 @@
                         return makeCLUStream(&fh->file, enc_len);
 #ifdef USE_MAD
         case kMP3Mode:
-                tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false);
+                SafeSubReadStream *tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false);
                 return Audio::makeMP3Stream(tmp, true);
 #endif
 #ifdef USE_VORBIS
         case kVorbisMode:
-                tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false);
+                SafeSubReadStream *tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false);
                 return Audio::makeVorbisStream(tmp, true);
 #endif
 #ifdef USE_FLAC
         case kFlacMode:
-                tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false);
+                SafeSubReadStream *tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false);
                 return Audio::makeFlacStream(tmp, true);
 #endif
         default:
@@ -295 +293 @@
 }
 
 Audio::AudioStream *makePSXCLUStream(Common::File *file, int size) {
-        
+
         // Buffer audio file data, and ask MemoryReadStream to dispose of it
         // when not needed anymore.