implement playback

Author: Tehforsch

src/audio/cutter.rs

@@ -83,6 +83,7 @@ impl Cutter {
     }
 
     pub async fn run_internal(mut self) {
+        // TODO await here
         while !self.handles.is_empty() || !self.cuts.is_empty() {
             if self.handles.len() < MAX_NUM_PROCESSES {
                 if let Some(cut) = self.pop_front() {

src/audio/mod.rs

@@ -2,7 +2,7 @@ mod cut;
 mod cutter;
 mod cutting_strategy;
 mod excerpt;
-mod playback;
+pub mod playback;
 mod sample_reader;
 mod time;
 

src/audio/playback.rs

@@ -1,10 +1,8 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
-use std::thread;
-use std::time::Duration;
-use std::time::SystemTime;
 
+use futures::channel::mpsc::Sender;
 use hound::WavSpec;
 use rodio::OutputStream;
 use rodio::Sink;
@@ -15,6 +13,7 @@ use crate::audio::AudioTime;
 use super::sample_reader::WavFileReader;
 use super::SampleReader;
 
+#[derive(Clone)]
 pub struct WavSource {
     spec: WavSpec,
     samples: Vec<i16>,
@@ -61,51 +60,16 @@ impl Iterator for WavSource {
     }
 }
 
-pub fn play_audio(
-    buffer: &mut WavFileReader,
-    start_time: AudioTime,
-    end_time: AudioTime,
-) -> PlaybackThreadHandle {
-    let source = WavSource::new(buffer, start_time, end_time);
-    let stop = Arc::new(AtomicBool::new(false));
-    thread::spawn({
-        let stop = stop.clone();
-        move || {
-            let (_stream, stream_handle) = OutputStream::try_default().unwrap();
-            let sink = Sink::try_new(&stream_handle).unwrap();
-            sink.append(source);
-            sink.play();
-            while !stop.load(Ordering::SeqCst) {
-                thread::sleep(Duration::from_millis(1));
-            }
-        }
-    });
-    PlaybackThreadHandle {
-        stop,
-        start_system_time: SystemTime::now(),
-        start_audio_time: start_time,
-    }
-}
+#[derive(Clone, Debug)]
+pub struct Progress {}
 
-pub struct PlaybackThreadHandle {
-    stop: Arc<AtomicBool>,
-    start_system_time: SystemTime,
-    start_audio_time: AudioTime,
-}
-
-impl PlaybackThreadHandle {
-    pub fn shut_down(&self) {
-        self.stop.store(true, Ordering::SeqCst);
-    }
-
-    pub fn get_current_audio_time(&self) -> AudioTime {
-        let time_expired = SystemTime::now().duration_since(self.start_system_time);
-        let time_expired_secs = time_expired
-            .unwrap_or(Duration::from_millis(0))
-            .as_secs_f64();
-        AudioTime::from_time_same_spec(
-            self.start_audio_time.time + time_expired_secs,
-            self.start_audio_time,
-        )
+pub async fn play_audio(source: WavSource, _: Sender<Progress>) {
+    let stop = Arc::new(AtomicBool::new(false));
+    let (_stream, stream_handle) = OutputStream::try_default().unwrap();
+    let sink = Sink::try_new(&stream_handle).unwrap();
+    sink.append(source);
+    sink.play();
+    while !stop.load(Ordering::SeqCst) {
+        println!("hi");
     }
 }

src/audio/sample_reader.rs

@@ -13,8 +13,6 @@ pub trait SampleReader {
         end: AudioTime,
     ) -> Result<Vec<i16>, OutOfBoundsError>;
 
-    fn start(&self) -> AudioTime;
-    fn end(&self) -> AudioTime;
     fn spec(&self) -> WavSpec;
 }
 
@@ -68,14 +66,6 @@ impl SampleReader for WavReader<BufReader<File>> {
         }
     }
 
-    fn start(&self) -> AudioTime {
-        AudioTime::from_time_and_spec(0.0, self.spec())
-    }
-
-    fn end(&self) -> AudioTime {
-        AudioTime::from_sample_and_spec(self.len(), self.spec())
-    }
-
     fn spec(&self) -> WavSpec {
         self.spec()
     }

src/gui/mod.rs

@@ -36,24 +36,6 @@ impl Gui {
     }
 }
 
-// impl Application for Gui {
-//     type Executor = executor::Default;
-
-//     type Message = Message;
-
-//     type Theme = Theme;
-
-//     type Flags = Config;
-
-//     fn title(&self) -> String {
-//         "Striputary".to_string()
-//     }
-
-//     fn theme(&self) -> Theme {
-//         Theme::GruvboxDark
-//     }
-// }
-
 impl Gui {
     fn new(config: &Config) -> (Self, Task<Message>) {
         (
@@ -94,11 +76,11 @@ impl Gui {
     }
 
     fn subscription(&self) -> Subscription<Message> {
-        Subscription::batch(
-            self.session
-                .iter()
-                .map(|s| s.subscription().map(|m| Message::SessionMessage(m))),
-        )
+        if let Some(ref session) = self.session {
+            session.subscription().map(|m| Message::SessionMessage(m))
+        } else {
+            Subscription::none()
+        }
     }
 }
 

src/gui/plot.rs

@@ -61,8 +61,6 @@ pub struct Plot {
     volume_data: Vec<Data>,
     song_before: Option<Song>,
     song_after: Option<Song>,
-    start: AudioTime,
-    end: AudioTime,
     cut_time: AudioTime,
     finished_cut_before: bool,
     finished_cut_after: bool,
@@ -103,15 +101,13 @@ impl Plot {
             volume_data,
             song_before,
             song_after,
-            start,
-            end,
             cut_time,
             finished_cut_before: false,
             finished_cut_after: false,
         }
     }
 
-    pub fn get_plot_path(&self, data: &[Data], bounds: &Bounds) -> Path {
+    fn get_plot_path(&self, data: &[Data], bounds: &Bounds) -> Path {
         let mut path = Builder::new();
 
         if data.len() > 0 {
@@ -125,7 +121,7 @@ impl Plot {
 
     /// Return the path left of the marker and the path right
     /// of the marker, so they can be colored individually.
-    pub fn get_plot_paths(&self, bounds: &Bounds) -> (Path, Path) {
+    fn get_plot_paths(&self, bounds: &Bounds) -> (Path, Path) {
         let cutoff = self
             .volume_data
             .iter()
@@ -139,7 +135,7 @@ impl Plot {
         )
     }
 
-    pub fn get_marker_path(&self, bounds: &Bounds) -> Path {
+    fn get_marker_path(&self, bounds: &Bounds) -> Path {
         let mut path = Builder::new();
         path.move_to(bounds.data_to_point(&Data {
             time: self.cut_time,
@@ -179,10 +175,22 @@ impl Plot {
         Bounds {
             width: bounds.width,
             height: bounds.height,
-            min_time: self.volume_data.first().unwrap().time,
-            max_time: self.volume_data.last().unwrap().time,
+            min_time: self.min_time(),
+            max_time: self.max_time(),
         }
     }
+
+    pub fn max_time(&self) -> AudioTime {
+        self.volume_data.last().unwrap().time
+    }
+
+    fn min_time(&self) -> AudioTime {
+        self.volume_data.first().unwrap().time
+    }
+
+    pub fn cut_time(&self) -> AudioTime {
+        self.cut_time
+    }
 }
 
 pub struct PlotMarkerMoved {