Fixed: Repeated playback of the same music track broken using the CDA…

…udio interface of dsWinMM (e.g., the DOOM title sequence when no demos are played). Fixed: If a music interface is not present but CDAudio interface is; playback via CDAudio not possible.
skyjake · May 3, 2009 · ee96547 · ee96547
1 parent fc66cb4
commit ee96547
Showing 1 changed file with 51 additions and 46 deletions.
diff --git a/doomsday/engine/portable/src/s_mus.c b/doomsday/engine/portable/src/s_mus.c
@@ -375,13 +375,17 @@ int Mus_GetCD(ded_music_t* def)
 int Mus_Start(ded_music_t* def, boolean looped)
 {
     filename_t          path;
-    int                 order[3], i, songID = def - defs.music;
+    int                 i, order[3], songID;
 
-    // We will not restart the currently playing song.
-    if(!musAvail || !iMusic)
+    if(!musAvail)
         return false;
 
-    if(iMusic->gen.Get(MUSIP_PLAYING, NULL) && songID == currentSong)
+    songID = def - defs.music;
+
+    // We will not restart the currently playing song.
+    if(songID == currentSong &&
+       ((iMusic && iMusic->gen.Get(MUSIP_PLAYING, NULL)) ||
+        (iCD && iCD->gen.Get(MUSIP_PLAYING, NULL))))
         return false;
 
     // Stop the currently playing song.
@@ -476,58 +480,59 @@ int Mus_Start(ded_music_t* def, boolean looped)
             // Fall through.
 
         case MUSP_MUS:
+            if(iMusic)
             {
-            lumpnum_t           lump;
-
-            if((lump = W_CheckNumForName(def->lumpName)) != -1)
-            {
-                size_t              len;
-                void*               ptr;
+                lumpnum_t           lump;
 
-                if(Mus_IsMUSLump(lump))
-                {   // Lump is in DOOM's MUS format.
-                    byte*               lumpPtr;
+                if((lump = W_CheckNumForName(def->lumpName)) != -1)
+                {
+                    size_t              len;
+                    void*               ptr;
 
-                    if(!canPlayMUS)
-                        break;
+                    if(Mus_IsMUSLump(lump))
+                    {   // Lump is in DOOM's MUS format.
+                        byte*               lumpPtr;
 
-                    // Cache the lump, convert to MIDI and output to a temp
-                    // file in the working directory. Use a filename with the .mid
-                    // extension so that the player knows the format.
-                    lumpPtr = W_CacheLumpNum(lump, PU_STATIC);
-                    M_Mus2Midi(lumpPtr, W_LumpLength(lump), BUFFERED_MIDI_MUSIC_FILE);
-                    Z_ChangeTag(lumpPtr, PU_CACHE);
+                        if(!canPlayMUS)
+                            break;
 
-                    // Play the newly converted MIDI file.
-                    return iMusic->PlayFile(BUFFERED_MIDI_MUSIC_FILE, looped);
-                }
+                        // Cache the lump, convert to MIDI and output to a temp
+                        // file in the working directory. Use a filename with the .mid
+                        // extension so that the player knows the format.
+                        lumpPtr = W_CacheLumpNum(lump, PU_STATIC);
+                        M_Mus2Midi(lumpPtr, W_LumpLength(lump), BUFFERED_MIDI_MUSIC_FILE);
+                        Z_ChangeTag(lumpPtr, PU_CACHE);
 
-                if(!iMusic->Play)
-                {   // Music interface does not offer buffer playback.
-                    FILE*               file;
-                    byte*               lumpPtr;
-
-                    // Write this lump to disk and play from there.
-                    if((file = fopen(BUFFERED_MUSIC_FILE, "wb")) == NULL)
-                    {
-                        Con_Message("Mus_Start: Couldn't open %s for writing. %s\n",
-                                    BUFFERED_MUSIC_FILE, strerror(errno));
-                        return false;
+                        // Play the newly converted MIDI file.
+                        return iMusic->PlayFile(BUFFERED_MIDI_MUSIC_FILE, looped);
                     }
 
-                    lumpPtr = W_CacheLumpNum(lump, PU_STATIC);
-                    fwrite(lumpPtr, 1, W_LumpLength(lump), file);
-                    fclose(file);
-                    Z_ChangeTag(lumpPtr, PU_CACHE);
+                    if(!iMusic->Play)
+                    {   // Music interface does not offer buffer playback.
+                        FILE*               file;
+                        byte*               lumpPtr;
+
+                        // Write this lump to disk and play from there.
+                        if((file = fopen(BUFFERED_MUSIC_FILE, "wb")) == NULL)
+                        {
+                            Con_Message("Mus_Start: Couldn't open %s for writing. %s\n",
+                                        BUFFERED_MUSIC_FILE, strerror(errno));
+                            return false;
+                        }
+
+                        lumpPtr = W_CacheLumpNum(lump, PU_STATIC);
+                        fwrite(lumpPtr, 1, W_LumpLength(lump), file);
+                        fclose(file);
+                        Z_ChangeTag(lumpPtr, PU_CACHE);
+
+                        // Play the cached music file.
+                        return iMusic->PlayFile(BUFFERED_MUSIC_FILE, looped);
+                    }
 
-                    // Play the cached music file.
-                    return iMusic->PlayFile(BUFFERED_MUSIC_FILE, looped);
+                    ptr = iMusic->SongBuffer(len = W_LumpLength(lump));
+                    W_ReadLump(lump, ptr);
+                    return iMusic->Play(looped);
                 }
-
-                ptr = iMusic->SongBuffer(len = W_LumpLength(lump));
-                W_ReadLump(lump, ptr);
-                return iMusic->Play(looped);
-            }
             }
             break;