Add feature flag for build script

mtkennerly · Dec 10, 2024 · 8ac9b6b · 8ac9b6b
1 parent 46a9fc8
commit 8ac9b6b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 42 deletions.
diff --git a/build.rs b/build.rs
@@ -15,7 +15,7 @@ fn main() {
     }
 
     // https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1516
-    #[cfg(target_os = "macos")]
+    #[cfg(all(feature = "video", target_os = "macos"))]
     match system_deps::Config::new().probe() {
         Ok(deps) => {
             let usr = std::path::Path::new("/usr/lib");

diff --git a/src/gui/modal.rs b/src/gui/modal.rs
@@ -534,7 +534,7 @@ impl Modal {
                             .orientation_limit
                             .current()
                             .parse::<NonZeroUsize>()
-                            .unwrap_or(playlist::OrientationLimit::DEFAULT_FIXED);
+                            .unwrap_or(playlist::OrientationLimit::default_fixed());
                         settings.orientation_limit = playlist::OrientationLimit::Fixed(limit);
                     } else {
                         settings.orientation_limit = playlist::OrientationLimit::Automatic;

diff --git a/src/gui/player.rs b/src/gui/player.rs
@@ -728,44 +728,37 @@ impl Player {
 
     #[cfg(feature = "audio")]
     pub fn reload_audio(&mut self, playback: &Playback) {
-        match self {
-            Self::Idle => {}
-            Self::Error { .. } => {}
-            Self::Image { .. } => {}
-            Self::Svg { .. } => {}
-            Self::Gif { .. } => {}
-            Self::Audio {
-                media,
-                stream: _,
-                sink,
-                duration: _,
-                looping,
-                dragging,
-                hovered,
-                need_play_on_focus,
-            } => {
-                let playback = playback.with_paused(sink.is_paused()).with_muted(sink.volume() == 0.0);
-                let position = sink.get_pos();
-
-                *self = match Self::load_audio(media.path(), &playback, position) {
-                    Ok((stream, sink, duration)) => Self::Audio {
-                        media: media.clone(),
-                        stream,
-                        sink,
-                        duration,
-                        looping: *looping,
-                        dragging: *dragging,
-                        hovered: *hovered,
-                        need_play_on_focus: *need_play_on_focus,
-                    },
-                    Err(e) => Self::Error {
-                        media: media.clone(),
-                        message: e.message(),
-                        hovered: false,
-                    },
-                };
-            }
-            Self::Video { .. } => {}
+        if let Self::Audio {
+            media,
+            stream: _,
+            sink,
+            duration: _,
+            looping,
+            dragging,
+            hovered,
+            need_play_on_focus,
+        } = self
+        {
+            let playback = playback.with_paused(sink.is_paused()).with_muted(sink.volume() == 0.0);
+            let position = sink.get_pos();
+
+            *self = match Self::load_audio(media.path(), &playback, position) {
+                Ok((stream, sink, duration)) => Self::Audio {
+                    media: media.clone(),
+                    stream,
+                    sink,
+                    duration,
+                    looping: *looping,
+                    dragging: *dragging,
+                    hovered: *hovered,
+                    need_play_on_focus: *need_play_on_focus,
+                },
+                Err(e) => Self::Error {
+                    media: media.clone(),
+                    message: e.message(),
+                    hovered: false,
+                },
+            };
         }
     }
 

diff --git a/src/resource/playlist.rs b/src/resource/playlist.rs
@@ -146,7 +146,7 @@ pub enum Orientation {
 }
 
 impl Orientation {
-    pub const ALL: &[Self] = &[Self::Horizontal, Self::Vertical];
+    pub const ALL: &'static [Self] = &[Self::Horizontal, Self::Vertical];
 }
 
 impl ToString for Orientation {
@@ -166,7 +166,11 @@ pub enum OrientationLimit {
 }
 
 impl OrientationLimit {
-    pub const DEFAULT_FIXED: NonZeroUsize = NonZeroUsize::new(4).unwrap();
+    pub const DEFAULT_FIXED: usize = 4;
+
+    pub fn default_fixed() -> NonZeroUsize {
+        NonZeroUsize::new(Self::DEFAULT_FIXED).unwrap()
+    }
 
     pub fn is_fixed(&self) -> bool {
         match self {