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

revert the all-platforms form of CD device stops workaround from r948/r949 ...

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@953 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-08-05 17:43:45 +00:00
parent 931d4e9396
commit 5058d882e9
1 changed files with 4 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Quake/cd_sdl.c
View file

@ -44,7 +44,6 @@
static qboolean cdValid = false; static qboolean cdValid = false;
static qboolean playing = false; static qboolean playing = false;
static qboolean active = 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;
@ -125,7 +124,6 @@ int CDAudio_Play(byte track, qboolean looping)
playLooping = looping; playLooping = looping;
playTrack = track; playTrack = track;
playing = true; playing = true;
active = true;
FRAMES_TO_MSF(cd_handle->track[track-1].length, &len_m, &len_s, &len_f); FRAMES_TO_MSF(cd_handle->track[track-1].length, &len_m, &len_s, &len_f);
endOfTrack = realtime + ((double)len_m * 60.0) + (double)len_s + (double)len_f / (double)CD_FPS; endOfTrack = realtime + ((double)len_m * 60.0) + (double)len_s + (double)len_f / (double)CD_FPS;
@ -143,12 +141,6 @@ int CDAudio_Play(byte track, qboolean looping)
return 0; return 0;
} }
/* We have two types of stop
*
* On some devices, the CDROMSTOP ioctl causes any followup
* ioctls to fail for a considerable time.
* So avoid dead stops if playback may be resumed shortly.
*/
void CDAudio_Stop(void) void CDAudio_Stop(void)
{ {
if (!cd_handle || !enabled) if (!cd_handle || !enabled)
@ -157,29 +149,11 @@ void CDAudio_Stop(void)
if (!playing) if (!playing)
return; return;
if (SDL_CDPause(cd_handle) == -1)
Con_Printf ("CDAudio_Stop: Unable to pause CD-ROM (%s)\n", SDL_GetError());
wasPlaying = false;
playing = false;
pausetime = -1.0;
endOfTrack = -1.0;
}
void CDAudio_ReallyStop(void)
{
if (!cd_handle || !enabled)
return;
if (!active)
return;
if (SDL_CDStop(cd_handle) == -1) if (SDL_CDStop(cd_handle) == -1)
Con_Printf ("CDAudio_Stop: Unable to stop CD-ROM (%s)\n", SDL_GetError()); Con_Printf ("CDAudio_Stop: Unable to stop CD-ROM (%s)\n", SDL_GetError());
wasPlaying = false; wasPlaying = false;
playing = false; playing = false;
active = false;
pausetime = -1.0; pausetime = -1.0;
endOfTrack = -1.0; endOfTrack = -1.0;
} }
@ -214,7 +188,6 @@ void CDAudio_Resume(void)
if (SDL_CDResume(cd_handle) == -1) if (SDL_CDResume(cd_handle) == -1)
Con_Printf ("Unable to resume CD-ROM: %s\n", SDL_GetError()); Con_Printf ("Unable to resume CD-ROM: %s\n", SDL_GetError());
playing = true; playing = true;
active = true;
endOfTrack += realtime - pausetime; endOfTrack += realtime - pausetime;
pausetime = -1.0; pausetime = -1.0;
} }
@ -253,7 +226,7 @@ static void CD_f (void)
if (q_strcasecmp(command, "off") == 0) if (q_strcasecmp(command, "off") == 0)
{ {
if (playing) if (playing)
CDAudio_ReallyStop(); CDAudio_Stop();
enabled = false; enabled = false;
return; return;
} }
@ -262,7 +235,7 @@ static void CD_f (void)
{ {
enabled = true; enabled = true;
if (playing) if (playing)
CDAudio_ReallyStop(); CDAudio_Stop();
for (n = 0; n < 100; n++) for (n = 0; n < 100; n++)
remap[n] = n; remap[n] = n;
CDAudio_GetAudioDiskInfo(); CDAudio_GetAudioDiskInfo();
@ -329,8 +302,8 @@ static void CD_f (void)
if (q_strcasecmp(command, "eject") == 0) if (q_strcasecmp(command, "eject") == 0)
{ {
if (playing || active) if (playing)
CDAudio_ReallyStop(); CDAudio_Stop();
CDAudio_Eject(); CDAudio_Eject();
cdValid = false; cdValid = false;
return; return;
@ -378,8 +351,6 @@ static void CD_f (void)
CDAudio_Play(playTrack - 1, playLooping); CDAudio_Play(playTrack - 1, playLooping);
return; return;
} }
Con_Printf("cd: unknown command \"%s\".\n",command);
} }
static qboolean CD_GetVolume (void *unused) static qboolean CD_GetVolume (void *unused)
@ -592,7 +563,6 @@ void CDAudio_Shutdown(void)
CDAudio_Stop(); CDAudio_Stop();
if (hw_vol_works) if (hw_vol_works)
CD_SetVolume (NULL); /* no SDL support at present. */ CD_SetVolume (NULL); /* no SDL support at present. */
CDAudio_ReallyStop();
SDL_CDClose(cd_handle); SDL_CDClose(cd_handle);
cd_handle = NULL; cd_handle = NULL;
cd_dev = -1; cd_dev = -1;