bump xmodits-lib

Cargo.toml

@@ -26,7 +26,7 @@ tracing = "0.1"
 
 [workspace.dependencies.xmodits-lib]
 git = "https://github.com/B0ney/xmodits-lib.git"
-rev = "f5674a2"
+rev = "971dca25aec621ca88df589681b21ade539259f1"
 features = ["serde"]
 
 [workspace.dependencies.iced]

audio_engine/src/sample/buffer.rs

@@ -66,8 +66,8 @@ fn peak(buf: &[f32], rate: u32, interval: Duration) -> Vec<(f32, f32)> {
     buf.chunks(chunks).map(min_max).collect()
 }
 
-impl From<xmodits_lib::dsp::SampleBuffer> for SampleBuffer {
-    fn from(sb: xmodits_lib::dsp::SampleBuffer) -> Self {
+impl From<xmodits_lib::export::dsp::SampleBuffer> for SampleBuffer {
+    fn from(sb: xmodits_lib::export::dsp::SampleBuffer) -> Self {
         let rate = sb.rate_original().clamp(1, u32::MAX);
         Self::new(sb.buf, rate)
     }

audio_engine/src/sample_pack.rs

@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use xmodits_lib::dsp;
+use xmodits_lib::export::dsp;
 use xmodits_lib::{Module, Sample};
 
 use crate::sample::buffer::SampleBuffer;
@@ -17,10 +17,10 @@ pub struct SamplePack {
 }
 
 impl SamplePack {
-    pub fn build(module: &dyn Module) -> Self {
-        let name = module.name().trim().to_owned();
-        let format = module.format().to_owned();
-        let total_samples = module.total_samples();
+    pub fn build(module: &Module) -> Self {
+        let name = module.info().name.trim().to_owned();
+        let format = module.info().format.to_owned();
+        let total_samples = module.len();
         let total_sample_size = module.samples().iter().map(|m| m.length as usize).sum();
 
         let samples = module

data/src/config/sample_naming.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use xmodits_lib::{SampleNamer, SampleNamerTrait};
+use xmodits_lib::export::name::{SampleNamer, SampleNamerTrait};
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
 #[serde(default)]

data/src/config/sample_ripping.rs

@@ -2,7 +2,7 @@ pub use super::SampleNameConfig;
 
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
-use xmodits_lib::exporter::AudioFormat;
+use xmodits_lib::export::Format;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(default)]
@@ -12,7 +12,7 @@ pub struct SampleRippingConfig {
     pub folder_max_depth: u8,
     pub strict: bool,
     pub worker_threads: usize,
-    pub exported_format: AudioFormat,
+    pub exported_format: Format,
 }
 
 impl Default for SampleRippingConfig {

data/src/lib.rs

@@ -8,15 +8,15 @@ pub use config::Config;
 pub use theme::Theme;
 pub use time::Time;
 
-use xmodits_lib::exporter::AudioFormat;
+use xmodits_lib::export::Format;
 
-pub const SUPPORTED_FORMATS: &[AudioFormat] = &[
-    AudioFormat::WAV,
-    AudioFormat::AIFF,
-    AudioFormat::ITS,
-    AudioFormat::S3I,
-    AudioFormat::IFF,
-    AudioFormat::RAW,
+pub const SUPPORTED_FORMATS: &[Format] = &[
+    Format::WAV,
+    Format::AIFF,
+    Format::ITS,
+    Format::S3I,
+    Format::IFF,
+    Format::RAW,
 ];
 
 #[cfg(feature = "manual")]

src/app/simple.rs

@@ -7,8 +7,8 @@ use crate::ripper::subscription::extraction::strict_loading;
 use std::cmp::Ordering;
 use std::path::PathBuf;
 
-use xmodits_lib::interface::Error;
-use xmodits_lib::{common::extract, interface::ripper::Ripper};
+use xmodits_lib::Error;
+use xmodits_lib::{extract, Ripper};
 
 pub fn rip(paths: impl IntoIterator<Item = String>) {
     let mut paths: Vec<PathBuf> = paths
@@ -53,9 +53,10 @@ pub fn rip(paths: impl IntoIterator<Item = String>) {
 
     let self_contained = config.ripping.self_contained;
 
-    let mut ripper = Ripper::default();
-    ripper.change_namer(config.naming.build_func());
-    ripper.change_format(config.ripping.exported_format.get_impl());
+    let mut ripper = Ripper {
+        namer_func: config.naming.build_func(),
+        format: config.ripping.exported_format.get_impl()
+    };
 
     let errors: Vec<(PathBuf, Error)> = paths
         .into_iter()

src/screen/config/name_preview.rs

@@ -1,7 +1,7 @@
 //! Preview how ripped samples will be named
 
 use data::config::{SampleNameConfig, SampleNameParams, SampleRippingConfig};
-use xmodits_lib::interface::{name::Context, Sample};
+use xmodits_lib::{export::name::Context, Sample};
 
 pub fn preview_name<'a>(
     params: &SampleNameParams,

src/screen/config/sample_ripping.rs

@@ -3,7 +3,7 @@
 use std::path::{Path, PathBuf};
 
 use data::config::SampleRippingConfig;
-use xmodits_lib::exporter::AudioFormat;
+use xmodits_lib::export::Format;
 
 use crate::style;
 use crate::utils::folder_dialog;
@@ -24,7 +24,7 @@ pub fn destination_is_valid(ripping: &SampleRippingConfig) -> bool {
 
 #[derive(Debug, Clone)]
 pub enum Message {
-    ExportFormat(AudioFormat),
+    ExportFormat(Format),
     SelfContained(bool),
     StrictLoad(bool),
     WorkerThreads(Workers),

src/screen/sample_player/instance.rs

@@ -422,8 +422,8 @@ fn load_samples(path: PathBuf) -> Task<Message> {
                         return Err(Error::io_error("File size exceeds 40 MB").unwrap_err());
                     }
 
-                    let module = xmodits_lib::load_module(&mut file)?;
-                    let sample_pack = audio_engine::SamplePack::build(&*module);
+                    let module = xmodits_lib::load(&mut file, Some(path.to_owned()))?;
+                    let sample_pack = audio_engine::SamplePack::build(&module);
                     let name = sample_pack.name;
 
                     let samples = sample_pack

src/screen/sample_player/preview_manager.rs

@@ -24,7 +24,6 @@ pub enum Message {
 pub struct SamplePreview {
     audio_engine: SamplePlayer,
     windows: HashMap<Id, Instance>,
-    singleton: bool,
     default_settings: MediaSettings,
 }
 

src/screen/tracker_info.rs

@@ -11,7 +11,7 @@ use crate::widget::Element;
 
 use iced::widget::{column, text, Space};
 use iced::Alignment;
-use xmodits_lib::common::info::Info;
+use xmodits_lib::Info;
 
 #[derive(Default, Debug, Clone)]
 pub enum TrackerInfo {