Merge pull request #15 from subalterngames/play_state

Reduced CPU usage

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["audio", "common", "input", "io", "render", "text"]
 
 [workspace.package]
-version = "0.1.4"
+version = "0.2.0"
 authors = ["Esther Alter <[email protected]>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -13,7 +13,6 @@ serde_json = "1.0"
 rust-ini = "0.18"
 directories = "5.0.1"
 midir = "0.9.1"
-crossbeam-channel = "0.5.8"
 csv = "1.2.1"
 cpal = "0.13.1"
 hound = "3.5.0"
@@ -70,8 +69,8 @@ features = []
 [workspace.dependencies.oxisynth]
 version = "0.0.3"
 features = []
-git = "https://github.com/PolyMeilex/OxiSynth.git"
-branch = "master"
+git = "https://github.com/subalterngames/OxiSynth.git"
+branch = "midi_event_copy_clone"
 
 [workspace.dependencies.tts]
 version = "0.25.6"
@@ -85,7 +84,7 @@ speech_dispatcher_0_9 = ["text/speech_dispatcher_0_9"]
 
 [package]
 name = "cacophony"
-version = "0.1.4"
+version = "0.2.0"
 authors = ["Esther Alter <[email protected]>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -121,7 +120,7 @@ path = "text"
 name = "Cacophony"
 identifier = "com.subalterngames.cacophony"
 icon = ["icon/32.png", "icon/64.png", "icon/128.png", "icon/256.png"]
-version = "0.1.4"
+version = "0.2.0"
 resources = ["data/*"]
 copyright = "Copyright (c) Subaltern Games LLC 2023. All rights reserved."
 short_description = "A minimalist and ergonomic MIDI sequencer."

audio/Cargo.toml

@@ -8,7 +8,6 @@ edition.workspace = true
 
 [dependencies]
 cpal = { workspace = true }
-crossbeam-channel = { workspace = true }
 hound = { workspace = true }
 id3 = { workspace = true }
 mp3lame-encoder = { workspace = true }

audio/src/command.rs

@@ -1,31 +1,8 @@
-use crate::export_state::ExportState;
 use std::path::PathBuf;
 
 /// A command for the synthesizer.
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub enum Command {
-    /// Set the synthesizer's framerate.
-    SetFramerate { framerate: u32 },
-    /// Send this to announce that we're playing music, as opposed to arbitrary user input audio.
-    PlayMusic { time: u64 },
-    /// Send this to stop playing music.
-    StopMusic,
-    /// Schedule a stop-all event.
-    StopMusicAt { time: u64 },
-    /// Stop all sound.
-    SoundOff,
-    /// Note-on ASAP.
-    NoteOn { channel: u8, key: u8, velocity: u8 },
-    /// Schedule a note-on event.
-    NoteOnAt {
-        channel: u8,
-        key: u8,
-        velocity: u8,
-        start: u64,
-        end: u64,
-    },
-    /// Note-off ASAP.
-    NoteOff { channel: u8, key: u8 },
     /// Load a SoundFont file.
     LoadSoundFont { channel: u8, path: PathBuf },
     /// Set a program.
@@ -39,8 +16,4 @@ pub enum Command {
     UnsetProgram { channel: u8 },
     /// Set the overall gain.
     SetGain { gain: u8 },
-    /// Export audio.
-    Export { path: PathBuf, state: ExportState },
-    /// Ask for the export state.
-    SendExportState,
 }