diff --git a/src/Tools/psxfileconv/Cargo.toml b/src/Tools/psxfileconv/Cargo.toml index 1a5aeb3a..e7030c75 100644 --- a/src/Tools/psxfileconv/Cargo.toml +++ b/src/Tools/psxfileconv/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "psxfileconv" -version = "0.6.0" +version = "0.7.5" edition = "2021" [profile.release] diff --git a/src/Tools/psxfileconv/src/audio/mod.rs b/src/Tools/psxfileconv/src/audio/mod.rs index be2c4c30..243d7e8d 100644 --- a/src/Tools/psxfileconv/src/audio/mod.rs +++ b/src/Tools/psxfileconv/src/audio/mod.rs @@ -1,2 +1,2 @@ -pub mod my_xa; +pub mod xa; pub mod vag; \ No newline at end of file diff --git a/src/Tools/psxfileconv/src/audio/my_xa/mod.rs b/src/Tools/psxfileconv/src/audio/xa/mod.rs similarity index 100% rename from src/Tools/psxfileconv/src/audio/my_xa/mod.rs rename to src/Tools/psxfileconv/src/audio/xa/mod.rs diff --git a/src/Tools/psxfileconv/src/audio/my_xa/raw_audio/error.rs b/src/Tools/psxfileconv/src/audio/xa/raw_audio/error.rs similarity index 100% rename from src/Tools/psxfileconv/src/audio/my_xa/raw_audio/error.rs rename to src/Tools/psxfileconv/src/audio/xa/raw_audio/error.rs diff --git a/src/Tools/psxfileconv/src/audio/my_xa/raw_audio/mod.rs b/src/Tools/psxfileconv/src/audio/xa/raw_audio/mod.rs similarity index 100% rename from src/Tools/psxfileconv/src/audio/my_xa/raw_audio/mod.rs rename to src/Tools/psxfileconv/src/audio/xa/raw_audio/mod.rs diff --git a/src/Tools/psxfileconv/src/audio/my_xa/xa_audio/mod.rs b/src/Tools/psxfileconv/src/audio/xa/xa_audio/mod.rs similarity index 100% rename from src/Tools/psxfileconv/src/audio/my_xa/xa_audio/mod.rs rename to src/Tools/psxfileconv/src/audio/xa/xa_audio/mod.rs diff --git a/src/Tools/psxfileconv/src/audio/my_xa/xa_audio/xapcm.rs b/src/Tools/psxfileconv/src/audio/xa/xa_audio/xapcm.rs similarity index 97% rename from src/Tools/psxfileconv/src/audio/my_xa/xa_audio/xapcm.rs rename to src/Tools/psxfileconv/src/audio/xa/xa_audio/xapcm.rs index e413d014..0741d702 100644 --- a/src/Tools/psxfileconv/src/audio/my_xa/xa_audio/xapcm.rs +++ b/src/Tools/psxfileconv/src/audio/xa/xa_audio/xapcm.rs @@ -1,4 +1,4 @@ -use crate::audio::my_xa::{raw_audio::{CDAudioSamples, Orality}, Frequency, SampleDepth}; +use crate::audio::xa::{raw_audio::{CDAudioSamples, Orality}, Frequency, SampleDepth}; use cdtypes::types::sector::{Mode2Form2, XAADPCMBitsPerSample, XAADPCMSampleRate, XAADPCMSound}; use tool_helper::Error; diff --git a/src/Tools/psxfileconv/src/main.rs b/src/Tools/psxfileconv/src/main.rs index 5c1d9fbb..44f0404d 100644 --- a/src/Tools/psxfileconv/src/main.rs +++ b/src/Tools/psxfileconv/src/main.rs @@ -25,7 +25,7 @@ enum SubCommands { Nothing, SimpleTIM(reduced_tim::Arguments), VAG(vag::Arguments), - XA(my_xa::Arguments), + XA(xa::Arguments), } fn run_main(cmd: CommandLine) -> Result<(), Error> { @@ -47,7 +47,7 @@ fn run_main(cmd: CommandLine) -> Result<(), Error> { SubCommands::Nothing => nothing::copy(&mut input, dst_buffer), SubCommands::SimpleTIM(args) => reduced_tim::convert(args, input, dst_buffer), SubCommands::VAG(args) => audio::vag::convert(args, &cmd.output_file, input, dst_buffer), - SubCommands::XA(args) => audio::my_xa::convert(args, input, dst_buffer), + SubCommands::XA(args) => audio::xa::convert(args, input, dst_buffer), } };