From 9c01dab08358059bce5c8cf18d9aae4267c53014 Mon Sep 17 00:00:00 2001
From: Jaby <fenir50@web.de>
Date: Sun, 26 May 2024 21:02:40 +0200
Subject: [PATCH] Fix psxcdread

---
 src/Tools/cdtypes/Cargo.toml           | 2 +-
 src/Tools/cdtypes/src/cd/reader.rs     | 4 ++--
 src/Tools/cdtypes/src/types/cue/mod.rs | 2 +-
 src/Tools/psxcdgen_ex/Cargo.toml       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Tools/cdtypes/Cargo.toml b/src/Tools/cdtypes/Cargo.toml
index f4551bf5..7a9d7b6c 100644
--- a/src/Tools/cdtypes/Cargo.toml
+++ b/src/Tools/cdtypes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cdtypes"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 
 [profile.release]
diff --git a/src/Tools/cdtypes/src/cd/reader.rs b/src/Tools/cdtypes/src/cd/reader.rs
index efb16502..31115edd 100644
--- a/src/Tools/cdtypes/src/cd/reader.rs
+++ b/src/Tools/cdtypes/src/cd/reader.rs
@@ -1,4 +1,4 @@
-use super::sector::Sector;
+use super::{sector::Sector, types::time::Time};
 use super::super::{Error, types::{cue::{DataType, DataTypeEnd}, sector::*}};
 use std::io::Read;
 
@@ -12,7 +12,7 @@ pub struct Reader<'a> {
 impl<'a> Reader<'a> {
     pub fn new(file: std::fs::File, data_type_guide: &'a Vec<DataTypeEnd>) -> Result<Reader, Error> {
         Ok(Reader{
-            file, data_type_guide, lba: 0, active: true
+            file, data_type_guide, lba: Time::cd_pregap().as_sectors(), active: true
         })
     }
 
diff --git a/src/Tools/cdtypes/src/types/cue/mod.rs b/src/Tools/cdtypes/src/types/cue/mod.rs
index 772d56e2..0d7ff290 100644
--- a/src/Tools/cdtypes/src/types/cue/mod.rs
+++ b/src/Tools/cdtypes/src/types/cue/mod.rs
@@ -100,7 +100,7 @@ impl std::fmt::Display for Format {
     }    
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum DataType {
     Audio,
     Cdg,
diff --git a/src/Tools/psxcdgen_ex/Cargo.toml b/src/Tools/psxcdgen_ex/Cargo.toml
index 4c744654..f4f11e57 100644
--- a/src/Tools/psxcdgen_ex/Cargo.toml
+++ b/src/Tools/psxcdgen_ex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "psxcdgen_ex"
-version = "0.3.1"
+version = "0.5.0"
 edition = "2021"
 
 [profile.release]