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

Fix cdrom detection Inherit the earth under image and SDL cdrom emulation

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2702
This commit is contained in:
Peter Veenstra 2006-09-25 08:47:37 +00:00
parent d5376a59f9
commit 50a7684df1
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dos/cdrom.cpp
View file

@ -86,7 +86,7 @@ bool CDROM_Interface_SDL::GetAudioTrackInfo (int track, TMSF& start, unsigned ch
{
if (CD_INDRIVE(SDL_CDStatus(cd))) {
FRAMES_TO_MSF(cd->track[track-1].offset+150,&start.min,&start.sec,&start.fr);
attr = cd->track[track-1].type;
attr = cd->track[track-1].type<<4;//sdl uses 0 for audio and 4 for data. instead of 0x00 and 0x40
}
return CD_INDRIVE(SDL_CDStatus(cd));
};
@ -96,7 +96,7 @@ bool CDROM_Interface_SDL::GetAudioSub (unsigned char& attr, unsigned char& track
if (CD_INDRIVE(SDL_CDStatus(cd))) {
track = cd->cur_track;
index = cd->cur_track;
attr = cd->track[track].type;
attr = cd->track[track].type<<4;
FRAMES_TO_MSF(cd->cur_frame,&relPos.min,&relPos.sec,&relPos.fr);
FRAMES_TO_MSF(cd->cur_frame+cd->track[track].offset,&absPos.min,&absPos.sec,&absPos.fr);
}

13
src/dos/cdrom_image.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: cdrom_image.cpp,v 1.11 2006-02-09 11:47:48 qbix79 Exp $ */
/* $Id: cdrom_image.cpp,v 1.12 2006-09-25 08:47:37 qbix79 Exp $ */
#include <cctype>
#include <cmath>
@ -348,7 +348,7 @@ bool CDROM_Interface_Image::LoadIsoFile(char* filename)
return false;
}
track.number = 1;
track.attr = 4;
track.attr = 0x40;//data
// try to detect iso type
if (CanReadPVD(track.file, COOKED_SECTOR_SIZE, false)) {
@ -452,19 +452,19 @@ bool CDROM_Interface_Image::LoadCueSheet(char *cuefile)
track.mode2 = false;
} else if (type == "MODE1/2048") {
track.sectorSize = COOKED_SECTOR_SIZE;
track.attr = 4;
track.attr = 0x40;
track.mode2 = false;
} else if (type == "MODE1/2352") {
track.sectorSize = RAW_SECTOR_SIZE;
track.attr = 4;
track.attr = 0x40;
track.mode2 = false;
} else if (type == "MODE2/2336") {
track.sectorSize = 2336;
track.attr = 4;
track.attr = 0x40;
track.mode2 = true;
} else if (type == "MODE2/2352") {
track.sectorSize = RAW_SECTOR_SIZE;
track.attr = 4;
track.attr = 0x40;
track.mode2 = true;
} else success = false;
@ -522,6 +522,7 @@ bool CDROM_Interface_Image::LoadCueSheet(char *cuefile)
// add leadout track
track.number++;
track.attr = 0;//sync with load iso
track.start = 0;
track.length = 0;
track.file = NULL;