Ticket #7941: mi1_cdmusic.diff

CVS/Entries

@@ -40 +40 @@
 /whatsnew.txt/1.3/Sun Jan 13 19:49:26 2002//
 /windows.cpp/1.29/Sun Mar 10 17:33:04 2002//
 /x11.cpp/1.3/Wed Mar  6 23:14:16 2002//
-D/PocketSCUMM////
 D/dc////
 D/debian////
 D/mac////

CVS/Entries.Log

@@ +1 @@
+A D/PocketSCUMM////
 R D/PocketSCUMM////

cdmusic.h

@@ +1 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002 The ScummVM project
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header: /cvsroot/scummvm/scummvm/cdmusic.h 1.1 2002/03/14 17:36:13 ender Exp $
+ */
+
+#ifndef CD_MUSIC_H
+#define CD_MUSIC_H
+
+void cd_stop();
+void cd_play(int track, int num_loops, int start_frame);
+int cd_is_running();
+void cd_music_loop();
+
+#endif

resource.cpp

@@ -666 +666 @@
                         fileRead(_fileHandle,createResource(type, idx, total_size+8), total_size+8);
                         return 1;
                 }
-        } else {
+        } else if (basetag == MKID('SOU ')) {
                 best_pri = -1;
                 while (pos < total_size) {
                         tag = fileReadDword();
@@ -697 +697 @@
                         fileRead(_fileHandle,createResource(type, idx, best_size), best_size);
                         return 1;
                 }               
+        } else if (FROM_LE_32(basetag) == 24) {
+                fileSeek(_fileHandle, -12, SEEK_CUR);
+                total_size = fileReadDwordBE();
+                fileSeek(_fileHandle, -8, SEEK_CUR);
+                fileRead(_fileHandle, createResource(type, idx, total_size), total_size);
+                return 1;
+        } else {
+                error("Unrecognized base tag %c%c%c%c in sound %d",
+                      basetag&0xff, basetag>>8, basetag>>16, basetag>>24,
+                      idx);
         }
         res.roomoffs[type][idx] = 0xFFFFFFFF;
         return 0;

scumm.h

@@ -1204 +1204 @@
         OffsetTable *offset_table;
         int num_sound_effects;
 #endif
-  
+
+        int current_cd_sound;
+
         void openRoom(int room);
         void deleteRoomOffsets();
         void readRoomsOffsets();

sdl.cpp

@@ -27 +27 @@
 #include "sound.h"
 #include "SDL_thread.h"
 
+#include "cdmusic.h"
+
 static unsigned int scale;
 
 Scumm scumm;
@@ -176 +178 @@
                         }
                 }
 
+                cd_music_loop(); // Loop CD Music if necessary
+
                 if (SDL_GetTicks() >= start_time + msec_delay)
                         break;
                 SDL_Delay(10);
@@ -667 +671 @@
         SDL_CDPlayTracks(cdrom, track, (int)((offset * 7.5) - 22650), 0, (int)(delay * 7.5));
 }
 
+static int cd_track, cd_num_loops = 0, cd_start_frame;
+
+// On my system, calling SDL_CDStatus all the time slows things down a
+// lot and prevents music from playing at all :( So this saves the
+// time the track is expected to be finished.
+static Uint32 cd_end_time;
+
+static Uint32 cd_stop_time;
+
+void cd_play(int track, int num_loops, int start_frame) {
+        warning("cd_play(%d,%d,%d)", track, num_loops, start_frame);
+        cd_track = track;
+        cd_num_loops = num_loops;
+        cd_start_frame = start_frame;
+
+        SDL_CDStatus(cdrom);
+        SDL_CDPlayTracks(cdrom, track, start_frame, 1, 0);
+        cd_stop_time = 0;
+        cd_end_time = SDL_GetTicks() +
+                cdrom->track[track].length * 1000 / CD_FPS;
+}
+
+// Schedule the music to be stopped after 1/10 sec, unless another
+// track is started in the meantime.  (On my machine, stopping and
+// then restarting the CD takes a few seconds.)
+void cd_stop() {
+        cd_stop_time = SDL_GetTicks() + 100;
+        cd_num_loops = 0;
+}
+
+int cd_is_running() {
+        return (cd_num_loops != 0 && (SDL_GetTicks() < cd_end_time ||
+                                      SDL_CDStatus(cdrom) != CD_STOPPED));
+}
+
+static void cd_shutdown() {
+        if (cd_num_loops != 0)
+                SDL_CDStop(cdrom);
+}
+
+void cd_music_loop() {
+        if (cd_stop_time != 0 && SDL_GetTicks() >= cd_stop_time) {
+                SDL_CDStop(cdrom);
+                cd_num_loops = 0;
+                cd_stop_time = 0;
+                return;
+        }
+        if (cd_num_loops == 0 || SDL_GetTicks() < cd_end_time)
+                return;
+        if (cd_num_loops != 1 && SDL_CDStatus(cdrom) != CD_STOPPED) {
+                // Wait another second for it to be done
+                cd_end_time += 1000;
+                return;
+        }
+        if (cd_num_loops > 0)
+                cd_num_loops--;
+        if (cd_num_loops != 0) {
+                SDL_CDPlayTracks(cdrom, cd_track, cd_start_frame, 1, 0);
+                cd_end_time = SDL_GetTicks() +
+                        cdrom->track[cd_track].length * 1000 / CD_FPS;
+        }
+}
+
 int music_thread(Scumm *s) {
         int old_time, cur_time;
 
@@ -703 +770 @@
 
         /* Clean up on exit */
         atexit(SDL_Quit);
+        atexit(cd_shutdown);
         atexit(resetCursor);
 
         char buf[512], *gameName;

sound/CVS/Entries

@@ -3 +3 @@
 /fmopl.h/1.1/Sat Dec  1 17:06:13 2001//
 /gmidi.cpp/1.8/Thu Mar 14 13:28:32 2002//
 /gmidi.h/1.2/Thu Mar 14 08:04:21 2002//
-/imuse.cpp/1.15/Thu Mar 14 17:36:13 2002//
+/imuse.cpp/1.15/Sat Mar 16 01:38:43 2002//
 D

sound.cpp

@@ -21 +21 @@
 
 #include "stdafx.h"
 #include "scumm.h"
-#include "sound.h"
-
-#ifdef _WIN32_WCE
-extern void *bsearch(const void *, const void *, size_t, 
-                          size_t, int (*x)(const void *, const void *));
+#include "sound.h"
+#include "cdmusic.h"
+
+#ifdef _WIN32_WCE
+extern void *bsearch(const void *, const void *, size_t,
+                          size_t, int (*x)(const void *, const void *));
 #endif
 
 void Scumm::addSoundToQueue(int sound) {
@@ -98 +99 @@
 }
 
 void Scumm::playSound(int sound) {
+        byte *ptr;
         SoundEngine *se = (SoundEngine*)_soundEngine;
+
+        ptr = getResourceAddress(rtSound, sound);
+        if (ptr != NULL && READ_UINT32_UNALIGNED(ptr) == MKID('SOUN')) {
+                ptr += 8;
+                cd_play(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
+                        (ptr[18] * 60 + ptr[19]) * 75 + ptr[20]);
+                current_cd_sound = sound;
+                return;
+        }
+
         if (_features & GF_OLD256) return; /* FIXME */
 
         if (se) {
@@ -233 +245 @@
         SoundEngine *se;
         int i;
 
+        if (sound == current_cd_sound)
+                return cd_is_running();
+
         i = _soundQue2Pos;
         while (i--) {
                 if (_soundQue2[i] == sound)
@@ -275 +290 @@
         SoundEngine *se;
         int i;
 
+        if (a == current_cd_sound) {
+                current_cd_sound = 0;
+                cd_stop();
+        }
+
         se = (SoundEngine*)_soundEngine;
         if (se)
                 se->stop_sound(a);
@@ -286 +306 @@
 
 void Scumm::stopAllSounds() {
         SoundEngine *se = (SoundEngine*)_soundEngine;
+
+        if (current_cd_sound != 0) {
+                current_cd_sound = 0;
+                cd_stop();
+        }
+
         if (se) {
                 se->stop_all_sounds();
                 se->clear_queue();