diff options
Diffstat (limited to 'src/pa_eq/dbus_api/equalizing_manager.rs')
-rw-r--r-- | src/pa_eq/dbus_api/equalizing_manager.rs | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/pa_eq/dbus_api/equalizing_manager.rs b/src/pa_eq/dbus_api/equalizing_manager.rs index 5f6574f..1ea6111 100644 --- a/src/pa_eq/dbus_api/equalizing_manager.rs +++ b/src/pa_eq/dbus_api/equalizing_manager.rs | |||
@@ -17,11 +17,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgPulseAudioExtEqualizi | |||
17 | type Err = dbus::Error; | 17 | type Err = dbus::Error; |
18 | 18 | ||
19 | fn remove_profile(&self, name: &str) -> Result<(), Self::Err> { | 19 | fn remove_profile(&self, name: &str) -> Result<(), Self::Err> { |
20 | let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Manager".into(), &"RemoveProfile".into(), |msg| { | 20 | let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Manager".into(), &"RemoveProfile".into(), |msg| { |
21 | let mut i = arg::IterAppend::new(msg); | 21 | let mut i = arg::IterAppend::new(msg); |
22 | i.append(name); | 22 | i.append(name); |
23 | })); | 23 | })); |
24 | try!(m.as_result()); | 24 | r#try!(m.as_result()); |
25 | Ok(()) | 25 | Ok(()) |
26 | } | 26 | } |
27 | 27 | ||
@@ -51,9 +51,9 @@ where | |||
51 | let fclone = f.clone(); | 51 | let fclone = f.clone(); |
52 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { | 52 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { |
53 | let mut i = minfo.msg.iter_init(); | 53 | let mut i = minfo.msg.iter_init(); |
54 | let name: &str = try!(i.read()); | 54 | let name: &str = r#try!(i.read()); |
55 | let d = fclone(minfo); | 55 | let d = fclone(minfo); |
56 | try!(d.remove_profile(name)); | 56 | r#try!(d.remove_profile(name)); |
57 | let rm = minfo.msg.method_return(); | 57 | let rm = minfo.msg.method_return(); |
58 | Ok(vec!(rm)) | 58 | Ok(vec!(rm)) |
59 | }; | 59 | }; |
@@ -67,7 +67,7 @@ where | |||
67 | let p = p.on_get(move |a, pinfo| { | 67 | let p = p.on_get(move |a, pinfo| { |
68 | let minfo = pinfo.to_method_info(); | 68 | let minfo = pinfo.to_method_info(); |
69 | let d = fclone(&minfo); | 69 | let d = fclone(&minfo); |
70 | a.append(try!(d.get_interface_revision())); | 70 | a.append(r#try!(d.get_interface_revision())); |
71 | Ok(()) | 71 | Ok(()) |
72 | }); | 72 | }); |
73 | let i = i.add_p(p); | 73 | let i = i.add_p(p); |
@@ -78,7 +78,7 @@ where | |||
78 | let p = p.on_get(move |a, pinfo| { | 78 | let p = p.on_get(move |a, pinfo| { |
79 | let minfo = pinfo.to_method_info(); | 79 | let minfo = pinfo.to_method_info(); |
80 | let d = fclone(&minfo); | 80 | let d = fclone(&minfo); |
81 | a.append(try!(d.get_equalized_sinks())); | 81 | a.append(r#try!(d.get_equalized_sinks())); |
82 | Ok(()) | 82 | Ok(()) |
83 | }); | 83 | }); |
84 | let i = i.add_p(p); | 84 | let i = i.add_p(p); |
@@ -89,7 +89,7 @@ where | |||
89 | let p = p.on_get(move |a, pinfo| { | 89 | let p = p.on_get(move |a, pinfo| { |
90 | let minfo = pinfo.to_method_info(); | 90 | let minfo = pinfo.to_method_info(); |
91 | let d = fclone(&minfo); | 91 | let d = fclone(&minfo); |
92 | a.append(try!(d.get_profiles())); | 92 | a.append(r#try!(d.get_profiles())); |
93 | Ok(()) | 93 | Ok(()) |
94 | }); | 94 | }); |
95 | let i = i.add_p(p); | 95 | let i = i.add_p(p); |
@@ -108,7 +108,7 @@ impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkAdded { | |||
108 | (&self.sink as &arg::RefArg).append(i); | 108 | (&self.sink as &arg::RefArg).append(i); |
109 | } | 109 | } |
110 | fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { | 110 | fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { |
111 | self.sink = try!(i.read()); | 111 | self.sink = r#try!(i.read()); |
112 | Ok(()) | 112 | Ok(()) |
113 | } | 113 | } |
114 | } | 114 | } |
@@ -125,7 +125,7 @@ impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkRemoved { | |||
125 | (&self.sink as &arg::RefArg).append(i); | 125 | (&self.sink as &arg::RefArg).append(i); |
126 | } | 126 | } |
127 | fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { | 127 | fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { |
128 | self.sink = try!(i.read()); | 128 | self.sink = r#try!(i.read()); |
129 | Ok(()) | 129 | Ok(()) |
130 | } | 130 | } |
131 | } | 131 | } |
@@ -153,11 +153,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusIntros | |||
153 | type Err = dbus::Error; | 153 | type Err = dbus::Error; |
154 | 154 | ||
155 | fn introspect(&self) -> Result<String, Self::Err> { | 155 | fn introspect(&self) -> Result<String, Self::Err> { |
156 | let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| { | 156 | let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| { |
157 | })); | 157 | })); |
158 | try!(m.as_result()); | 158 | r#try!(m.as_result()); |
159 | let mut i = m.iter_init(); | 159 | let mut i = m.iter_init(); |
160 | let data: String = try!(i.read()); | 160 | let data: String = r#try!(i.read()); |
161 | Ok(data) | 161 | Ok(data) |
162 | } | 162 | } |
163 | } | 163 | } |
@@ -174,7 +174,7 @@ where | |||
174 | let fclone = f.clone(); | 174 | let fclone = f.clone(); |
175 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { | 175 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { |
176 | let d = fclone(minfo); | 176 | let d = fclone(minfo); |
177 | let data = try!(d.introspect()); | 177 | let data = r#try!(d.introspect()); |
178 | let rm = minfo.msg.method_return(); | 178 | let rm = minfo.msg.method_return(); |
179 | let rm = rm.append1(data); | 179 | let rm = rm.append1(data); |
180 | Ok(vec!(rm)) | 180 | Ok(vec!(rm)) |
@@ -196,36 +196,36 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper | |||
196 | type Err = dbus::Error; | 196 | type Err = dbus::Error; |
197 | 197 | ||
198 | fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> { | 198 | fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> { |
199 | let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| { | 199 | let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| { |
200 | let mut i = arg::IterAppend::new(msg); | 200 | let mut i = arg::IterAppend::new(msg); |
201 | i.append(interface_name); | 201 | i.append(interface_name); |
202 | i.append(property_name); | 202 | i.append(property_name); |
203 | })); | 203 | })); |
204 | try!(m.as_result()); | 204 | r#try!(m.as_result()); |
205 | let mut i = m.iter_init(); | 205 | let mut i = m.iter_init(); |
206 | let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); | 206 | let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read()); |
207 | Ok(value) | 207 | Ok(value) |
208 | } | 208 | } |
209 | 209 | ||
210 | fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> { | 210 | fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> { |
211 | let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| { | 211 | let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| { |
212 | let mut i = arg::IterAppend::new(msg); | 212 | let mut i = arg::IterAppend::new(msg); |
213 | i.append(interface_name); | 213 | i.append(interface_name); |
214 | i.append(property_name); | 214 | i.append(property_name); |
215 | i.append(value); | 215 | i.append(value); |
216 | })); | 216 | })); |
217 | try!(m.as_result()); | 217 | r#try!(m.as_result()); |
218 | Ok(()) | 218 | Ok(()) |
219 | } | 219 | } |
220 | 220 | ||
221 | fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> { | 221 | fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> { |
222 | let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| { | 222 | let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| { |
223 | let mut i = arg::IterAppend::new(msg); | 223 | let mut i = arg::IterAppend::new(msg); |
224 | i.append(interface_name); | 224 | i.append(interface_name); |
225 | })); | 225 | })); |
226 | try!(m.as_result()); | 226 | r#try!(m.as_result()); |
227 | let mut i = m.iter_init(); | 227 | let mut i = m.iter_init(); |
228 | let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = try!(i.read()); | 228 | let props: ::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>> = r#try!(i.read()); |
229 | Ok(props) | 229 | Ok(props) |
230 | } | 230 | } |
231 | } | 231 | } |
@@ -242,10 +242,10 @@ where | |||
242 | let fclone = f.clone(); | 242 | let fclone = f.clone(); |
243 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { | 243 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { |
244 | let mut i = minfo.msg.iter_init(); | 244 | let mut i = minfo.msg.iter_init(); |
245 | let interface_name: &str = try!(i.read()); | 245 | let interface_name: &str = r#try!(i.read()); |
246 | let property_name: &str = try!(i.read()); | 246 | let property_name: &str = r#try!(i.read()); |
247 | let d = fclone(minfo); | 247 | let d = fclone(minfo); |
248 | let value = try!(d.get(interface_name, property_name)); | 248 | let value = r#try!(d.get(interface_name, property_name)); |
249 | let rm = minfo.msg.method_return(); | 249 | let rm = minfo.msg.method_return(); |
250 | let rm = rm.append1(value); | 250 | let rm = rm.append1(value); |
251 | Ok(vec!(rm)) | 251 | Ok(vec!(rm)) |
@@ -259,11 +259,11 @@ where | |||
259 | let fclone = f.clone(); | 259 | let fclone = f.clone(); |
260 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { | 260 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { |
261 | let mut i = minfo.msg.iter_init(); | 261 | let mut i = minfo.msg.iter_init(); |
262 | let interface_name: &str = try!(i.read()); | 262 | let interface_name: &str = r#try!(i.read()); |
263 | let property_name: &str = try!(i.read()); | 263 | let property_name: &str = r#try!(i.read()); |
264 | let value: arg::Variant<Box<arg::RefArg>> = try!(i.read()); | 264 | let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read()); |
265 | let d = fclone(minfo); | 265 | let d = fclone(minfo); |
266 | try!(d.set(interface_name, property_name, value)); | 266 | r#try!(d.set(interface_name, property_name, value)); |
267 | let rm = minfo.msg.method_return(); | 267 | let rm = minfo.msg.method_return(); |
268 | Ok(vec!(rm)) | 268 | Ok(vec!(rm)) |
269 | }; | 269 | }; |
@@ -276,9 +276,9 @@ where | |||
276 | let fclone = f.clone(); | 276 | let fclone = f.clone(); |
277 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { | 277 | let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| { |
278 | let mut i = minfo.msg.iter_init(); | 278 | let mut i = minfo.msg.iter_init(); |
279 | let interface_name: &str = try!(i.read()); | 279 | let interface_name: &str = r#try!(i.read()); |
280 | let d = fclone(minfo); | 280 | let d = fclone(minfo); |
281 | let props = try!(d.get_all(interface_name)); | 281 | let props = r#try!(d.get_all(interface_name)); |
282 | let rm = minfo.msg.method_return(); | 282 | let rm = minfo.msg.method_return(); |
283 | let rm = rm.append1(props); | 283 | let rm = rm.append1(props); |
284 | Ok(vec!(rm)) | 284 | Ok(vec!(rm)) |