mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-09-04 12:29:06 +00:00
- there is no implicit conversion from vector<T>::iterator to T&
This commit is contained in:
parent
5bd08dac88
commit
6aff4fb327
@ -664,7 +664,7 @@ int16 CDROMControl(uint32 pb, uint32 dce)
|
|||||||
return offLinErr;
|
return offLinErr;
|
||||||
|
|
||||||
uint8 start_m, start_s, start_f;
|
uint8 start_m, start_s, start_f;
|
||||||
if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
|
if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
|
||||||
return paramErr;
|
return paramErr;
|
||||||
info->play_mode = ReadMacInt8(pb + csParam + 9) & 0x0f;
|
info->play_mode = ReadMacInt8(pb + csParam + 9) & 0x0f;
|
||||||
if (!SysCDPlay(info->fh, start_m, start_s, start_f, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
if (!SysCDPlay(info->fh, start_m, start_s, start_f, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
||||||
@ -681,12 +681,12 @@ int16 CDROMControl(uint32 pb, uint32 dce)
|
|||||||
|
|
||||||
if (ReadMacInt16(pb + csParam + 6)) {
|
if (ReadMacInt16(pb + csParam + 6)) {
|
||||||
// Given stopping address
|
// Given stopping address
|
||||||
if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
||||||
return paramErr;
|
return paramErr;
|
||||||
} else {
|
} else {
|
||||||
// Given starting address
|
// Given starting address
|
||||||
uint8 start_m, start_s, start_f;
|
uint8 start_m, start_s, start_f;
|
||||||
if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
|
if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
|
||||||
return paramErr;
|
return paramErr;
|
||||||
info->play_mode = ReadMacInt8(pb + csParam + 9) & 0x0f;
|
info->play_mode = ReadMacInt8(pb + csParam + 9) & 0x0f;
|
||||||
if (!SysCDPlay(info->fh, start_m, start_s, start_f, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
if (!SysCDPlay(info->fh, start_m, start_s, start_f, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
||||||
@ -723,7 +723,7 @@ int16 CDROMControl(uint32 pb, uint32 dce)
|
|||||||
return paramErr;
|
return paramErr;
|
||||||
} else {
|
} else {
|
||||||
// Given stopping address
|
// Given stopping address
|
||||||
if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), true, info->stop_at[0], info->stop_at[1], info->stop_at[2]))
|
||||||
return paramErr;
|
return paramErr;
|
||||||
}
|
}
|
||||||
return noErr;
|
return noErr;
|
||||||
@ -768,7 +768,7 @@ int16 CDROMControl(uint32 pb, uint32 dce)
|
|||||||
return offLinErr;
|
return offLinErr;
|
||||||
|
|
||||||
uint8 start_m, start_s, start_f;
|
uint8 start_m, start_s, start_f;
|
||||||
if (!position2msf(info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
|
if (!position2msf(*info, ReadMacInt16(pb + csParam), ReadMacInt32(pb + csParam + 2), false, start_m, start_s, start_f))
|
||||||
return paramErr;
|
return paramErr;
|
||||||
|
|
||||||
if (!SysCDScan(info->fh, start_m, start_s, start_f, ReadMacInt16(pb + csParam + 6)))
|
if (!SysCDScan(info->fh, start_m, start_s, start_f, ReadMacInt16(pb + csParam + 6)))
|
||||||
|
Loading…
Reference in New Issue
Block a user