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

Fixed a bug with the control status

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1388
This commit is contained in:
Ulf Wohlers 2003-10-29 10:18:30 +00:00
parent 63cd8d1b5d
commit d78a0f9be0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dos/cdrom_aspi_win32.cpp
View file

@ -292,7 +292,7 @@ bool CDROM_Interface_Aspi::GetAudioTrackInfo (int track, TMSF& start, unsigned c
start.min = (unsigned char)(toc.tracks[track-1].lAddr >> 8) &0xFF;
start.sec = (unsigned char)(toc.tracks[track-1].lAddr >> 16) &0xFF;
start.fr = (unsigned char)(toc.tracks[track-1].lAddr >> 24) &0xFF;
attr = toc.tracks[track-1].cAdrCtrl;
attr = (toc.tracks[track-1].cAdrCtrl << 4) & 0xEF;
return true;
};
return false;
@ -503,7 +503,7 @@ bool CDROM_Interface_Aspi::GetAudioSub(unsigned char& attr, unsigned char& track
if (s.SRB_Status!=SS_COMP) return false;
attr = (pos.ADR<<4) | pos.Control;
attr = (pos.Control<<4) &0xEF;
track = pos.TrackNumber;
index = pos.IndexNumber;
absPos.min = pos.AbsoluteAddress[1];

4
src/dos/cdrom_ioctl_win32.cpp
View file

@ -75,7 +75,7 @@ bool CDROM_Interface_Ioctl::GetAudioTrackInfo(int track, TMSF& start, unsigned c
// Close();
if (!bStat) return false;
attr = (toc.TrackData[track-1].Adr << 4) | toc.TrackData[track].Control;
attr = (toc.TrackData[track-1].Control << 4) & 0xEF;
start.min = toc.TrackData[track-1].Address[1];
start.sec = toc.TrackData[track-1].Address[2];
start.fr = toc.TrackData[track-1].Address[3];
@ -97,7 +97,7 @@ bool CDROM_Interface_Ioctl::GetAudioSub(unsigned char& attr, unsigned char& trac
// Close();
if (!bStat) return false;
attr = (sub.CurrentPosition.ADR << 4) | sub.CurrentPosition.Control;
attr = (sub.CurrentPosition.Control << 4) & 0xEF;
track = sub.CurrentPosition.TrackNumber;
index = sub.CurrentPosition.IndexNumber;
relPos.min = sub.CurrentPosition.TrackRelativeAddress[1];