diff options
Diffstat (limited to 'src/utils.rs')
-rw-r--r-- | src/utils.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/utils.rs b/src/utils.rs index 66ccae4..24af366 100644 --- a/src/utils.rs +++ b/src/utils.rs | |||
@@ -1,19 +1,18 @@ | |||
1 | use ::{Filter, NoEqualizedSink}; | 1 | use {Filter, NoEqualizedSink}; |
2 | 2 | ||
3 | use parsing::EqualizerApoParser; | 3 | use parsing::EqualizerApoParser; |
4 | 4 | ||
5 | use ::dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager; | 5 | use dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager; |
6 | use ::dbus_api::server_lookup::OrgPulseAudioServerLookup1; | 6 | use dbus_api::server_lookup::OrgPulseAudioServerLookup1; |
7 | use ::dbus_api::sink::OrgPulseAudioExtEqualizing1Equalizer; | 7 | use dbus_api::sink::OrgPulseAudioExtEqualizing1Equalizer; |
8 | 8 | ||
9 | use dbus::{BusType, Connection, ConnPath}; | 9 | use dbus::{BusType, ConnPath, Connection}; |
10 | use failure::{Error, ResultExt}; | 10 | use failure::{Error, ResultExt}; |
11 | 11 | ||
12 | use std::io; | 12 | use std::io; |
13 | 13 | ||
14 | pub fn connect() -> Result<Connection, Error> { | 14 | pub fn connect() -> Result<Connection, Error> { |
15 | let pulse_sock_path = | 15 | let pulse_sock_path = get_pulse_dbus_sock()?; |
16 | get_pulse_dbus_sock().context("While looking up PulseAudio's D-Bus socket path")?; | ||
17 | info!("PulseAudio's D-Bus socket path is: {}", pulse_sock_path); | 16 | info!("PulseAudio's D-Bus socket path is: {}", pulse_sock_path); |
18 | 17 | ||
19 | trace!("Connecting to PulseAudio's D-Bus socket"); | 18 | trace!("Connecting to PulseAudio's D-Bus socket"); |
@@ -46,7 +45,10 @@ pub fn send_filter(conn_sink: &ConnPath<&Connection>, filter: Filter) -> Result< | |||
46 | Ok(()) | 45 | Ok(()) |
47 | } | 46 | } |
48 | 47 | ||
49 | pub fn read_filter<T>(file: &mut T) -> Result<Filter, Error> where T: io::Read { | 48 | pub fn read_filter<T>(file: &mut T) -> Result<Filter, Error> |
49 | where | ||
50 | T: io::Read, | ||
51 | { | ||
50 | let mut buffer = String::new(); | 52 | let mut buffer = String::new(); |
51 | 53 | ||
52 | info!("Reading filter in GraphicEQ format from the command line"); | 54 | info!("Reading filter in GraphicEQ format from the command line"); |