github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve formatting and macro usage in devices list.

Browse source
This commit is contained in:
Will Stott 2019-03-20 13:21:50 +00:00
parent f1be5085ad
commit 5ceb4db9b8
2 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
playback/Cargo.toml
View file

@ -20,11 +20,12 @@ portaudio-rs = { version = "0.3.0", optional = true }
libpulse-sys = { version = "0.0.0", optional = true } libpulse-sys = { version = "0.0.0", optional = true }
jack = { version = "0.5.3", optional = true } jack = { version = "0.5.3", optional = true }
libc = { version = "0.2", optional = true } libc = { version = "0.2", optional = true }
rodio = { git = "https://github.com/tomaka/rodio", optional = true, default-features = false} rodio = { git = "https://github.com/tomaka/rodio", optional = true, default-features = false }
cpal = { version = "*", optional = true }
[features] [features]
alsa-backend = ["alsa"] alsa-backend = ["alsa"]
portaudio-backend = ["portaudio-rs"] portaudio-backend = ["portaudio-rs"]
pulseaudio-backend = ["libpulse-sys", "libc"] pulseaudio-backend = ["libpulse-sys", "libc"]
jackaudio-backend = ["jack"] jackaudio-backend = ["jack"]
rodio-backend = ["rodio"] rodio-backend = ["rodio", "cpal"]

61
playback/src/audio_backend/rodio.rs
View file

@ -1,5 +1,6 @@
use super::{Open, Sink}; use super::{Open, Sink};
extern crate rodio; extern crate rodio;
extern crate cpal;
use std::{io, thread, time}; use std::{io, thread, time};
use std::process::exit; use std::process::exit;
@ -7,35 +8,53 @@ pub struct RodioSink {
rodio_sink: rodio::Sink, rodio_sink: rodio::Sink,
} }
fn list_outputs() { fn list_formats(ref device: &rodio::Device) {
println!("Default Audio Device:\n {:?}", rodio::default_output_device().map(|e| e.name())); let default_fmt = match device.default_output_format() {
Ok(fmt) => cpal::SupportedFormat::from(fmt),
Err(e) => {
info!("Error getting default rodio::Sink format: {:?}", e);
return;
},
};
println!("Available Audio Devices:"); let mut output_formats = match device.supported_output_formats() {
for device in rodio::output_devices() { Ok(f) => f.peekable(),
println!("- {}", device.name()); Err(e) => {
// Output formats info!("Error getting supported rodio::Sink formats: {:?}", e);
if let Ok(fmt) = device.default_output_format() { return;
println!(" Default format:\n {:?}", fmt); },
} };
let mut output_formats = match device.supported_output_formats() {
Ok(f) => f.peekable(), if output_formats.peek().is_some() {
Err(e) => { debug!(" Available formats:");
println!("Error: {:?}", e); for format in output_formats {
continue; let s = format!("{}ch, {:?}, min {:?}, max {:?}", format.channels, format.data_type, format.min_sample_rate, format.max_sample_rate);
}, if format == default_fmt {
}; debug!(" (default) {}", s);
if output_formats.peek().is_some() { } else {
println!(" All formats:"); debug!(" {:?}", format);
for format in output_formats {
println!(" {:?}", format);
} }
} }
} }
} }
fn list_outputs() {
let default_device = rodio::default_output_device().unwrap();
println!("Default Audio Device:\n {}", default_device.name());
list_formats(&default_device);
println!("Other Available Audio Devices:");
for device in rodio::output_devices() {
if device.name() != default_device.name() {
println!(" {}", device.name());
list_formats(&device);
}
}
}
impl Open for RodioSink { impl Open for RodioSink {
fn open(device: Option<String>) -> RodioSink { fn open(device: Option<String>) -> RodioSink {
info!("Using rodio sink"); debug!("Using rodio sink");
let mut rodio_device = rodio::default_output_device().expect("no output device available"); let mut rodio_device = rodio::default_output_device().expect("no output device available");
if device.is_some() { if device.is_some() {