refactor: reorder tauri commands and highlight missing

src-tauri/src/commands.rs

@@ -109,18 +109,6 @@ pub async fn get_dsp_snapshot(
     })
 }
 
-#[tauri::command]
-pub async fn connect_dsp408(state: State<'_, AppState>, id: u64) -> Result<(), String> {
-    state.with_device_mut(id, |device| device.dsp.connect().map_err(|e| e.to_string()))
-}
-
-#[tauri::command]
-pub async fn disconnect_dsp408(state: State<'_, AppState>, id: u64) -> Result<(), String> {
-    state.with_device_mut(id, |device| {
-        device.dsp.disconnect().map_err(|e| e.to_string())
-    })
-}
-
 #[tauri::command]
 pub async fn get_dsp_state(
     state: State<'_, AppState>,
@@ -133,57 +121,33 @@ pub async fn get_dsp_state(
     })
 }
 
+// Commands
 #[tauri::command]
-pub async fn set_channel_gain(
-    state: State<'_, AppState>,
-    id: u64,
-    channel: dsp_thomann::dsp408::types::Channel,
-    db: f32,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        let r = device
-            .dsp
-            .set_channel_gain(channel, db)
-            .map_err(|e| e.to_string())?;
+pub async fn connect_dsp408(state: State<'_, AppState>, id: u64) -> Result<(), String> {
+    state.with_device_mut(id, |device| device.dsp.connect().map_err(|e| e.to_string()))
+}
 
-        Ok(r)
+// Command `0x11`
+#[tauri::command]
+pub async fn disconnect_dsp408(state: State<'_, AppState>, id: u64) -> Result<(), String> {
+    state.with_device_mut(id, |device| {
+        device.dsp.disconnect().map_err(|e| e.to_string())
     })
 }
 
+// Command `0x15`
 #[tauri::command]
-pub async fn set_mute(
+pub async fn set_delay_unit(
     state: State<'_, AppState>,
     id: u64,
-    channel: dsp_thomann::dsp408::types::Channel,
-    muted: bool,
+    unit: types::DelayUnit,
 ) -> Result<bool, String> {
     state.with_device_mut(id, |device| {
-        let r = device
-            .dsp
-            .set_mute(channel, muted)
-            .map_err(|e| e.to_string())?;
-
-        Ok(r)
-    })
-}
-
-#[tauri::command]
-pub async fn set_channel_inverse_gain(
-    state: State<'_, AppState>,
-    id: u64,
-    channel: dsp_thomann::dsp408::types::Channel,
-    inverted: bool,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        let r = device
-            .dsp
-            .set_channel_inverse_gain(channel, inverted)
-            .map_err(|e| e.to_string())?;
-
-        Ok(r)
+        device.dsp.set_delay_unit(unit).map_err(|e| e.to_string())
     })
 }
 
+// Command `0x20`
 #[tauri::command]
 pub async fn recall_preset(
     state: State<'_, AppState>,
@@ -200,16 +164,35 @@ pub async fn recall_preset(
     })
 }
 
+// Command `0x21`
 #[tauri::command]
-pub async fn get_meter_levels(
+pub async fn store_current_configuration(
     state: State<'_, AppState>,
     id: u64,
-) -> Result<(types::InputMeters, types::OutputMeters), String> {
+    preset_index: usize,
+    force: bool,
+) -> Result<bool, String> {
     state.with_device_mut(id, |device| {
-        device.dsp.get_meter_levels().map_err(|e| e.to_string())
+        device
+            .dsp
+            .store_current_configuration(preset_index, force)
+            .map_err(|e| e.to_string())
     })
 }
 
+// Command `0x23`
+#[tauri::command]
+pub async fn factory_reset(
+    state: State<'_, AppState>,
+    id: u64,
+    force: bool,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        device.dsp.factory_reset(force).map_err(|e| e.to_string())
+    })
+}
+
+// Command `0x26`
 #[tauri::command]
 pub async fn set_current_preset_name(
     state: State<'_, AppState>,
@@ -224,24 +207,26 @@ pub async fn set_current_preset_name(
     })
 }
 
+// Command `0x2A`
 #[tauri::command]
-pub async fn set_gate(
+pub async fn copy_channel(
     state: State<'_, AppState>,
     id: u64,
-    channel: types::InputChannel,
-    threshold: f32,
-    attack: u16,
-    hold: u16,
-    release: u16,
+    channel_1: types::Channel,
+    channel_2: types::Channel,
 ) -> Result<bool, String> {
     state.with_device_mut(id, |device| {
         device
             .dsp
-            .set_gate(channel, threshold, attack, hold, release)
+            .copy_channel(channel_1, channel_2)
             .map_err(|e| e.to_string())
     })
 }
 
+// Command `0x2D`
+// Command `0x2F`
+
+// Command `0x30`
 #[tauri::command]
 pub async fn set_compressor(
     state: State<'_, AppState>,
@@ -261,112 +246,7 @@ pub async fn set_compressor(
     })
 }
 
-#[tauri::command]
-pub async fn set_limiter(
-    state: State<'_, AppState>,
-    id: u64,
-    channel: types::OutputChannel,
-    threshold: f32,
-    attack: u16,
-    release: u16,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device
-            .dsp
-            .set_limiter(channel, threshold, attack, release)
-            .map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn set_delay_unit(
-    state: State<'_, AppState>,
-    id: u64,
-    unit: types::DelayUnit,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device.dsp.set_delay_unit(unit).map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn set_delay(
-    state: State<'_, AppState>,
-    id: u64,
-    channel: types::Channel,
-    delay: f32,
-    unit: DelayUnit,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device
-            .dsp
-            .set_delay(channel, delay, unit)
-            .map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn set_matrix_routing(
-    state: State<'_, AppState>,
-    id: u64,
-    output: types::OutputChannel,
-    inputs: Vec<types::InputChannel>,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device
-            .dsp
-            .set_matrix_routing(output, inputs)
-            .map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn set_matrix_gain(
-    state: State<'_, AppState>,
-    id: u64,
-    input_channel: types::InputChannel,
-    output_channel: types::OutputChannel,
-    gain: f32,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device
-            .dsp
-            .set_matrix_gain(input_channel, output_channel, gain)
-            .map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn set_geq_band(
-    state: State<'_, AppState>,
-    id: u64,
-    input_channel: types::InputChannel,
-    frequency_band: types::DiscreteFrequency,
-    gain: f32,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device
-            .dsp
-            .set_geq_band(input_channel, frequency_band, gain)
-            .map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn set_geq_bypass(
-    state: State<'_, AppState>,
-    id: u64,
-    input_channel: types::InputChannel,
-    bypass: bool,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device
-            .dsp
-            .set_geq_bypass(input_channel, bypass)
-            .map_err(|e| e.to_string())
-    })
-}
-
+// Command `0x31`
 #[tauri::command]
 pub async fn set_low_pass(
     state: State<'_, AppState>,
@@ -383,6 +263,7 @@ pub async fn set_low_pass(
     })
 }
 
+// Command `0x32`
 #[tauri::command]
 pub async fn set_high_pass(
     state: State<'_, AppState>,
@@ -399,6 +280,7 @@ pub async fn set_high_pass(
     })
 }
 
+// Command `0x33`
 #[tauri::command]
 pub async fn set_peq_band(
     state: State<'_, AppState>,
@@ -419,47 +301,78 @@ pub async fn set_peq_band(
     })
 }
 
+// Command `0x34`
 #[tauri::command]
-pub async fn store_current_configuration(
+pub async fn set_channel_gain(
     state: State<'_, AppState>,
     id: u64,
-    preset_index: usize,
-    force: bool,
+    channel: dsp_thomann::dsp408::types::Channel,
+    db: f32,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        let r = device
+            .dsp
+            .set_channel_gain(channel, db)
+            .map_err(|e| e.to_string())?;
+
+        Ok(r)
+    })
+}
+
+// Command `0x35`
+#[tauri::command]
+pub async fn set_mute(
+    state: State<'_, AppState>,
+    id: u64,
+    channel: dsp_thomann::dsp408::types::Channel,
+    muted: bool,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        let r = device
+            .dsp
+            .set_mute(channel, muted)
+            .map_err(|e| e.to_string())?;
+
+        Ok(r)
+    })
+}
+
+// Command `0x36`
+#[tauri::command]
+pub async fn set_channel_inverse_gain(
+    state: State<'_, AppState>,
+    id: u64,
+    channel: dsp_thomann::dsp408::types::Channel,
+    inverted: bool,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        let r = device
+            .dsp
+            .set_channel_inverse_gain(channel, inverted)
+            .map_err(|e| e.to_string())?;
+
+        Ok(r)
+    })
+}
+
+// Command `0x38`
+#[tauri::command]
+pub async fn set_delay(
+    state: State<'_, AppState>,
+    id: u64,
+    channel: types::Channel,
+    delay: f32,
+    unit: DelayUnit,
 ) -> Result<bool, String> {
     state.with_device_mut(id, |device| {
         device
             .dsp
-            .store_current_configuration(preset_index, force)
-            .map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn factory_reset(
-    state: State<'_, AppState>,
-    id: u64,
-    force: bool,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device.dsp.factory_reset(force).map_err(|e| e.to_string())
-    })
-}
-
-#[tauri::command]
-pub async fn copy_channel(
-    state: State<'_, AppState>,
-    id: u64,
-    channel_1: types::Channel,
-    channel_2: types::Channel,
-) -> Result<bool, String> {
-    state.with_device_mut(id, |device| {
-        device
-            .dsp
-            .copy_channel(channel_1, channel_2)
+            .set_delay(channel, delay, unit)
             .map_err(|e| e.to_string())
     })
 }
 
+// Command `0x39`
 #[tauri::command]
 pub async fn set_input_source(
     state: State<'_, AppState>,
@@ -474,6 +387,23 @@ pub async fn set_input_source(
     })
 }
 
+// Command `0x3A`
+#[tauri::command]
+pub async fn set_matrix_routing(
+    state: State<'_, AppState>,
+    id: u64,
+    output: types::OutputChannel,
+    inputs: Vec<types::InputChannel>,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        device
+            .dsp
+            .set_matrix_routing(output, inputs)
+            .map_err(|e| e.to_string())
+    })
+}
+
+// Command `0x3B`
 #[tauri::command]
 pub async fn link_channels(
     state: State<'_, AppState>,
@@ -489,6 +419,7 @@ pub async fn link_channels(
     })
 }
 
+// Command `0x3C`
 #[tauri::command]
 pub async fn set_bypass_peq(
     state: State<'_, AppState>,
@@ -504,6 +435,7 @@ pub async fn set_bypass_peq(
     })
 }
 
+// Command `0x3D`
 #[tauri::command]
 pub async fn set_channel_name(
     state: State<'_, AppState>,
@@ -518,3 +450,101 @@ pub async fn set_channel_name(
             .map_err(|e| e.to_string())
     })
 }
+
+// Command `0x3E`
+#[tauri::command]
+pub async fn set_gate(
+    state: State<'_, AppState>,
+    id: u64,
+    channel: types::InputChannel,
+    threshold: f32,
+    attack: u16,
+    hold: u16,
+    release: u16,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        device
+            .dsp
+            .set_gate(channel, threshold, attack, hold, release)
+            .map_err(|e| e.to_string())
+    })
+}
+
+// Command `0x3F`
+#[tauri::command]
+pub async fn set_limiter(
+    state: State<'_, AppState>,
+    id: u64,
+    channel: types::OutputChannel,
+    threshold: f32,
+    attack: u16,
+    release: u16,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        device
+            .dsp
+            .set_limiter(channel, threshold, attack, release)
+            .map_err(|e| e.to_string())
+    })
+}
+
+// Command `0x40`
+#[tauri::command]
+pub async fn get_meter_levels(
+    state: State<'_, AppState>,
+    id: u64,
+) -> Result<(types::InputMeters, types::OutputMeters), String> {
+    state.with_device_mut(id, |device| {
+        device.dsp.get_meter_levels().map_err(|e| e.to_string())
+    })
+}
+
+// Command `0x41`
+#[tauri::command]
+pub async fn set_matrix_gain(
+    state: State<'_, AppState>,
+    id: u64,
+    input_channel: types::InputChannel,
+    output_channel: types::OutputChannel,
+    gain: f32,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        device
+            .dsp
+            .set_matrix_gain(input_channel, output_channel, gain)
+            .map_err(|e| e.to_string())
+    })
+}
+
+// Command `0x48`
+#[tauri::command]
+pub async fn set_geq_band(
+    state: State<'_, AppState>,
+    id: u64,
+    input_channel: types::InputChannel,
+    frequency_band: types::DiscreteFrequency,
+    gain: f32,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        device
+            .dsp
+            .set_geq_band(input_channel, frequency_band, gain)
+            .map_err(|e| e.to_string())
+    })
+}
+
+// Command `0x49`
+#[tauri::command]
+pub async fn set_geq_bypass(
+    state: State<'_, AppState>,
+    id: u64,
+    input_channel: types::InputChannel,
+    bypass: bool,
+) -> Result<bool, String> {
+    state.with_device_mut(id, |device| {
+        device
+            .dsp
+            .set_geq_bypass(input_channel, bypass)
+            .map_err(|e| e.to_string())
+    })
+}