diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp index e7cd82569..4acc99d61 100644 --- a/src/core/cdrom.cpp +++ b/src/core/cdrom.cpp @@ -73,7 +73,6 @@ void CDROM::SoftReset() m_last_sector_header_valid = false; std::memset(&m_last_subq, 0, sizeof(m_last_subq)); 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][1] = 0x00; @@ -126,7 +125,6 @@ bool CDROM::DoState(StateWrapper& sw) sw.Do(&m_last_sector_header_valid); sw.DoBytes(&m_last_subq, sizeof(m_last_subq)); sw.Do(&m_last_cdda_report_frame_nibble); - sw.Do(&m_cdda_report_delay); sw.Do(&m_play_track_number_bcd); sw.Do(&m_async_command_parameter); 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); m_last_cdda_report_frame_nibble = 0xFF; - m_cdda_report_delay = CDImage::FRAMES_PER_SECOND; m_play_track_number_bcd = track_bcd; // 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) { 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; diff --git a/src/core/cdrom.h b/src/core/cdrom.h index 4d0fefa57..4768e4643 100644 --- a/src/core/cdrom.h +++ b/src/core/cdrom.h @@ -281,7 +281,6 @@ private: bool m_last_sector_header_valid = false; CDImage::SubChannelQ m_last_subq{}; u8 m_last_cdda_report_frame_nibble = 0xFF; - u8 m_cdda_report_delay = 0x00; u8 m_play_track_number_bcd = 0xFF; u8 m_async_command_parameter = 0x00; diff --git a/src/core/save_state_version.h b/src/core/save_state_version.h index 2cc784d21..effc9a36d 100644 --- a/src/core/save_state_version.h +++ b/src/core/save_state_version.h @@ -2,7 +2,7 @@ #include "types.h" 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) struct SAVE_STATE_HEADER