shithub: choc

Download patch

ref: 431752097ad149a2c58381bfa229a472b0524928
parent: 7fd60f8d9b7e5930f34b9cb105082f9e40896f22
author: Simon Howard <[email protected]>
date: Fri Nov 28 10:48:18 EST 2014 

Delete SDL implementation of CD music interface.

SDL2 doesn't have a CD music API any more. We have alternate ways of
playing Hexen's CD soundtrack now anyway.


--- a/src/i_cdmus.c
+++ b/src/i_cdmus.c
@@ -13,71 +13,21 @@
 // GNU General Public License for more details.
 //
 //
-// SDL implementation of the Hexen CD interface.
+// Hexen CD interface.
 //
 
 #include <stdio.h>
 
 #include "SDL.h"
-#include "SDL_cdrom.h"
 
 #include "doomtype.h"
 
 #include "i_cdmus.h"
 
-static SDL_CD *cd_handle = NULL;
-static char *startup_error = NULL;
-static const char *cd_name = NULL;
-
 int cd_Error;
 
 int I_CDMusInit(void)
 {
-    int drive_num = 0;
-
-    // The initialize function is re-invoked when the CD track play cheat
-    // is used, so use the opportunity to call SDL_CDStatus() to update
-    // the status of the drive.
-
-    if (cd_handle == NULL)
-    {
-        if (SDL_Init(SDL_INIT_CDROM) < 0)
-        {
-            startup_error = "Failed to init CD subsystem.";
-            cd_Error = 1;
-            return -1;
-        }
-
-        // TODO: config variable to control CDROM to use.
-
-        cd_handle = SDL_CDOpen(drive_num);
-
-        if (cd_handle == NULL)
-        {
-            startup_error = "Failed to open CD-ROM drive.";
-            cd_Error = 1;
-            return -1;
-        }
-
-        cd_name = SDL_CDName(drive_num);
-    }
-
-    if (SDL_CDStatus(cd_handle) == CD_ERROR)
-    {
-        startup_error = "Failed to read CD status.";
-        cd_Error = 1;
-        return -1;
-    }
-
-    if (!CD_INDRIVE(cd_handle->status))
-    {
-        startup_error = "No CD in drive.";
-        cd_Error = 1;
-        return -1;
-    }
-
-    cd_Error = 0;
-
     return 0;
 }
 
@@ -86,127 +36,40 @@
 
 void I_CDMusPrintStartup(void)
 {
-    if (cd_name != NULL)
-    {
-        printf("I_CDMusInit: Using CD-ROM drive: %s\n", cd_name);
-    }
-
-    if (startup_error != NULL)
-    {
-        fprintf(stderr, "I_CDMusInit: %s\n", startup_error);
-    }
 }
 
 int I_CDMusPlay(int track)
 {
-    int result;
-
-    if (cd_handle == NULL)
-    {
-        cd_Error = 1;
-        return -1;
-    }
-
-    // Play one track
-    // Track is indexed from 1.
-
-    result = SDL_CDPlayTracks(cd_handle, track - 1, 0, 1, 0);
-
-    cd_Error = 0;
-    return result;
+    return 0;
 }
 
 int I_CDMusStop(void)
 {
-    int result;
-
-    result = SDL_CDStop(cd_handle);
-
-    cd_Error = 0;
-
-    return result;
+    return 0;
 }
 
 int I_CDMusResume(void)
 {
-    int result;
-
-    result = SDL_CDResume(cd_handle);
-
-    cd_Error = 0;
-
-    return result;
+    return 0;
 }
 
 int I_CDMusSetVolume(int volume)
 {
-    /* Not supported yet */
-
-    cd_Error = 0;
-
     return 0;
 }
 
 int I_CDMusFirstTrack(void)
 {
-    int i;
-
-    if (cd_handle == NULL)
-    {
-        cd_Error = 1;
-        return -1;
-    }
-
-    // Find the first audio track.
-
-    for (i=0; i<cd_handle->numtracks; ++i) 
-    {
-        if (cd_handle->track[i].type == SDL_AUDIO_TRACK)
-        {
-            cd_Error = 0;
-
-            // Tracks are indexed from 1.
-            return i + 1;
-        }
-    }
-
-    // Don't know?
-    cd_Error = 1;
-
-    return -1;
+    return 0;
 }
 
 int I_CDMusLastTrack(void)
 {
-    if (cd_handle == NULL)
-    {
-        cd_Error = 1;
-        return -1;
-    }
-
-    cd_Error = 0;
-
-    return cd_handle->numtracks;
+    return 0;
 }
 
 int I_CDMusTrackLength(int track_num)
 {
-    SDL_CDtrack *track;
-
-    if (cd_handle == NULL || track_num < 1 || track_num > cd_handle->numtracks)
-    {
-        cd_Error = 1;
-        return -1;
-    }
-
-    // Track number is indexed from 1.
-
-    track = &cd_handle->track[track_num - 1];
-
-    // Round up to the next second
-
-    cd_Error = 0;
-
-    return (track->length + CD_FPS - 1) / CD_FPS;
+    return 0;
 }