history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-28 19:05:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDImage: Generate correct relative subq position in pregap

Browse Source
This commit is contained in:
Connor McLaughlin 2021-04-22 02:57:36 +10:00
parent 2d8806c13f
commit 9652e3cb6b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/cd_image.cpp
View File

@ -390,9 +390,20 @@ void CDImage::GenerateSubChannelQ(SubChannelQ* subq, const Index& index, u32 ind
(index.track_number <= m_tracks.size() ? BinaryToBCD(index.track_number) : index.track_number); (index.track_number <= m_tracks.size() ? BinaryToBCD(index.track_number) : index.track_number);
subq->index_number_bcd = BinaryToBCD(index.index_number); subq->index_number_bcd = BinaryToBCD(index.index_number);
const Position relative_position = Position relative_position;
Position::FromLBA(std::abs(static_cast<s32>(index.start_lba_in_track + index_offset))); if (index.is_pregap)
{
// position should count down to the end of the pregap
relative_position = Position::FromLBA(index.length - index_offset);
}
else
{
// count up from the start of the track
relative_position = Position::FromLBA(index.start_lba_in_track + index_offset);
}
std::tie(subq->relative_minute_bcd, subq->relative_second_bcd, subq->relative_frame_bcd) = relative_position.ToBCD(); std::tie(subq->relative_minute_bcd, subq->relative_second_bcd, subq->relative_frame_bcd) = relative_position.ToBCD();
subq->reserved = 0; subq->reserved = 0;
const Position absolute_position = Position::FromLBA(index.start_lba_on_disc + index_offset); const Position absolute_position = Position::FromLBA(index.start_lba_on_disc + index_offset);