valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Return false when pausing audio when nothing is playing, fixes redneck rampage multiple track playing (ripsaw8080). Silently refuse to play datatrack. Fixes HOMM2.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3500
This commit is contained in:
Peter Veenstra 2009-11-11 19:37:15 +00:00
parent 364257e1cc
commit c4053d3d98
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/dos/cdrom_image.cpp
View file

@ -227,11 +227,19 @@ bool CDROM_Interface_Image::GetMediaTrayStatus(bool& mediaPresent, bool& mediaCh
bool CDROM_Interface_Image::PlayAudioSector(unsigned long start,unsigned long len)
{
// We might want to do some more checks. E.g valid start and length
SDL_mutexP(player.mutex);
player.cd = this;
player.currFrame = start;
player.targetFrame = start + len;
player.isPlaying = true;
int track = GetTrack(start) - 1;
if(track >= 0 && tracks[track].attr == 0x40) {
LOG(LOG_MISC,LOG_WARN)("Game tries to play the data track. Not doing this");
player.isPlaying = false;
//Unclear wether return false should be here.
//specs say that this function returns at once and games should check the status wether the audio is actually playing
//Real drives either fail or succeed as well
} else player.isPlaying = true;
player.isPaused = false;
SDL_mutexV(player.mutex);
return true;
@ -239,6 +247,7 @@ bool CDROM_Interface_Image::PlayAudioSector(unsigned long start,unsigned long le
bool CDROM_Interface_Image::PauseAudio(bool resume)
{
if (!player.isPlaying) return false;
player.isPaused = !resume;
return true;
}

1
src/dos/cdrom_ioctl_win32.cpp
View file

@ -430,6 +430,7 @@ bool CDROM_Interface_Ioctl::PauseAudio(bool resume) {
return false;
}
if (use_dxplay) {
if (!player.isPlaying) return false;
player.isPaused = !resume;
return true;
}