diff --git a/main/src/application/unit_model.rs b/main/src/application/unit_model.rs index 93ac8a694..09491e0d8 100644 --- a/main/src/application/unit_model.rs +++ b/main/src/application/unit_model.rs @@ -473,10 +473,7 @@ impl UnitModel { compartment: CompartmentKind, source_value: IncomingCompoundSourceValue, ) -> Option<&SharedMapping> { - let virtualization = self.virtualize_source_value(source_value); - if virtualization.is_none() { - return None; - } + let virtualization = self.virtualize_source_value(source_value)?; let instance_state = self.unit.borrow(); use CompoundMappingSource::*; self.mappings(compartment).find(|m| { @@ -485,7 +482,7 @@ impl UnitModel { return false; } let mapping_source = m.source_model.create_source(); - if let (Virtual(virtual_source), Some(v)) = (&mapping_source, &virtualization) { + if let (Virtual(virtual_source), v) = (&mapping_source, &virtualization) { virtual_source.control(&v.virtual_source_value).is_some() } else { mapping_source diff --git a/main/src/infrastructure/ui/app/app_instance.rs b/main/src/infrastructure/ui/app/app_instance.rs index 35f027348..7c47ea202 100644 --- a/main/src/infrastructure/ui/app/app_instance.rs +++ b/main/src/infrastructure/ui/app/app_instance.rs @@ -6,7 +6,7 @@ use crate::infrastructure::proto::{ }; use crate::infrastructure::ui::AppHandle; use anyhow::{anyhow, bail, Context, Result}; -use base::hash_util::{NonCryptoHashMap, NonCryptoHashSet}; +use base::hash_util::NonCryptoHashMap; use fragile::Fragile; use once_cell::sync::Lazy; use prost::Message; @@ -237,7 +237,6 @@ impl AppInstance for StandaloneAppInstance { .send(reply) } - fn notify_app_is_ready(&mut self, callback: AppCallback) { let Some(running_state) = &mut self.running_state else { return; @@ -275,10 +274,14 @@ impl AppInstance for StandaloneAppInstance { } static APP_WINDOWS_IN_TEXT_ENTRY: Lazy>>> = - Lazy::new(|| Default::default()); + Lazy::new(Default::default); pub fn app_window_is_in_text_entry_mode(window: Hwnd) -> Option { - APP_WINDOWS_IN_TEXT_ENTRY.get().borrow().get(&window).copied() + APP_WINDOWS_IN_TEXT_ENTRY + .get() + .borrow() + .get(&window) + .copied() } #[derive(Debug)] @@ -297,7 +300,9 @@ impl CommonAppRunningState { pub fn window(&self) -> Option { let app_library = BackboneShell::get_app_library().ok()?; app_library - .app_instance_get_window(self.app_handle).ok().flatten() + .app_instance_get_window(self.app_handle) + .ok() + .flatten() } pub fn is_visible(&self) -> bool { diff --git a/playtime-clip-engine b/playtime-clip-engine index 8618601d2..b016b488b 160000 --- a/playtime-clip-engine +++ b/playtime-clip-engine @@ -1 +1 @@ -Subproject commit 8618601d22d4d6bc8141e9171e1cdb2db26b6b8f +Subproject commit b016b488bcd7ada63df660bb8d05820d4c2c88e5 diff --git a/resources/api/luau/playtime.luau b/resources/api/luau/playtime.luau index d61c87152..3421eecc9 100644 --- a/resources/api/luau/playtime.luau +++ b/resources/api/luau/playtime.luau @@ -1019,6 +1019,7 @@ export type Clip = { color: ClipColor, dynamic_section: Section?, fixed_section: Section, + pitch_shift: Semitones?, audio_settings: ClipAudioSettings, midi_settings: ClipMidiSettings, }