rewrite player pipeline with cpal and state events & bump rubato version to 1.0.1 (#12)

Author: Sytronik

Cargo.lock

@@ -24,11 +24,13 @@ version = "0.1.0"
 # Shared dependencies that can be inherited by workspace members
 [workspace.dependencies]
 approx = "0.5.1"
+audioadapter-buffers = "2.0.0"
 atomic_float = "1.1.0"
 itertools = "0.14.0"
 ndarray = "0.17.1"
 num-traits = "0.2.19"
 parking_lot = "0.12.5"
+rubato = "1.0.1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 

Cargo.toml

@@ -21,9 +21,10 @@ tauri-build = { version = "2", features = ["codegen"] }
 [dependencies]
 # console-subscriber = "0.4.0"
 anyhow = "1"
+audioadapter-buffers = { workspace = true }
 atomic_float = { workspace = true }
 const_format = "0.2.35"
-cpal = "0.16.0"
+cpal = "0.17.3"
 crossbeam-channel = "0.5.15"
 dunce = "1.0.5"
 ebur128 = "0.1.10"
@@ -38,6 +39,7 @@ parking_lot = { workspace = true }
 rayon = "1.11.0"
 readonly = "0.2.13"
 realfft = "3.5.0"
+rubato = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri = { version = "2", features = ["protocol-asset"] }
@@ -51,10 +53,6 @@ thesia-common = { path = "../src-common" }
 tokio = "1"
 tokio-rayon = "2.1.0"
 
-[dependencies.kittyaudio]
-git = "https://github.com/Sytronik/kittyaudio.git"
-rev = "549b6764da73724336b7539cf773b653c01d9420"
-
 [dependencies.symphonia]
 default-features = false
 features = [

src-tauri/Cargo.toml

@@ -3,7 +3,6 @@ use std::fs;
 use std::io;
 use std::path::Path;
 
-use kittyaudio::Frame;
 use ndarray::prelude::*;
 use rayon::prelude::*;
 use serde::Deserialize;
@@ -178,19 +177,17 @@ impl GuardClipping<Ix2> for Audio {
     }
 }
 
-impl From<&Audio> for Vec<Frame> {
-    fn from(value: &Audio) -> Self {
-        value
-            .view()
-            .axis_iter(Axis(1))
-            .map(|frame| {
-                match frame.len() {
-                    1 => frame[0].into(),
-                    2 => (frame[0], frame[1]).into(),
-                    _ => unimplemented!(), // TODO
-                }
-            })
-            .collect()
+impl Audio {
+    pub fn interleaved_samples(&self) -> Vec<f32> {
+        let n_ch = self.wavs.shape()[0];
+        let n_sample = self.wavs.shape()[1];
+        let mut samples = Vec::with_capacity(n_ch * n_sample);
+        for i in 0..n_sample {
+            for ch in 0..n_ch {
+                samples.push(self.wavs[(ch, i)]);
+            }
+        }
+        samples
     }
 }
 

src-tauri/src/core/audio.rs

@@ -4,7 +4,6 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use identity_hash::{IntMap, IntSet};
-use kittyaudio::Frame;
 use ndarray::prelude::*;
 use rayon::prelude::*;
 use symphonia::core::errors::Error as SymphoniaError;
@@ -94,8 +93,8 @@ impl AudioTrack {
         self.audio.channel(ch)
     }
 
-    pub fn interleaved_frames(&self) -> Vec<Frame> {
-        self.audio.as_ref().into()
+    pub fn interleaved_samples(&self) -> Vec<f32> {
+        self.audio.interleaved_samples()
     }
 
     #[inline]

src-tauri/src/core/track.rs

@@ -100,14 +100,6 @@ pub struct ConstsAndUserSettings {
     pub user_settings: UserSettings,
 }
 
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlayerState {
-    pub is_playing: bool,
-    pub position_sec: f64,
-    pub err: String,
-}
-
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Spectrogram<'a> {

src-tauri/src/interface.rs

@@ -21,7 +21,7 @@ mod player;
 
 use core::*;
 use interface::*;
-use player::{PlayerCommand, PlayerNotification};
+use player::PlayerCommand;
 use tauri_plugin_window_state::{AppHandleExt, StateFlags, WindowExt};
 
 #[cfg(all(
@@ -83,7 +83,7 @@ fn init(app: AppHandle, colormap_length: u32) -> tauri::Result<ConstsAndUserSett
     let settings_json = json!(user_settings);
     _set_user_settings(&app, settings_json, false)?;
 
-    player::spawn_task();
+    player::spawn_task(app);
     Ok(ConstsAndUserSettings {
         constants: Default::default(),
         user_settings,
@@ -498,22 +498,6 @@ async fn resume_player() {
     player::send(PlayerCommand::Resume).await;
 }
 
-#[tauri::command]
-fn get_player_state() -> PlayerState {
-    match player::recv() {
-        PlayerNotification::Ok(state) => PlayerState {
-            is_playing: state.is_playing,
-            position_sec: state.position_sec,
-            err: "".to_string(),
-        },
-        PlayerNotification::Err(e_str) => PlayerState {
-            is_playing: false,
-            position_sec: 0.,
-            err: e_str,
-        },
-    }
-}
-
 #[inline]
 async fn _refresh_track_player() {
     player::send(PlayerCommand::SetTrack((None, None))).await;
@@ -763,7 +747,6 @@ pub fn run() {
             seek_player,
             pause_player,
             resume_player,
-            get_player_state,
             menu::enable_edit_menu,
             menu::disable_edit_menu,
             menu::enable_axis_zoom_menu,