fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-15 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Back out Oz's cd-sdl.c changes

Browse source 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@297 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
stevenaaus 2010-08-24 10:06:16 +00:00
parent 81a34ac603
commit fded47666a
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Quake/cd_sdl.c
View file

@ -43,7 +43,6 @@ static qboolean playing = false;
static qboolean wasPlaying = false; static qboolean wasPlaying = false;
static qboolean enabled = true; static qboolean enabled = true;
static qboolean playLooping = false; static qboolean playLooping = false;
static qboolean cdplayer= false; // QuakeSpasm / S.A - cd player facility
static byte remap[100]; static byte remap[100];
static byte playTrack; static byte playTrack;
static double endOfTrack = -1.0, pausetime = -1.0; static double endOfTrack = -1.0, pausetime = -1.0;
@ -229,7 +228,7 @@ void CDAudio_Resume(void)
static void CD_f (void) static void CD_f (void)
{ {
const char *command; const char *command,*arg2;
int ret, n; int ret, n;
if (Cmd_Argc() < 2) if (Cmd_Argc() < 2)
@ -295,20 +294,20 @@ static void CD_f (void)
if (Q_strcasecmp(command, "play") == 0) if (Q_strcasecmp(command, "play") == 0)
{ {
command = Cmd_Argv (2); arg2 = Cmd_Argv (2);
if (*command) if (*arg2)
CDAudio_Play((byte)atoi(command), false); CDAudio_Play((byte)atoi(Cmd_Argv (2)), false);
else else
CDAudio_Play((byte)1, false); CDAudio_Play((byte)1, false);
return; return;
} }
if (Q_strcasecmp(command, "loop") == 0) if (Q_strcasecmp(command, "loop") == 0)
{ {
command = Cmd_Argv (2); arg2 = Cmd_Argv (2);
if (*command) if (*arg2)
CDAudio_Play((byte)atoi(command), true); CDAudio_Play((byte)atoi(Cmd_Argv (2)), true);
else else
CDAudio_Play((byte)1, true); CDAudio_Play((byte)1, true);
return; return;
} }
@ -437,19 +436,13 @@ void CDAudio_Update(void)
curstat = SDL_CDStatus(cd_handle); curstat = SDL_CDStatus(cd_handle);
if (curstat != CD_PLAYING && curstat != CD_PAUSED) if (curstat != CD_PLAYING && curstat != CD_PAUSED)
{ {
if (!cdplayer) {
playing = false;
endOfTrack = -1.0;
if (playLooping)
CDAudio_Play(playTrack, true);
} else { // QuakeSpasm / S.A
endOfTrack = -1.0; endOfTrack = -1.0;
if (playLooping) { if (playLooping) {
playing = false; playing = false;
CDAudio_Play(playTrack, true); CDAudio_Play(playTrack, true);
} }
else CDAudio_Next(); else
} CDAudio_Next();
} }
} }
} }
@ -586,9 +579,6 @@ int CDAudio_Init(void)
Cmd_AddCommand ("cd", CD_f); Cmd_AddCommand ("cd", CD_f);
if (COM_CheckParm("-cd")) // QuakeSpasm / S.A - cd player facility
cdplayer = true;
// cd hardware volume: no SDL support at present. // cd hardware volume: no SDL support at present.
hw_vol_works = CD_GetVolume (NULL); hw_vol_works = CD_GetVolume (NULL);
if (hw_vol_works) if (hw_vol_works)