refactor: rework choice_enum macro

Signed-off-by: Maika Namuo <httpworldview@gmail.com>

Author: httpsworldview

src/infra/pipewire/registry/types.rs

@@ -16,7 +16,6 @@ pub(super) fn dict_to_map(dict: Option<&DictRef>) -> HashMap<String, String> {
 }
 
 crate::macros::choice_enum!(no_default all
-    #[derive(Hash)]
     pub enum AudioChannel {
         FrontLeft => "FL", FrontRight => "FR", FrontCenter => "FC", LowFrequency => "LFE",
         RearLeft => "RL", RearRight => "RR", SideLeft => "SL", SideRight => "SR", Mono => "MONO",
@@ -32,11 +31,13 @@ impl AudioChannel {
     }
 }
 
-crate::macros::choice_enum!(pub enum PortDirection {
-    Input => "Input",
-    Output => "Output",
-    #[default] Unknown => "Unknown",
-});
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum PortDirection {
+    Input,
+    Output,
+    #[default]
+    Unknown,
+}
 
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct GraphPort {
@@ -70,11 +71,13 @@ impl GraphPort {
     }
 }
 
-crate::macros::choice_enum!(pub enum NodeDirection {
-    Input => "Input",
-    Output => "Output",
-    #[default] Unknown => "Unknown",
-});
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum NodeDirection {
+    Input,
+    Output,
+    #[default]
+    Unknown,
+}
 
 fn derive_node_direction(
     media_class: Option<&str>,

src/macros.rs

@@ -2,7 +2,13 @@
 // Copyright (C) 2026 Maika Namuo
 
 macro_rules! choice_enum {
-    (@build [$($default:ident)?] $(#[$attr:meta])* $vis:vis enum $name:ident { $($(#[$var_attr:meta])* $variant:ident => $label:expr),+ $(,)? }) => {
+    (@parse [$($default:ident)?] [$($all:ident)?] no_default $($rest:tt)+) => {
+        $crate::macros::choice_enum!(@parse [] [$($all)?] $($rest)+);
+    };
+    (@parse [$($default:ident)?] [$($all:ident)?] all $($rest:tt)+) => {
+        $crate::macros::choice_enum!(@parse [$($default)?] [all] $($rest)+);
+    };
+    (@parse [$($default:ident)?] [$($all:ident)?] $(#[$attr:meta])* $vis:vis enum $name:ident { $($(#[$var_attr:meta])* $variant:ident => $label:expr),+ $(,)? }) => {
         #[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, PartialEq, Eq $(, $default)?)]
         #[serde(rename_all = "snake_case")]
         $(#[$attr])*
@@ -15,15 +21,14 @@ macro_rules! choice_enum {
         impl std::fmt::Display for $name {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.write_str(self.label()) }
         }
+
+        $crate::macros::choice_enum!(@all [$($all)?] $name { $($variant,)+ });
     };
-    (@build_all [$($default:ident)?] $(#[$attr:meta])* $vis:vis enum $name:ident { $($(#[$var_attr:meta])* $variant:ident => $label:expr),+ $(,)? }) => {
-        $crate::macros::choice_enum!(@build [$($default)?] $(#[$attr])* $vis enum $name { $($(#[$var_attr])* $variant => $label,)+ });
+    (@all [] $($rest:tt)*) => {};
+    (@all [all] $name:ident { $($variant:ident,)+ }) => {
         impl $name { pub const ALL: &'static [Self] = &[$(Self::$variant,)+]; }
     };
-    (no_default all $($rest:tt)+) => { $crate::macros::choice_enum!(@build_all [] $($rest)+); };
-    (all $($rest:tt)+) => { $crate::macros::choice_enum!(@build_all [Default] $($rest)+); };
-    (no_default $($rest:tt)+) => { $crate::macros::choice_enum!(@build [] $($rest)+); };
-    ($($rest:tt)+) => { $crate::macros::choice_enum!(@build [Default] $($rest)+); };
+    ($($rest:tt)+) => { $crate::macros::choice_enum!(@parse [Default] [] $($rest)+); };
 }
 
 pub(super) use choice_enum;

src/ui/settings/spectrum.rs

@@ -24,9 +24,9 @@ const BARS_R: SliderRange = SliderRange::new(8.0, 128.0, 1.0);
 const GAP_R: SliderRange = SliderRange::new(0.0, 0.8, 0.05);
 const HIGH_R: SliderRange = SliderRange::new(0.0, 0.9, 0.01);
 const FLOOR_R: SliderRange = SliderRange::new(MIN_SPECTRUM_DB_FLOOR, MAX_SPECTRUM_DB_FLOOR, 1.0);
-crate::macros::choice_enum!(all pub(in crate::ui) enum AvgMode {
+crate::macros::choice_enum!(no_default all pub(in crate::ui) enum AvgMode {
     None => "None",
-    #[default] Exponential => "Exponential",
+    Exponential => "Exponential",
     PeakHold => "Peak hold",
 });
 

src/util/audio/channel.rs

@@ -3,8 +3,7 @@
 
 use std::collections::VecDeque;
 
-crate::macros::choice_enum!(all pub enum Channel {
-    #[default]
+crate::macros::choice_enum!(no_default all pub enum Channel {
     Left => "Left",
     Right => "Right",
     Mid => "Mid",

src/visuals.rs

@@ -103,8 +103,7 @@ pub mod options {
     crate::macros::choice_enum!(all pub enum CorrelationMeterSide { Left => "Left", #[default] Right => "Right" });
     crate::macros::choice_enum!(all pub enum PianoRollOverlay { #[default] Off => "Off", Right => "Right", Left => "Left" });
 
-    crate::macros::choice_enum!(all pub enum MeterMode {
-        #[default]
+    crate::macros::choice_enum!(no_default all pub enum MeterMode {
         LufsShortTerm => "LUFS Short-term",
         LufsMomentary => "LUFS Momentary",
         RmsFast => "RMS Fast",