ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/cdrom.cpp
(Generate patch)

Comparing BasiliskII/src/cdrom.cpp (file contents):
Revision 1.12 by cebix, 2001-07-01T14:38:02Z vs.
Revision 1.13 by gbeauche, 2001-07-02T11:59:31Z

# Line 664 | Line 664 | int16 CDROMControl(uint32 pb, uint32 dce
664                                  return offLinErr;
665  
666                          uint8 start_m, start_s, start_f;
667 <                        if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
667 >                        if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
668                                  return paramErr;
669                          info->play_mode = ReadMacInt8(pb + csParam + 9) & 0x0f;
670                          if (!SysCDPlay(info->fh, start_m, start_s, start_f, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
# Line 681 | Line 681 | int16 CDROMControl(uint32 pb, uint32 dce
681  
682                          if (ReadMacInt16(pb + csParam + 6)) {
683                                  // Given stopping address
684 <                                if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
684 >                                if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
685                                          return paramErr;
686                          } else {
687                                  // Given starting address
688                                  uint8 start_m, start_s, start_f;
689 <                                if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
689 >                                if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
690                                          return paramErr;
691                                  info->play_mode = ReadMacInt8(pb + csParam + 9) & 0x0f;
692                                  if (!SysCDPlay(info->fh, start_m, start_s, start_f, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
# Line 723 | Line 723 | int16 CDROMControl(uint32 pb, uint32 dce
723                                          return paramErr;
724                          } else {
725                                  // Given stopping address
726 <                                if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
726 >                                if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
727                                          return paramErr;
728                          }
729                          return noErr;
# Line 768 | Line 768 | int16 CDROMControl(uint32 pb, uint32 dce
768                                  return offLinErr;
769  
770                          uint8 start_m, start_s, start_f;
771 <                        if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
771 >                        if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
772                                  return paramErr;
773  
774                          if (!SysCDScan(info->fh, start_m, start_s, start_f, ReadMacInt16(pb + csParam + 6)))

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines