diff options
author | Minijackson <minijackson@riseup.net> | 2019-05-04 17:51:25 +0200 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2019-05-04 17:51:25 +0200 |
commit | 9f054ec7e1730c32f8e6ebc4960e602c47d34671 (patch) | |
tree | a307c6d1260abecb8ffd69433d38e6067a87f967 /src/pa_eq/mod.rs | |
parent | b4c2de6a1a50e1b9cdb3fc666023dd5b2d1a3e61 (diff) | |
download | set_eq-9f054ec7e1730c32f8e6ebc4960e602c47d34671.tar.gz set_eq-9f054ec7e1730c32f8e6ebc4960e602c47d34671.zip |
Also fix edition idioms
Diffstat (limited to 'src/pa_eq/mod.rs')
-rw-r--r-- | src/pa_eq/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pa_eq/mod.rs b/src/pa_eq/mod.rs index 9073684..09b2039 100644 --- a/src/pa_eq/mod.rs +++ b/src/pa_eq/mod.rs | |||
@@ -69,13 +69,13 @@ fn connect_impl() -> Result<Connection, Error> { | |||
69 | Ok(Connection::open_private(&pulse_sock_path)?) | 69 | Ok(Connection::open_private(&pulse_sock_path)?) |
70 | } | 70 | } |
71 | 71 | ||
72 | fn get_equalized_sink(conn: &Connection) -> Result<ConnPath<&Connection>, Error> { | 72 | fn get_equalized_sink(conn: &Connection) -> Result<ConnPath<'_, &Connection>, Error> { |
73 | Ok(get_equalized_sink_impl(conn).context( | 73 | Ok(get_equalized_sink_impl(conn).context( |
74 | "Could not find an equalized sink. Have you loaded the 'module-equalizer-sink' module?", | 74 | "Could not find an equalized sink. Have you loaded the 'module-equalizer-sink' module?", |
75 | )?) | 75 | )?) |
76 | } | 76 | } |
77 | 77 | ||
78 | fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<&Connection>, Error> { | 78 | fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<'_, &Connection>, Error> { |
79 | let conn_manager = conn.with_path("org.PulseAudio.Core1", "/org/pulseaudio/equalizing1", 2000); | 79 | let conn_manager = conn.with_path("org.PulseAudio.Core1", "/org/pulseaudio/equalizing1", 2000); |
80 | 80 | ||
81 | // TODO: make that a command-line option | 81 | // TODO: make that a command-line option |
@@ -88,7 +88,7 @@ fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<&Connection>, E | |||
88 | Ok(conn.with_path("org.PulseAudio.Core1", sink_path, 2000)) | 88 | Ok(conn.with_path("org.PulseAudio.Core1", sink_path, 2000)) |
89 | } | 89 | } |
90 | 90 | ||
91 | fn send_filter(conn_sink: &ConnPath<&Connection>, filter: Filter) -> Result<(), Error> { | 91 | fn send_filter(conn_sink: &ConnPath<'_, &Connection>, filter: Filter) -> Result<(), Error> { |
92 | let channel = conn_sink.get_nchannels()?; | 92 | let channel = conn_sink.get_nchannels()?; |
93 | info!("Using channel: {}", channel); | 93 | info!("Using channel: {}", channel); |
94 | trace!("Sending filter: {:?}", filter); | 94 | trace!("Sending filter: {:?}", filter); |