Make SmafPlayer to accept raw smaf

smaf_cli/src/main.rs

@@ -10,7 +10,6 @@ use midir::{MidiOutput, MidiOutputConnection};
 use rodio::{buffer::SamplesBuffer, OutputStream, OutputStreamHandle, Sink};
 use tokio::time::sleep;
 
-use smaf::Smaf;
 use smaf_player::{AudioBackend, SmafPlayer};
 
 struct AudioBackendImpl {
@@ -76,16 +75,14 @@ pub async fn main() {
     let file = args().nth(1).expect("No file given");
     let data = fs::read(file).expect("Failed to read file");
 
-    let smaf = Smaf::parse(&data).expect("Failed to parse file");
-
     let midi_out = MidiOutput::new("smaf_cli").unwrap();
     let midi_ports = midi_out.ports();
     let out_port = midi_ports.last().unwrap();
     let midi_out = midi_out.connect(out_port, "smaf_cli").unwrap();
 
     let (_output_stream, stream_handle) = OutputStream::try_default().unwrap();
 
-    let player = SmafPlayer::new();
+    let player = SmafPlayer::new(data);
 
-    player.play(&smaf, &AudioBackendImpl::new(midi_out, stream_handle)).await
+    player.play(&AudioBackendImpl::new(midi_out, stream_handle)).await
 }

smaf_player/src/lib.rs

@@ -225,12 +225,14 @@ impl Player for PCMAudioTrackPlayer<'_> {
 
 #[derive(Default, Clone)]
 pub struct SmafPlayer {
+    raw: Vec<u8>,
     stopped: Arc<AtomicBool>,
 }
 
 impl SmafPlayer {
-    pub fn new() -> Self {
+    pub fn new(raw: Vec<u8>) -> Self {
         Self {
+            raw,
             stopped: Arc::new(AtomicBool::new(false)),
         }
     }
@@ -239,7 +241,9 @@ impl SmafPlayer {
         self.stopped.store(true, Ordering::Relaxed);
     }
 
-    pub async fn play(&self, smaf: &Smaf<'_>, backend: &dyn AudioBackend) {
+    pub async fn play(&self, backend: &dyn AudioBackend) {
+        let smaf = Smaf::parse(&self.raw).unwrap();
+
         let players = smaf.chunks.iter().filter_map(|x| match x {
             SmafChunk::ScoreTrack(_, x) => Some(ScoreTrackPlayer::new(x, backend).play(self.stopped.clone())),
             SmafChunk::PCMAudioTrack(_, x) => Some(PCMAudioTrackPlayer::new(x, backend).play(self.stopped.clone())),