WIP

987123879113 · Nov 7, 2024 · f6014f6 · f6014f6
1 parent ffd39cd
commit f6014f6
Show file tree

Hide file tree

Showing 6 changed files with 996 additions and 101 deletions.
diff --git a/roms/dir.txt b/roms/dir.txt
diff --git a/src/devices/imagedev/cdromimg.cpp b/src/devices/imagedev/cdromimg.cpp
@@ -228,6 +228,13 @@ uint32_t cdrom_image_device::get_track_start(uint32_t track) const
 	return 0;
 }
 
+uint32_t cdrom_image_device::get_adr_control_frame(uint32_t frame) const
+{
+	if (m_cdrom_handle)
+		return m_cdrom_handle->get_adr_control_frame(frame);
+	return 0;
+}
+
 bool cdrom_image_device::read_data(uint32_t lbasector, void *buffer, uint32_t datatype, bool phys)
 {
 	if (m_cdrom_handle)
@@ -237,10 +244,17 @@ bool cdrom_image_device::read_data(uint32_t lbasector, void *buffer, uint32_t da
 	return 0;
 }
 
-bool cdrom_image_device::read_subcode(uint32_t lbasector, void *buffer, bool phys)
+bool cdrom_image_device::read_subcode(uint32_t lbasector, void *buffer, bool phys, bool uninterlaced)
+{
+	if (m_cdrom_handle)
+		return m_cdrom_handle->read_subcode(lbasector, buffer, phys, uninterlaced);
+	return 0;
+}
+
+bool cdrom_image_device::read_subcode_channel_raw(uint32_t lbasector, void *buffer, uint32_t subchan)
 {
 	if (m_cdrom_handle)
-		return m_cdrom_handle->read_subcode(lbasector, buffer, phys);
+		return m_cdrom_handle->read_subcode_channel_raw(lbasector, buffer, subchan);
 	return 0;
 }
 
@@ -266,6 +280,20 @@ int cdrom_image_device::get_track_type(int track) const
 	return 0;
 }
 
+uint32_t cdrom_image_device::get_absolute_msf(uint32_t frame) const
+{
+	if (m_cdrom_handle)
+		return m_cdrom_handle->get_absolute_msf(frame);
+	return 0;
+}
+
+uint32_t cdrom_image_device::get_relative_msf(uint32_t frame) const
+{
+	if (m_cdrom_handle)
+		return m_cdrom_handle->get_relative_msf(frame);
+	return 0;
+}
+
 bool cdrom_image_device::is_cd() const
 {
 	return m_cdrom_handle != nullptr;

diff --git a/src/devices/imagedev/cdromimg.h b/src/devices/imagedev/cdromimg.h
@@ -63,12 +63,17 @@ class cdrom_image_device :  public device_t,
 	uint32_t get_track(uint32_t frame) const;
 	uint32_t get_track_index(uint32_t frame) const;
 	uint32_t get_track_start(uint32_t track) const;
+	uint32_t get_adr_control_frame(uint32_t frame) const;
 	bool read_data(uint32_t lbasector, void *buffer, uint32_t datatype, bool phys=false);
-	bool read_subcode(uint32_t lbasector, void *buffer, bool phys=false);
+	bool read_subcode(uint32_t lbasector, void *buffer, bool phys=false, bool uninterlaced=false);
+	bool read_subcode_channel_raw(uint32_t lbasector, void *buffer, uint32_t subchan);
 	int get_adr_control(int track) const;
 	const cdrom_file::toc &get_toc() const;
 	int get_track_type(int track) const;
 
+	uint32_t get_absolute_msf(uint32_t frame) const;
+	uint32_t get_relative_msf(uint32_t frame) const;
+
 	bool is_cd() const;
 	bool is_gd() const;
 	bool is_dvd() const;