ok

src/state/audio.rs

@@ -119,22 +119,44 @@ impl ListSelectState {
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, Default)]
-pub enum AudioFocus {
+pub enum EngineSection {
+    #[default]
+    Devices,
+    Settings,
+    Samples,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+pub enum DeviceKind {
+    #[default]
+    Output,
+    Input,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+pub enum SettingKind {
     #[default]
-    OutputDevice,
-    InputDevice,
     Channels,
     BufferSize,
     Polyphony,
-    RefreshRate,
-    RuntimeHighlight,
-    ShowScope,
-    ShowSpectrum,
-    ShowCompletion,
-    SamplePaths,
-    LinkEnabled,
-    StartStopSync,
-    Quantum,
+}
+
+impl SettingKind {
+    pub fn next(self) -> Self {
+        match self {
+            Self::Channels => Self::BufferSize,
+            Self::BufferSize => Self::Polyphony,
+            Self::Polyphony => Self::Channels,
+        }
+    }
+
+    pub fn prev(self) -> Self {
+        match self {
+            Self::Channels => Self::Polyphony,
+            Self::BufferSize => Self::Channels,
+            Self::Polyphony => Self::BufferSize,
+        }
+    }
 }
 
 pub struct Metrics {
@@ -169,7 +191,9 @@ impl Default for Metrics {
 
 pub struct AudioSettings {
     pub config: AudioConfig,
-    pub focus: AudioFocus,
+    pub section: EngineSection,
+    pub device_kind: DeviceKind,
+    pub setting_kind: SettingKind,
     pub output_devices: Vec<AudioDeviceInfo>,
     pub input_devices: Vec<AudioDeviceInfo>,
     pub output_list: ListSelectState,
@@ -182,7 +206,9 @@ impl Default for AudioSettings {
     fn default() -> Self {
         Self {
             config: AudioConfig::default(),
-            focus: AudioFocus::default(),
+            section: EngineSection::default(),
+            device_kind: DeviceKind::default(),
+            setting_kind: SettingKind::default(),
             output_devices: doux::audio::list_output_devices(),
             input_devices: doux::audio::list_input_devices(),
             output_list: ListSelectState { cursor: 0, scroll_offset: 0 },
@@ -199,41 +225,19 @@ impl AudioSettings {
         self.input_devices = doux::audio::list_input_devices();
     }
 
-    pub fn next_focus(&mut self) {
-        self.focus = match self.focus {
-            AudioFocus::OutputDevice => AudioFocus::InputDevice,
-            AudioFocus::InputDevice => AudioFocus::Channels,
-            AudioFocus::Channels => AudioFocus::BufferSize,
-            AudioFocus::BufferSize => AudioFocus::Polyphony,
-            AudioFocus::Polyphony => AudioFocus::RefreshRate,
-            AudioFocus::RefreshRate => AudioFocus::RuntimeHighlight,
-            AudioFocus::RuntimeHighlight => AudioFocus::ShowScope,
-            AudioFocus::ShowScope => AudioFocus::ShowSpectrum,
-            AudioFocus::ShowSpectrum => AudioFocus::ShowCompletion,
-            AudioFocus::ShowCompletion => AudioFocus::SamplePaths,
-            AudioFocus::SamplePaths => AudioFocus::LinkEnabled,
-            AudioFocus::LinkEnabled => AudioFocus::StartStopSync,
-            AudioFocus::StartStopSync => AudioFocus::Quantum,
-            AudioFocus::Quantum => AudioFocus::OutputDevice,
+    pub fn next_section(&mut self) {
+        self.section = match self.section {
+            EngineSection::Devices => EngineSection::Settings,
+            EngineSection::Settings => EngineSection::Samples,
+            EngineSection::Samples => EngineSection::Devices,
         };
     }
 
-    pub fn prev_focus(&mut self) {
-        self.focus = match self.focus {
-            AudioFocus::OutputDevice => AudioFocus::Quantum,
-            AudioFocus::InputDevice => AudioFocus::OutputDevice,
-            AudioFocus::Channels => AudioFocus::InputDevice,
-            AudioFocus::BufferSize => AudioFocus::Channels,
-            AudioFocus::Polyphony => AudioFocus::BufferSize,
-            AudioFocus::RefreshRate => AudioFocus::Polyphony,
-            AudioFocus::RuntimeHighlight => AudioFocus::RefreshRate,
-            AudioFocus::ShowScope => AudioFocus::RuntimeHighlight,
-            AudioFocus::ShowSpectrum => AudioFocus::ShowScope,
-            AudioFocus::ShowCompletion => AudioFocus::ShowSpectrum,
-            AudioFocus::SamplePaths => AudioFocus::ShowCompletion,
-            AudioFocus::LinkEnabled => AudioFocus::SamplePaths,
-            AudioFocus::StartStopSync => AudioFocus::LinkEnabled,
-            AudioFocus::Quantum => AudioFocus::StartStopSync,
+    pub fn prev_section(&mut self) {
+        self.section = match self.section {
+            EngineSection::Devices => EngineSection::Samples,
+            EngineSection::Settings => EngineSection::Devices,
+            EngineSection::Samples => EngineSection::Settings,
         };
     }
 

src/state/mod.rs

@@ -3,6 +3,7 @@ pub mod editor;
 pub mod file_browser;
 pub mod live_keys;
 pub mod modal;
+pub mod options;
 pub mod panel;
 pub mod patterns_nav;
 pub mod playback;
@@ -10,7 +11,8 @@ pub mod project;
 pub mod sample_browser;
 pub mod ui;
 
-pub use audio::{AudioFocus, AudioSettings, Metrics};
+pub use audio::{AudioSettings, DeviceKind, EngineSection, Metrics, SettingKind};
+pub use options::{OptionsFocus, OptionsState};
 pub use editor::{CopiedStep, EditorContext, Focus, PatternField};
 pub use live_keys::LiveKeyState;
 pub use modal::Modal;

src/state/options.rs

@@ -0,0 +1,45 @@
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+pub enum OptionsFocus {
+    #[default]
+    RefreshRate,
+    RuntimeHighlight,
+    ShowScope,
+    ShowSpectrum,
+    ShowCompletion,
+    LinkEnabled,
+    StartStopSync,
+    Quantum,
+}
+
+#[derive(Default)]
+pub struct OptionsState {
+    pub focus: OptionsFocus,
+}
+
+impl OptionsState {
+    pub fn next_focus(&mut self) {
+        self.focus = match self.focus {
+            OptionsFocus::RefreshRate => OptionsFocus::RuntimeHighlight,
+            OptionsFocus::RuntimeHighlight => OptionsFocus::ShowScope,
+            OptionsFocus::ShowScope => OptionsFocus::ShowSpectrum,
+            OptionsFocus::ShowSpectrum => OptionsFocus::ShowCompletion,
+            OptionsFocus::ShowCompletion => OptionsFocus::LinkEnabled,
+            OptionsFocus::LinkEnabled => OptionsFocus::StartStopSync,
+            OptionsFocus::StartStopSync => OptionsFocus::Quantum,
+            OptionsFocus::Quantum => OptionsFocus::RefreshRate,
+        };
+    }
+
+    pub fn prev_focus(&mut self) {
+        self.focus = match self.focus {
+            OptionsFocus::RefreshRate => OptionsFocus::Quantum,
+            OptionsFocus::RuntimeHighlight => OptionsFocus::RefreshRate,
+            OptionsFocus::ShowScope => OptionsFocus::RuntimeHighlight,
+            OptionsFocus::ShowSpectrum => OptionsFocus::ShowScope,
+            OptionsFocus::ShowCompletion => OptionsFocus::ShowSpectrum,
+            OptionsFocus::LinkEnabled => OptionsFocus::ShowCompletion,
+            OptionsFocus::StartStopSync => OptionsFocus::LinkEnabled,
+            OptionsFocus::Quantum => OptionsFocus::StartStopSync,
+        };
+    }
+}