Add ALSA widget (#18)

Add initial ALSA widget, and put both ALSA and PulseAudio behind feature flags.
This commit is contained in:
Sergey Smirnykh
2019-09-18 11:19:10 +02:00
committed by Kenny Levinsen
parent 4e9f0e566f
commit 1ae11bab29
7 changed files with 176 additions and 3 deletions
+16 -1
View File
@@ -48,10 +48,16 @@ pub enum Widget {
font_size: f32,
length: u32,
},
#[cfg(feature="pulseaudio-widget")]
PulseAudio {
font_size: f32,
length: u32,
},
#[cfg(feature="alsa-widget")]
AlsaSound {
font_size: f32,
length: u32
}
}
impl Widget {
@@ -121,8 +127,16 @@ impl Widget {
Err(_) => None,
}
}
#[cfg(feature="pulseaudio-widget")]
Widget::PulseAudio { font_size, length } => {
match widgets::sound::PulseAudio::new(font_size, length, tx.clone()) {
match widgets::audio::PulseAudio::new(font_size, length, tx.clone()) {
Ok(w) => Some(w),
Err(_) => None,
}
}
#[cfg(feature="alsa-widget")]
Widget::AlsaSound { font_size, length } => {
match widgets::audio::Alsa::new(font_size, length) {
Ok(w) => Some(w),
Err(_) => None,
}
@@ -182,6 +196,7 @@ impl Default for Config {
length: 600,
}),
}),
#[cfg(feature="pulseaudio-widget")]
Box::new(Widget::Margin {
margins: (0, 0, 0, 8),
widget: Box::new(Widget::PulseAudio {