Merge branch 'main' into new_file_stop_music

subalterngames · Jan 9, 2024 · 87d615a · 87d615a
2 parents 6a3d726 + 68da7b3
commit 87d615a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["audio", "common", "input", "io", "render", "text"]
 
 [workspace.package]
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Esther Alter <subalterngames@gmail.com>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -86,7 +86,7 @@ speech_dispatcher_0_9 = ["text/speech_dispatcher_0_9"]
 
 [package]
 name = "cacophony"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Esther Alter <subalterngames@gmail.com>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -122,7 +122,7 @@ path = "text"
 name = "Cacophony"
 identifier = "com.subalterngames.cacophony"
 icon = ["icon/32.png", "icon/64.png", "icon/128.png", "icon/256.png"]
-version = "0.2.1"
+version = "0.2.2"
 resources = ["data/*"]
 copyright = "Copyright (c) Subaltern Games LLC 2023. All rights reserved."
 short_description = "A minimalist and ergonomic MIDI sequencer."

diff --git a/audio/src/conn.rs b/audio/src/conn.rs
@@ -219,7 +219,7 @@ impl Conn {
     pub fn set_music(&mut self, state: &State) {
         let play_state = *self.play_state.lock();
         match play_state {
-            PlayState::NotPlaying => self.start_music(state),
+            PlayState::NotPlaying | PlayState::Decaying => self.start_music(state),
             _ => self.stop_music(&state.music),
         }
     }

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # 0.2.x
 
+## 0.2.2
+
+- There was an input bug where the play/start key (spacebar) was sometimes unresponsive for the first few presses. This is because audio was still decaying from a previous play, meaning that technically the previous play was still ongoing. I fixed it.
+
 ## 0.2.1
 
 - I replaced the default qwerty bindings for note input with a more "standard" layout. This information is stored in config.ini, so if you want the update, make sure to delete Documents/cacophony/config.ini if it exists (Cacophony will use the default data/config.ini instead).