Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-25 23:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Don't delay CDDA report, only skip index 0

Browse source 
Fixes music in Advanced V.G.
This commit is contained in:
Connor McLaughlin 2020-05-16 00:27:05 +10:00
parent 14b2506d7d
commit e1157bff65
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/cdrom.cpp
View file

@ -73,7 +73,6 @@ void CDROM::SoftReset()
m_last_sector_header_valid = false; m_last_sector_header_valid = false;
std::memset(&m_last_subq, 0, sizeof(m_last_subq)); std::memset(&m_last_subq, 0, sizeof(m_last_subq));
m_last_cdda_report_frame_nibble = 0xFF; m_last_cdda_report_frame_nibble = 0xFF;
m_cdda_report_delay = 0;
m_next_cd_audio_volume_matrix[0][0] = 0x80; m_next_cd_audio_volume_matrix[0][0] = 0x80;
m_next_cd_audio_volume_matrix[0][1] = 0x00; m_next_cd_audio_volume_matrix[0][1] = 0x00;
@ -126,7 +125,6 @@ bool CDROM::DoState(StateWrapper& sw)
sw.Do(&m_last_sector_header_valid); sw.Do(&m_last_sector_header_valid);
sw.DoBytes(&m_last_subq, sizeof(m_last_subq)); sw.DoBytes(&m_last_subq, sizeof(m_last_subq));
sw.Do(&m_last_cdda_report_frame_nibble); sw.Do(&m_last_cdda_report_frame_nibble);
sw.Do(&m_cdda_report_delay);
sw.Do(&m_play_track_number_bcd); sw.Do(&m_play_track_number_bcd);
sw.Do(&m_async_command_parameter); sw.Do(&m_async_command_parameter);
sw.Do(&m_cd_audio_volume_matrix); sw.Do(&m_cd_audio_volume_matrix);
@ -1199,7 +1197,6 @@ void CDROM::BeginPlaying(u8 track_bcd, TickCount ticks_late /* = 0 */, bool afte
{ {
Log_DebugPrintf("Starting playing CDDA track %x", track_bcd); Log_DebugPrintf("Starting playing CDDA track %x", track_bcd);
m_last_cdda_report_frame_nibble = 0xFF; m_last_cdda_report_frame_nibble = 0xFF;
m_cdda_report_delay = CDImage::FRAMES_PER_SECOND;
m_play_track_number_bcd = track_bcd; m_play_track_number_bcd = track_bcd;
// if track zero, start from current position // if track zero, start from current position
@ -1819,7 +1816,7 @@ void CDROM::ProcessCDDASector(const u8* raw_sector, const CDImage::SubChannelQ&
if (m_mode.report_audio) if (m_mode.report_audio)
{ {
const u8 frame_nibble = subq.absolute_frame_bcd >> 4; const u8 frame_nibble = subq.absolute_frame_bcd >> 4;
if (m_last_cdda_report_frame_nibble != frame_nibble && (m_cdda_report_delay == 0 || --m_cdda_report_delay == 0)) if (m_last_cdda_report_frame_nibble != frame_nibble)
{ {
m_last_cdda_report_frame_nibble = frame_nibble; m_last_cdda_report_frame_nibble = frame_nibble;

1
src/core/cdrom.h
View file

@ -281,7 +281,6 @@ private:
bool m_last_sector_header_valid = false; bool m_last_sector_header_valid = false;
CDImage::SubChannelQ m_last_subq{}; CDImage::SubChannelQ m_last_subq{};
u8 m_last_cdda_report_frame_nibble = 0xFF; u8 m_last_cdda_report_frame_nibble = 0xFF;
u8 m_cdda_report_delay = 0x00;
u8 m_play_track_number_bcd = 0xFF; u8 m_play_track_number_bcd = 0xFF;
u8 m_async_command_parameter = 0x00; u8 m_async_command_parameter = 0x00;

2
src/core/save_state_version.h
View file

@ -2,7 +2,7 @@
#include "types.h" #include "types.h"
static constexpr u32 SAVE_STATE_MAGIC = 0x43435544; static constexpr u32 SAVE_STATE_MAGIC = 0x43435544;
static constexpr u32 SAVE_STATE_VERSION = 31; static constexpr u32 SAVE_STATE_VERSION = 32;
#pragma pack(push, 4) #pragma pack(push, 4)
struct SAVE_STATE_HEADER struct SAVE_STATE_HEADER