diff options
author | Minijackson <minijackson@riseup.net> | 2018-10-09 13:53:54 +0200 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2018-10-09 13:53:54 +0200 |
commit | 10c04fab9aab651cc525ff777bab5f27805c493d (patch) | |
tree | b78e2225a71ba0548474197c4fa0e553d4645c5c /src/pa_eq | |
parent | c287b4fa84b122178f5745a2bef0defad1012d61 (diff) | |
download | set_eq-10c04fab9aab651cc525ff777bab5f27805c493d.tar.gz set_eq-10c04fab9aab651cc525ff777bab5f27805c493d.zip |
Fix some clippy lints
Diffstat (limited to 'src/pa_eq')
-rw-r--r-- | src/pa_eq/dbus_api/mod.rs | 3 | ||||
-rw-r--r-- | src/pa_eq/mod.rs | 17 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/pa_eq/dbus_api/mod.rs b/src/pa_eq/dbus_api/mod.rs index a184c55..cd2bbcd 100644 --- a/src/pa_eq/dbus_api/mod.rs +++ b/src/pa_eq/dbus_api/mod.rs | |||
@@ -1,3 +1,6 @@ | |||
1 | #[allow(clippy)] | ||
1 | pub mod equalizing_manager; | 2 | pub mod equalizing_manager; |
3 | #[allow(clippy)] | ||
2 | pub mod server_lookup; | 4 | pub mod server_lookup; |
5 | #[allow(clippy)] | ||
3 | pub mod sink; | 6 | pub mod sink; |
diff --git a/src/pa_eq/mod.rs b/src/pa_eq/mod.rs index f7f1875..797468f 100644 --- a/src/pa_eq/mod.rs +++ b/src/pa_eq/mod.rs | |||
@@ -1,8 +1,8 @@ | |||
1 | mod dbus_api; | 1 | mod dbus_api; |
2 | 2 | ||
3 | use Filter; | ||
4 | use cli::pa_eq::*; | 3 | use cli::pa_eq::*; |
5 | use utils::*; | 4 | use utils::*; |
5 | use Filter; | ||
6 | 6 | ||
7 | use self::dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager; | 7 | use self::dbus_api::equalizing_manager::OrgPulseAudioExtEqualizing1Manager; |
8 | use self::dbus_api::server_lookup::OrgPulseAudioServerLookup1; | 8 | use self::dbus_api::server_lookup::OrgPulseAudioServerLookup1; |
@@ -35,7 +35,8 @@ pub fn reset(_args: ResetCli) -> Result<(), Error> { | |||
35 | preamp: 1f64, | 35 | preamp: 1f64, |
36 | frequencies: vec![], | 36 | frequencies: vec![], |
37 | coefficients: vec![], | 37 | coefficients: vec![], |
38 | }.pad(filter_rate); | 38 | } |
39 | .pad(filter_rate); | ||
39 | 40 | ||
40 | send_filter(&conn_sink, filter)?; | 41 | send_filter(&conn_sink, filter)?; |
41 | 42 | ||
@@ -68,15 +69,13 @@ fn connect_impl() -> Result<Connection, Error> { | |||
68 | Ok(Connection::open_private(&pulse_sock_path)?) | 69 | Ok(Connection::open_private(&pulse_sock_path)?) |
69 | } | 70 | } |
70 | 71 | ||
71 | fn get_equalized_sink<'a>(conn: &'a Connection) -> Result<ConnPath<'a, &'a Connection>, Error> { | 72 | fn get_equalized_sink(conn: &Connection) -> Result<ConnPath<&Connection>, Error> { |
72 | Ok(get_equalized_sink_impl(conn).context( | 73 | Ok(get_equalized_sink_impl(conn).context( |
73 | "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?", |
74 | )?) | 75 | )?) |
75 | } | 76 | } |
76 | 77 | ||
77 | fn get_equalized_sink_impl<'a>( | 78 | fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<&Connection>, Error> { |
78 | conn: &'a Connection, | ||
79 | ) -> Result<ConnPath<'a, &'a Connection>, Error> { | ||
80 | 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); |
81 | 80 | ||
82 | // TODO: make that a command-line option | 81 | // TODO: make that a command-line option |
@@ -96,7 +95,11 @@ fn send_filter(conn_sink: &ConnPath<&Connection>, filter: Filter) -> Result<(), | |||
96 | conn_sink.seed_filter( | 95 | conn_sink.seed_filter( |
97 | channel, | 96 | channel, |
98 | filter.frequencies, | 97 | filter.frequencies, |
99 | filter.coefficients.into_iter().map(decibel_to_ratio).collect(), | 98 | filter |
99 | .coefficients | ||
100 | .into_iter() | ||
101 | .map(decibel_to_ratio) | ||
102 | .collect(), | ||
100 | decibel_to_ratio(filter.preamp), | 103 | decibel_to_ratio(filter.preamp), |
101 | )?; | 104 | )?; |
102 | Ok(()) | 105 | Ok(()) |