Merge branch '0.4'

5 files changed, 36 insertions, 32 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b707bb5..ed816d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,9 @@ release.
 Unreleased
 ----------
 
+0.4.0 - 2021-06-19
+------------------
+
 Added
 ~~~~~
 
diff --git a/Cargo.lock b/Cargo.lock
index 8d9a66a..a2d5db6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -185,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "combine"
-version = "4.5.2"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e"
+checksum = "a2d47c1b11006b87e492b53b313bb699ce60e16613c4dddaa91f8f7c220ab2fa"
 dependencies = [
  "bytes",
  "memchr",
@@ -776,9 +776,9 @@ checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "mio"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
  "libc",
  "log",
@@ -1060,9 +1060,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "openssl"
-version = "0.10.34"
+version = "0.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8"
+checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1080,9 +1080,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.63"
+version = "0.9.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98"
+checksum = "209efc2fe0e980c8849efacdb567f975a1c80245c4f6980d6f012733bfa851af"
 dependencies = [
  "autocfg",
  "cc",
@@ -1256,9 +1256,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
  "rand_chacha",
@@ -1278,27 +1278,27 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
  "rand_core",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
+checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
 dependencies = [
  "bitflags",
 ]
@@ -1570,9 +1570,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975"
+checksum = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2"
 dependencies = [
  "autocfg",
  "libc",
@@ -1580,6 +1580,7 @@ dependencies = [
  "num_cpus",
  "pin-project-lite",
  "tokio-macros",
+ "winapi",
 ]
 
 [[package]]
@@ -1646,9 +1647,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "vcpkg"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vec_map"
diff --git a/LICENSE b/LICENSE
index 5b7f440..8d1b141 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Gustav Sörnäs & Eskil Queseth
+Copyright (c) 2021 Gustav Sörnäs & Eskil Queseth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index 7f428eb..9508cc0 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -389,7 +389,7 @@ fn match_opt() -> Result<(), Error> {
             } else {
                 //TODO report volume of user
                 //     needs work on mumd
-                todo!();
+                warn!("Currently unimplemented");
             }
         }
         Command::Mute { user } => match user {
diff --git a/mumd/src/audio/input.rs b/mumd/src/audio/input.rs
index 4dfc465..ec09389 100644
--- a/mumd/src/audio/input.rs
+++ b/mumd/src/audio/input.rs
@@ -47,7 +47,7 @@ pub fn callback<T: Sample>(
 }
 
 /// Something that can listen to audio and send it somewhere.
-/// 
+///
 /// One sample is assumed to be an encoded opus frame. See [opus::Encoder].
 pub trait AudioInputDevice {
     /// Starts the device.
@@ -122,11 +122,11 @@ impl DefaultAudioInputDevice {
             SampleFormat::F32 => input_device.build_input_stream(
                 &input_config,
                 callback::<f32>(
-                    sample_sender, 
-                    transformers, 
+                    sample_sender,
+                    transformers,
                     opus_encoder,
                     buffer_size,
-                    input_volume_receiver, 
+                    input_volume_receiver,
                     phase_watcher
                 ),
                 err_fn,
@@ -134,11 +134,11 @@ impl DefaultAudioInputDevice {
             SampleFormat::I16 => input_device.build_input_stream(
                 &input_config,
                 callback::<i16>(
-                    sample_sender, 
-                    transformers, 
+                    sample_sender,
+                    transformers,
                     opus_encoder,
                     buffer_size,
-                    input_volume_receiver, 
+                    input_volume_receiver,
                     phase_watcher
                 ),
                 err_fn,
@@ -146,11 +146,11 @@ impl DefaultAudioInputDevice {
             SampleFormat::U16 => input_device.build_input_stream(
                 &input_config,
                 callback::<u16>(
-                    sample_sender, 
-                    transformers, 
+                    sample_sender,
+                    transformers,
                     opus_encoder,
                     buffer_size,
-                    input_volume_receiver, 
+                    input_volume_receiver,
                     phase_watcher
                 ),
                 err_fn,