unstable modification
This commit is contained in:
@@ -18,7 +18,7 @@ use crate::{
|
|||||||
response::map_response,
|
response::map_response,
|
||||||
},
|
},
|
||||||
protocol::{commands, config::decode_config, frame::extract_frame},
|
protocol::{commands, config::decode_config, frame::extract_frame},
|
||||||
types,
|
types::{self, DSPMode},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -32,9 +32,9 @@ fn instances() -> &'static Mutex<HashMap<(IpAddr, u8), ()>> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub struct DSP408 {
|
pub struct DSP408 {
|
||||||
mode: types::DSPMode,
|
|
||||||
connection: types::DeviceConnection,
|
connection: types::DeviceConnection,
|
||||||
socket: Arc<Mutex<Option<TcpStream>>>,
|
socket: Arc<Mutex<Option<TcpStream>>>,
|
||||||
|
mode: DSPMode,
|
||||||
state: types::DSPState,
|
state: types::DSPState,
|
||||||
input_meters: types::InputMeters,
|
input_meters: types::InputMeters,
|
||||||
output_meters: types::OutputMeters,
|
output_meters: types::OutputMeters,
|
||||||
|
|||||||
@@ -17,11 +17,13 @@ pub fn default_dsp_state() -> DSPState {
|
|||||||
DSPState {
|
DSPState {
|
||||||
name: "Default".to_string(),
|
name: "Default".to_string(),
|
||||||
|
|
||||||
flags: DeviceFlags { is_locked: false },
|
flags: DeviceFlags { is_locked: true },
|
||||||
|
|
||||||
presets: default_preset_bank(),
|
presets: default_preset_bank(),
|
||||||
|
|
||||||
current_config: default_config(),
|
current_config: default_config(),
|
||||||
|
|
||||||
|
mode: super::types::DSPMode::Disconnected,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+13
-8
@@ -398,6 +398,18 @@ impl DSPConfigState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum DSPMode {
|
||||||
|
Demo,
|
||||||
|
Normal,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum ConnectionStatus {
|
||||||
|
Connected,
|
||||||
|
Disconnected,
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "serialization", derive(Serialize, Deserialize))]
|
#[cfg_attr(feature = "serialization", derive(Serialize, Deserialize))]
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
pub struct DSPState {
|
pub struct DSPState {
|
||||||
@@ -405,14 +417,7 @@ pub struct DSPState {
|
|||||||
pub(crate) flags: DeviceFlags,
|
pub(crate) flags: DeviceFlags,
|
||||||
pub(crate) presets: PresetBank,
|
pub(crate) presets: PresetBank,
|
||||||
pub(crate) current_config: DSPConfigState,
|
pub(crate) current_config: DSPConfigState,
|
||||||
}
|
pub(crate) connection: ConnectionStatus,
|
||||||
|
|
||||||
#[cfg_attr(feature = "serialization", derive(Serialize, Deserialize))]
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
||||||
pub enum DSPMode {
|
|
||||||
Demo,
|
|
||||||
Disconnected,
|
|
||||||
Connected,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "serialization", derive(Serialize, Deserialize))]
|
#[cfg_attr(feature = "serialization", derive(Serialize, Deserialize))]
|
||||||
|
|||||||
Reference in New Issue
Block a user