This commit is contained in:
Kenny Levinsen
2019-10-02 16:25:43 +02:00
parent 29252cbbc6
commit c676c0223b
3 changed files with 12 additions and 14 deletions
+7 -7
View File
@@ -48,16 +48,16 @@ pub enum Widget {
font_size: f32,
length: u32,
},
#[cfg(feature="pulseaudio-widget")]
#[cfg(feature = "pulseaudio-widget")]
PulseAudio {
font_size: f32,
length: u32,
},
#[cfg(feature="alsa-widget")]
#[cfg(feature = "alsa-widget")]
AlsaSound {
font_size: f32,
length: u32
}
length: u32,
},
}
impl Widget {
@@ -127,14 +127,14 @@ impl Widget {
Err(_) => None,
}
}
#[cfg(feature="pulseaudio-widget")]
#[cfg(feature = "pulseaudio-widget")]
Widget::PulseAudio { font_size, length } => {
match widgets::audio::PulseAudio::new(font_size, length, tx.clone()) {
Ok(w) => Some(w),
Err(_) => None,
}
}
#[cfg(feature="alsa-widget")]
#[cfg(feature = "alsa-widget")]
Widget::AlsaSound { font_size, length } => {
match widgets::audio::Alsa::new(font_size, length) {
Ok(w) => Some(w),
@@ -196,7 +196,7 @@ impl Default for Config {
length: 600,
}),
}),
#[cfg(feature="pulseaudio-widget")]
#[cfg(feature = "pulseaudio-widget")]
Box::new(Widget::Margin {
margins: (0, 0, 0, 8),
widget: Box::new(Widget::PulseAudio {
+4 -6
View File
@@ -1,11 +1,9 @@
#[cfg(feature="alsa-widget")]
#[cfg(feature = "alsa-widget")]
mod alsa_sound;
#[cfg(feature="alsa-widget")]
#[cfg(feature = "alsa-widget")]
pub use alsa_sound::Alsa;
#[cfg(feature="pulseaudio-widget")]
#[cfg(feature = "pulseaudio-widget")]
mod pulse_sound;
#[cfg(feature="pulseaudio-widget")]
#[cfg(feature = "pulseaudio-widget")]
pub use pulse_sound::PulseAudio;
+1 -1
View File
@@ -6,5 +6,5 @@ pub mod clock;
pub mod date;
pub mod launcher;
#[cfg(any(feature="alsa-widget", feature="pulseaudio-widget"))]
#[cfg(any(feature = "alsa-widget", feature = "pulseaudio-widget"))]
pub mod audio;