From 69e5d9f475b0e2cb2b13008961f8218ff995fa8f Mon Sep 17 00:00:00 2001
From: Jaby <fenir50@web.de>
Date: Tue, 17 Dec 2024 22:17:53 +0100
Subject: [PATCH] Prepare for shared code

---
 src/Tools/psxfileconv/src/audio/vag/types.rs       |  1 -
 .../src/images/{reduced_tim => }/color_clut.rs     |  0
 .../src/images/{reduced_tim => }/color_full16.rs   |  0
 src/Tools/psxfileconv/src/images/mod.rs            |  6 +++++-
 .../psxfileconv/src/images/reduced_tim/mod.rs      | 14 +++++---------
 src/Tools/psxfileconv/src/images/tim/mod.rs        |  0
 .../src/images/{reduced_tim => }/types.rs          |  0
 src/Tools/psxfileconv/src/main.rs                  |  1 -
 8 files changed, 10 insertions(+), 12 deletions(-)
 rename src/Tools/psxfileconv/src/images/{reduced_tim => }/color_clut.rs (100%)
 rename src/Tools/psxfileconv/src/images/{reduced_tim => }/color_full16.rs (100%)
 create mode 100644 src/Tools/psxfileconv/src/images/tim/mod.rs
 rename src/Tools/psxfileconv/src/images/{reduced_tim => }/types.rs (100%)

diff --git a/src/Tools/psxfileconv/src/audio/vag/types.rs b/src/Tools/psxfileconv/src/audio/vag/types.rs
index ca4d1ec3..9821dbc2 100644
--- a/src/Tools/psxfileconv/src/audio/vag/types.rs
+++ b/src/Tools/psxfileconv/src/audio/vag/types.rs
@@ -3,7 +3,6 @@ use tool_helper::{raw::RawConversion, Error};
 
 #[repr(packed)] 
 #[derive(Clone)]
-// TODO: Move logic of fixed values into the raw function, including the BE/LE stuff?
 pub struct VAGHeader {
     _id:                 [u8; 4],
     version:             u32,
diff --git a/src/Tools/psxfileconv/src/images/reduced_tim/color_clut.rs b/src/Tools/psxfileconv/src/images/color_clut.rs
similarity index 100%
rename from src/Tools/psxfileconv/src/images/reduced_tim/color_clut.rs
rename to src/Tools/psxfileconv/src/images/color_clut.rs
diff --git a/src/Tools/psxfileconv/src/images/reduced_tim/color_full16.rs b/src/Tools/psxfileconv/src/images/color_full16.rs
similarity index 100%
rename from src/Tools/psxfileconv/src/images/reduced_tim/color_full16.rs
rename to src/Tools/psxfileconv/src/images/color_full16.rs
diff --git a/src/Tools/psxfileconv/src/images/mod.rs b/src/Tools/psxfileconv/src/images/mod.rs
index 956eef87..1c1259b3 100644
--- a/src/Tools/psxfileconv/src/images/mod.rs
+++ b/src/Tools/psxfileconv/src/images/mod.rs
@@ -1 +1,5 @@
-pub mod reduced_tim;
\ No newline at end of file
+pub mod color_clut;
+pub mod color_full16;
+pub mod reduced_tim;
+pub mod tim;
+pub mod types;
\ No newline at end of file
diff --git a/src/Tools/psxfileconv/src/images/reduced_tim/mod.rs b/src/Tools/psxfileconv/src/images/reduced_tim/mod.rs
index c9c779b1..d2a76e2b 100644
--- a/src/Tools/psxfileconv/src/images/reduced_tim/mod.rs
+++ b/src/Tools/psxfileconv/src/images/reduced_tim/mod.rs
@@ -1,14 +1,10 @@
 use clap::{Args, ValueEnum};
 use image::{DynamicImage, io::Reader as ImageReader};
-use color_clut::IndexedImage;
-use color_full16::{RgbaImage, RgbImage};
+use super::color_clut::{IndexedImage, OutputType};
+use super::color_full16::{RgbaImage, RgbImage};
 use std::io::{Cursor, Write};
 use tool_helper::{Error, Input};
-use types::{Header, Color as PSXColor, PSXImageConverter};
-
-mod types;
-mod color_clut;
-mod color_full16;
+use super::types::{Header, Color as PSXColor, PSXImageConverter};
 
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
 pub enum ColorType{
@@ -160,8 +156,8 @@ fn convert_palette_based(input: Input, output: &mut dyn Write, color_type: Color
         Ok(reader) => {
             let output_type = {
                 match color_type {
-                    ColorType::Clut4 => color_clut::OutputType::FourBit,
-                    ColorType::Clut8 => color_clut::OutputType::EightBit,
+                    ColorType::Clut4 => OutputType::FourBit,
+                    ColorType::Clut8 => OutputType::EightBit,
                     _                => return Err(Error::from_str("ColorType not supported"))
                 }
             };
diff --git a/src/Tools/psxfileconv/src/images/tim/mod.rs b/src/Tools/psxfileconv/src/images/tim/mod.rs
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Tools/psxfileconv/src/images/reduced_tim/types.rs b/src/Tools/psxfileconv/src/images/types.rs
similarity index 100%
rename from src/Tools/psxfileconv/src/images/reduced_tim/types.rs
rename to src/Tools/psxfileconv/src/images/types.rs
diff --git a/src/Tools/psxfileconv/src/main.rs b/src/Tools/psxfileconv/src/main.rs
index 44f0404d..ef2fff9a 100644
--- a/src/Tools/psxfileconv/src/main.rs
+++ b/src/Tools/psxfileconv/src/main.rs
@@ -21,7 +21,6 @@ struct CommandLine {
 
 #[derive(Subcommand)]
 enum SubCommands {
-    // === Internal Commands ===
     Nothing,
     SimpleTIM(reduced_tim::Arguments),
     VAG(vag::Arguments),