WIP

core/src/manager/render_manager.rs

@@ -73,7 +73,7 @@ pub struct RenderManagerSettings {
 
 impl RenderManager {
     pub fn init(
-        render_voices: Vec<RenderVoice>,
+        // render_voices: Vec<RenderVoice>,
         visualization_channel: VisualizationChannel,
         kill_channel: KillChannel,
         once: bool,
@@ -89,7 +89,8 @@ impl RenderManager {
                 channel: visualization_channel,
                 normalizer: Normalizer::default(),
             },
-            renders: [Some(render_voices), None],
+            // renders: [Some(render_voices), None],
+            renders: [None, None],
             past_volume: 0.8,
             current_volume: 0.8,
             render_idx: 0,
@@ -272,7 +273,8 @@ impl RenderManager {
         self.next_render().is_some()
     }
 
-    pub fn push_render(&mut self, render: Vec<RenderVoice>) {
+    pub fn push_render(&mut self, render: Vec<RenderVoice>, once: bool) {
+        self.once = once;
         *self.next_render() = Some(render);
     }
 }

mocks/ops/overtone.socool

@@ -0,0 +1,15 @@
+{ f: 220, l: 1, g: 1, p: 0 } 
+
+main = {
+  Overlay [
+    {2, 2, 1/2, 1},
+    {1, -1, 2/3, -1},
+  ]
+}
+
+expect = {
+    Overlay [
+        Fm 2 | Fa 2 | Gm 1/2 | Pa 1,
+        Fm 1 | Fa -1 | Gm 2/3 | Pa -1,
+    ]
+}

parser/src/socool.lalrpop

@@ -344,6 +344,7 @@ BaseOperation: Term = {
             Term::Op(Length { m: length }),
         ]})
     },
+    BracedOvertone
 };
 
 
@@ -363,6 +364,22 @@ Overtone: Term = {
     })
 }
 
+BracedOvertone: Term = {
+    "{"
+        <fm:Rational> ","
+        <fa:Rational> ","
+        <g:Rational> ","
+        <p:Rational>
+    "}"
+    => Term::Op(Compose { operations: vec! [
+            Term::Op(TransposeM { m: fm }),
+            Term::Op(TransposeA { a: fa }),
+            Term::Op(Gain { m: g }),
+            Term::Op(PanA { a: p }),
+        ]
+    })
+}
+
 
 Overtones = Comma<Overtone>;
 

src/demo.rs

@@ -5,8 +5,9 @@ use weresocool::interpretable::InputType::Language;
 use weresocool::manager::prepare_render_outside;
 
 pub fn demo() -> Result<(), Error> {
-    let render_voices = prepare_render_outside(Language(DEMO), None);
-    play_once(render_voices?, "demo.socool".to_string())?;
+    // let render_voices = prepare_render_outside(Language(DEMO), None);
+    // play_once(render_voices?, "demo.socool".to_string())?;
+    todo!();
     Ok(())
 }
 

src/play.rs

@@ -22,26 +22,24 @@ pub fn play(filename: &String, cwd: PathBuf, play: Play) -> Result<(), Error> {
 
 pub fn play_file(filename: String, working_path: PathBuf, play: Play) -> Result<(), Error> {
     match play {
-        Play::Once => {
-            let render_voices = prepare_render_outside(Filename(&filename), Some(working_path));
-
-            play_once(render_voices?, filename)
-        }
+        Play::Once => play_once(filename, working_path),
         Play::Watch => play_watch(filename, working_path),
     }
 }
 
-pub fn play_once(render_voices: Vec<RenderVoice>, filename: String) -> Result<(), Error> {
-    were_so_cool_logo(Some("Playing"), Some(filename));
+pub fn play_once(filename: String, working_path: PathBuf) -> Result<(), Error> {
+    were_so_cool_logo(Some("Playing"), Some(filename.clone()));
 
     let (tx, rx) = std::sync::mpsc::channel::<bool>();
-    let render_manager = Arc::new(Mutex::new(RenderManager::init(
-        render_voices,
-        None,
-        Some(tx),
-        true,
-        None,
-    )));
+    let render_manager = Arc::new(Mutex::new(RenderManager::init(None, Some(tx), true, None)));
+
+    let render_voices = prepare_render_outside(Filename(&filename), Some(working_path))?;
+
+    render_manager
+        .lock()
+        .unwrap()
+        .push_render(render_voices, true);
+
     let mut stream = real_time_render_manager(Arc::clone(&render_manager))?;
 
     stream.start()?;
@@ -60,13 +58,12 @@ pub fn play_once(render_voices: Vec<RenderVoice>, filename: String) -> Result<()
 }
 
 fn play_watch(filename: String, working_path: PathBuf) -> Result<(), Error> {
-    let render_manager = Arc::new(Mutex::new(RenderManager::init(
-        vec![],
-        None,
-        None,
-        false,
-        None,
-    )));
+    let render_manager = Arc::new(Mutex::new(RenderManager::init(None, None, false, None)));
+    let render_voices = prepare_render_outside(Filename(&filename), Some(working_path.clone()))?;
+    render_manager
+        .lock()
+        .unwrap()
+        .push_render(render_voices, false);
     watch(filename, working_path, render_manager.clone())?;
     let mut stream = real_time_render_manager(Arc::clone(&render_manager))?;
     stream.start()?;

src/testing/expect_tests/mod.rs

@@ -66,6 +66,12 @@ mod expect {
     // fn __tags_generated_(resource: &str) {
     // expect(resource);
     // }
+    //
+
+    #[test_resources("mocks/ops/*.socool")]
+    fn __ops_generated_(resource: &str) {
+        expect(resource);
+    }
 
     #[test_resources("mocks/data/*.socool")]
     fn __data_generated_(resource: &str) {

src/watch.rs

@@ -58,7 +58,7 @@ fn render(filename: &str, working_path: &Path, render_manager: &Arc<Mutex<Render
         };
 
     if let Some(voices) = render_voices {
-        render_manager.lock().unwrap().push_render(voices);
+        render_manager.lock().unwrap().push_render(voices, false);
         let mut rng = rand::thread_rng();
 
         print!(