Use latest clip engine

helgoboss · Mar 2, 2024 · 8c90c29 · 8c90c29
1 parent f922781
commit 8c90c29
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/doc/playtime.adoc b/doc/playtime.adoc
@@ -10,5 +10,5 @@
 * At the moment, Playtime 2 is a live instrument, so it's intended to be used with buffer sizes that don't introduce more than 10 or 11ms of latency.
 * When using it with higher buffer sizes, the following effects may occur:
 ** When triggering audio clips on a track that contains FX which introduces latency, the audio will be delayed
-** Triggering MIDI clips will lead to unpleasant delays
+** Triggering MIDI clips will lead to unpleasant delays if the virtual instrument FX introduces latency
 * Behavior with high buffer sizes might improve in future
diff --git a/main/src/infrastructure/proto/hub.rs b/main/src/infrastructure/proto/hub.rs
@@ -686,7 +686,7 @@ mod playtime_impl {
             let bar_quantization = EvenQuantization::ONE_BAR;
             let next_bar =
                 timeline.next_quantized_pos_at(pos, bar_quantization, Laziness::EagerForNextPos);
-            // TODO-high-ms4 We are mainly interested in beats relative to the bar in order to get a
+            // TODO-high-ms6 We are mainly interested in beats relative to the bar in order to get a
             //  typical position display and a useful visual metronome. It's not super urgent because
             //  at least with the steady timeline, the app can derive a good metronome view because
             //  of the way the steady timeline is constructed. However, it gets wrong as soon as we

diff --git a/main/src/infrastructure/proto/playtime_request_handler.rs b/main/src/infrastructure/proto/playtime_request_handler.rs
@@ -75,7 +75,7 @@ impl PlaytimeProtoRequestHandler {
                 TriggerSlotMainOptions {
                     stop_column_if_slot_empty: false,
                     allow_start_stop: true,
-                    /// Activating from GUI side ... no.
+                    // Activating from GUI side ... no.
                     allow_activate: false,
                 },
             ),
@@ -85,7 +85,7 @@ impl PlaytimeProtoRequestHandler {
                 TriggerSlotMainOptions {
                     stop_column_if_slot_empty: false,
                     allow_start_stop: true,
-                    /// Activating from GUI side ... no.
+                    // Activating from GUI side ... no.
                     allow_activate: false,
                 },
             ),
@@ -479,7 +479,7 @@ impl PlaytimeProtoRequestHandler {
     ) -> Result<Response<Empty>, Status> {
         let db = Db::try_from(req.db).map_err(|e| Status::invalid_argument(e.to_string()))?;
         let kind = MatrixVolumeKind::try_from(req.kind)
-            .map_err(|e| Status::invalid_argument("unknown matrix volume kind"))?;
+            .map_err(|_| Status::invalid_argument("unknown matrix volume kind"))?;
         self.handle_matrix_command(&req.matrix_id, |matrix| {
             match kind {
                 MatrixVolumeKind::Master => {

diff --git a/playtime-clip-engine b/playtime-clip-engine
diff --git a/resources/api/luau/playtime.luau b/resources/api/luau/playtime.luau
@@ -1018,10 +1018,10 @@ function module.ClipAudioSettings(value: ClipAudioSettings): ClipAudioSettings
 end
 
 export type ClipMidiSettings = {
-	source_reset_settings: MidiResetMessageRange,
-	section_reset_settings: MidiResetMessageRange,
-	loop_reset_settings: MidiResetMessageRange,
 	interaction_reset_settings: MidiResetMessageRange,
+	loop_reset_settings: MidiResetMessageRange,
+	section_reset_settings: MidiResetMessageRange,
+	source_reset_settings: MidiResetMessageRange,
 }
 --- Creates a ClipMidiSettings value.
 function module.ClipMidiSettings(value: ClipMidiSettings): ClipMidiSettings