アイコン、送信先、グループ、デッキ表示を修正する

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "3"
 members = ["crates/hyperdeck-pool", "crates/hyperdeck-plugin"]
 
 [workspace.package]
-version = "0.1.0"
+version = "0.2.0"
 edition = "2024"
 rust-version = "1.99"
 license = "MIT OR Apache-2.0"

crates/hyperdeck-plugin/Cargo.toml

@@ -23,6 +23,7 @@ path = "src/bin/typegen.rs"
 anyhow = "1"
 base64 = "0.22"
 hyperdeck-pool = { path = "../hyperdeck-pool" }
+hyperdeck-tokio.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 streamdeck-plugin = { version = "0.1", features = ["macros", "typegen"] }

crates/hyperdeck-plugin/src/actions.rs

@@ -1,7 +1,7 @@
 use serde_json::Value;
 use streamdeck_plugin::{
     ActionContext, ActionPayload, DialRotatePayload, EncoderAction, KeypadAction, Result,
-    TouchTapPayload, streamdeck_action,
+    streamdeck_action,
 };
 
 use crate::contracts::ActionSettings;
@@ -145,15 +145,6 @@ macro_rules! hyperdeck_dial {
                 Ok(())
             }
 
-            async fn on_touch_tap(
-                &mut self,
-                _payload: &TouchTapPayload,
-                ctx: &ActionContext<'_, Self::Settings, Self::State>,
-            ) -> Result<()> {
-                ctx.state().dial_touch(&ctx.identity().context);
-                Ok(())
-            }
-
             async fn on_property_inspector_did_appear(
                 &mut self,
                 ctx: &ActionContext<'_, Self::Settings, Self::State>,
@@ -218,16 +209,6 @@ hyperdeck_key!(
     "dev.mikanseilaboratory.bmd.hyperdeck.preview",
     ActionKind::Preview
 );
-hyperdeck_key!(
-    LoopAction,
-    "dev.mikanseilaboratory.bmd.hyperdeck.loop",
-    ActionKind::Loop
-);
-hyperdeck_key!(
-    SingleClipAction,
-    "dev.mikanseilaboratory.bmd.hyperdeck.singleclip",
-    ActionKind::SingleClip
-);
 hyperdeck_key!(
     SlotAction,
     "dev.mikanseilaboratory.bmd.hyperdeck.slot",
@@ -461,8 +442,6 @@ pub fn force_link() {
         std::any::TypeId::of::<RecordAction>(),
         std::any::TypeId::of::<StopAction>(),
         std::any::TypeId::of::<PreviewAction>(),
-        std::any::TypeId::of::<LoopAction>(),
-        std::any::TypeId::of::<SingleClipAction>(),
         std::any::TypeId::of::<SlotAction>(),
         std::any::TypeId::of::<ClipAction>(),
         std::any::TypeId::of::<PlayRangeAction>(),

crates/hyperdeck-plugin/src/contracts.rs

@@ -25,6 +25,8 @@ pub struct InstanceConfig {
     pub username: String,
     #[serde(default)]
     pub password: String,
+    #[serde(default = "default_update_interval_ms")]
+    pub update_interval_ms: u32,
 }
 
 fn default_host() -> String {
@@ -43,6 +45,10 @@ fn default_true() -> bool {
     true
 }
 
+fn default_update_interval_ms() -> u32 {
+    hyperdeck_pool::DEFAULT_UPDATE_INTERVAL_MS
+}
+
 impl From<InstanceConfig> for HyperDeckInstanceConfig {
     fn from(value: InstanceConfig) -> Self {
         Self {
@@ -54,6 +60,7 @@ impl From<InstanceConfig> for HyperDeckInstanceConfig {
             enabled: value.enabled,
             username: value.username,
             password: value.password,
+            update_interval_ms: value.update_interval_ms,
         }
     }
 }
@@ -115,6 +122,7 @@ pub fn localhost_instance() -> InstanceConfig {
         enabled: true,
         username: String::new(),
         password: String::new(),
+        update_interval_ms: default_update_interval_ms(),
     }
 }
 
@@ -225,6 +233,8 @@ pub struct ActionParams {
     pub threshold_seconds: u32,
     #[serde(default = "default_status_field")]
     pub status_field: String,
+    #[serde(default = "default_time_basis")]
+    pub time_basis: String,
     #[serde(default)]
     pub raw: String,
     #[serde(default)]
@@ -234,8 +244,6 @@ pub struct ActionParams {
     #[serde(default)]
     pub raw_push: String,
     #[serde(default)]
-    pub raw_touch: String,
-    #[serde(default)]
     pub step: i32,
     #[serde(default = "default_direction")]
     pub direction: String,
@@ -273,6 +281,10 @@ fn default_status_field() -> String {
     "status".into()
 }
 
+fn default_time_basis() -> String {
+    "clip".into()
+}
+
 fn default_goto() -> String {
     "timeline-start".into()
 }
@@ -305,11 +317,11 @@ impl Default for ActionParams {
             value: String::new(),
             threshold_seconds: default_threshold(),
             status_field: default_status_field(),
+            time_basis: default_time_basis(),
             raw: String::new(),
             raw_rotate_up: String::new(),
             raw_rotate_down: String::new(),
             raw_push: String::new(),
-            raw_touch: String::new(),
             step: 0,
             direction: default_direction(),
             active_color: String::new(),

crates/hyperdeck-plugin/src/kind.rs

@@ -5,8 +5,6 @@ pub enum ActionKind {
     Record,
     Stop,
     Preview,
-    Loop,
-    SingleClip,
     Slot,
     Clip,
     PlayRange,
@@ -62,8 +60,6 @@ impl ActionKind {
             Self::Record => "dev.mikanseilaboratory.bmd.hyperdeck.record",
             Self::Stop => "dev.mikanseilaboratory.bmd.hyperdeck.stop",
             Self::Preview => "dev.mikanseilaboratory.bmd.hyperdeck.preview",
-            Self::Loop => "dev.mikanseilaboratory.bmd.hyperdeck.loop",
-            Self::SingleClip => "dev.mikanseilaboratory.bmd.hyperdeck.singleclip",
             Self::Slot => "dev.mikanseilaboratory.bmd.hyperdeck.slot",
             Self::Clip => "dev.mikanseilaboratory.bmd.hyperdeck.clip",
             Self::PlayRange => "dev.mikanseilaboratory.bmd.hyperdeck.playrange",