eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 70a446caff2d9dacb80b890c4c7d7a9a68d945de..a4cf1e82a7d3224bf2014f207654688cc0d9b167 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -32,7 +32,7 @@ extern void CDAudio_SysCloseDoor (void);
 extern int CDAudio_SysGetAudioDiskInfo (void);
 extern float CDAudio_SysGetVolume (void);
 extern void CDAudio_SysSetVolume (float volume);
-extern int CDAudio_SysPlay (qbyte track);
+extern int CDAudio_SysPlay (unsigned char track);
 extern int CDAudio_SysStop (void);
 extern int CDAudio_SysPause (void);
 extern int CDAudio_SysResume (void);
@@ -48,8 +48,8 @@ static qboolean wasPlaying = false;
 static qboolean initialized = false;
 static qboolean enabled = false;
 static float cdvolume;
-static qbyte remap[MAXTRACKS];
-static qbyte maxTrack;
+static unsigned char remap[MAXTRACKS];
+static unsigned char maxTrack;
 static int faketrack = -1;
 
 static float saved_vol = 1.0f;
@@ -58,7 +58,7 @@ static float saved_vol = 1.0f;
 qboolean cdValid = false;
 qboolean cdPlaying = false;
 qboolean cdPlayLooping = false;
-qbyte cdPlayTrack;
+unsigned char cdPlayTrack;
 
 
 static void CDAudio_Eject (void)
@@ -95,17 +95,19 @@ static int CDAudio_GetAudioDiskInfo (void)
 }
 
 
-void CDAudio_Play (qbyte track, qboolean looping)
+void CDAudio_Play (unsigned char track, qboolean looping)
 {
        sfx_t* sfx;
 
+       Host_StartVideo();
+
        if (!enabled)
                return;
 
        track = remap[track];
        if (track < 1)
        {
-               Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+               Con_Printf("CDAudio: Bad track number %u.\n", track);
                return;
        }
 
@@ -125,7 +127,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
                        if (looping)
                                S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
                        S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
-                       Con_DPrintf ("Fake CD track %u playing...\n", track);
+                       Con_Printf ("Fake CD track %u playing...\n", track);
                }
        }
 
@@ -211,6 +213,8 @@ static void CD_f (void)
        int ret;
        int n;
 
+       Host_StartVideo();
+
        if (Cmd_Argc() < 2)
                return;
 
@@ -264,13 +268,13 @@ static void CD_f (void)
 
        if (strcasecmp(command, "play") == 0)
        {
-               CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), false);
+               CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), false);
                return;
        }
 
        if (strcasecmp(command, "loop") == 0)
        {
-               CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), true);
+               CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), true);
                return;
        }
 
@@ -382,22 +386,22 @@ int CDAudio_Startup (void)
 
        if (CDAudio_GetAudioDiskInfo())
        {
-               Con_DPrint("CDAudio_Init: No CD in player.\n");
+               Con_Print("CDAudio_Init: No CD in player.\n");
                cdValid = false;
        }
 
        saved_vol = CDAudio_SysGetVolume ();
        if (saved_vol < 0.0f)
        {
-               Con_DPrint ("Can't get initial CD volume\n");
+               Con_Print ("Can't get initial CD volume\n");
                saved_vol = 1.0f;
        }
        else
-               Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
+               Con_Printf ("Initial CD volume: %g\n", saved_vol);
 
        initialized = true;
 
-       Con_DPrint("CD Audio Initialized\n");
+       Con_Print("CD Audio Initialized\n");
 
        return 0;
 }