From 465f21da46a7194e25894043ca2cca9ba958e11c Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Sun, 13 Jun 2021 20:48:54 +0200
Subject: add unreachable_pub lint and fix debug impl

---
 mumd/src/audio/input.rs        | 12 ++++++++++++
 mumd/src/audio/output.rs       | 13 +++++++++++++
 mumd/src/audio/transformers.rs |  1 +
 3 files changed, 26 insertions(+)

(limited to 'mumd/src/audio')

diff --git a/mumd/src/audio/input.rs b/mumd/src/audio/input.rs
index a1227e3..2a904d9 100644
--- a/mumd/src/audio/input.rs
+++ b/mumd/src/audio/input.rs
@@ -1,6 +1,7 @@
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use cpal::{InputCallbackInfo, Sample, SampleFormat, SampleRate, StreamConfig};
 use log::*;
+use std::fmt::Debug;
 use tokio::sync::watch;
 
 use crate::audio::SAMPLE_RATE;
@@ -177,3 +178,14 @@ impl AudioInputDevice for DefaultAudioInputDevice {
         self.channels as usize
     }
 }
+
+impl Debug for DefaultAudioInputDevice {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DefaultAudioInputDevice")
+            .field("sample_receiver", &self.sample_receiver)
+            .field("channels", &self.channels)
+            .field("volume_sender", &self.volume_sender)
+            .field("stream", &"cpal::Stream")
+            .finish()
+    }
+}
diff --git a/mumd/src/audio/output.rs b/mumd/src/audio/output.rs
index a2f6bcc..cdbe336 100644
--- a/mumd/src/audio/output.rs
+++ b/mumd/src/audio/output.rs
@@ -7,12 +7,14 @@ use cpal::{OutputCallbackInfo, Sample, SampleFormat, SampleRate, StreamConfig};
 use log::*;
 use mumble_protocol::voice::VoicePacketPayload;
 use std::collections::{HashMap, VecDeque};
+use std::fmt::Debug;
 use std::ops::AddAssign;
 use std::sync::{Arc, Mutex};
 use tokio::sync::watch;
 
 type ClientStreamKey = (VoiceStreamType, u32);
 
+#[derive(Debug)]
 pub struct ClientStream {
     buffer_clients: HashMap<ClientStreamKey, (VecDeque<f32>, opus::Decoder)>, //TODO ring buffer?
     buffer_effects: VecDeque<f32>,
@@ -242,3 +244,14 @@ pub fn curry_callback<T: Sample + AddAssign + SaturatingAdd + std::fmt::Display>
         }
     }
 }
+
+impl Debug for DefaultAudioOutputDevice {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DefaultAudioInputDevice")
+            .field("client_streams", &self.client_streams)
+            .field("config", &self.config)
+            .field("volume_sender", &self.volume_sender)
+            .field("stream", &"cpal::Stream")
+            .finish()
+    }
+}
diff --git a/mumd/src/audio/transformers.rs b/mumd/src/audio/transformers.rs
index 25e28b8..74d751a 100644
--- a/mumd/src/audio/transformers.rs
+++ b/mumd/src/audio/transformers.rs
@@ -6,6 +6,7 @@ pub trait Transformer {
 }
 
 /// A struct representing a noise gate transform.
+#[derive(Debug)]
 pub struct NoiseGate {
     alltime_high: f32,
     open: usize,
-- 
cgit v1.2.1


From f24f23faa240053b7ac8f65b69ff8d1ae0ad3ea1 Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Mon, 14 Jun 2021 13:44:08 +0200
Subject: clippy

---
 mumd/src/audio/input.rs  | 4 ++--
 mumd/src/audio/output.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mumd/src/audio')

diff --git a/mumd/src/audio/input.rs b/mumd/src/audio/input.rs
index 2a904d9..88efa62 100644
--- a/mumd/src/audio/input.rs
+++ b/mumd/src/audio/input.rs
@@ -161,12 +161,12 @@ impl AudioInputDevice for DefaultAudioInputDevice {
     fn play(&self) -> Result<(), AudioError> {
         self.stream
             .play()
-            .map_err(|e| AudioError::InputPlayError(e))
+            .map_err(AudioError::InputPlayError)
     }
     fn pause(&self) -> Result<(), AudioError> {
         self.stream
             .pause()
-            .map_err(|e| AudioError::InputPauseError(e))
+            .map_err(AudioError::InputPauseError)
     }
     fn set_volume(&self, volume: f32) {
         self.volume_sender.send(volume).unwrap();
diff --git a/mumd/src/audio/output.rs b/mumd/src/audio/output.rs
index cdbe336..7487af2 100644
--- a/mumd/src/audio/output.rs
+++ b/mumd/src/audio/output.rs
@@ -191,13 +191,13 @@ impl AudioOutputDevice for DefaultAudioOutputDevice {
     fn play(&self) -> Result<(), AudioError> {
         self.stream
             .play()
-            .map_err(|e| AudioError::OutputPlayError(e))
+            .map_err(AudioError::OutputPlayError)
     }
 
     fn pause(&self) -> Result<(), AudioError> {
         self.stream
             .pause()
-            .map_err(|e| AudioError::OutputPauseError(e))
+            .map_err(AudioError::OutputPauseError)
     }
 
     fn set_volume(&self, volume: f32) {
-- 
cgit v1.2.1