Merge pull request #109 from mum-rs/ogg

1 files changed, 7 insertions, 10 deletions

diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 1992884..ba461fd 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -2,9 +2,9 @@ pub mod channel;
 pub mod server;
 pub mod user;
 
-use crate::{audio::{AudioInput, AudioOutput, NotificationEvents}, network::tcp::DisconnectedReason};
+use crate::audio::{AudioInput, AudioOutput, sound_effects::NotificationEvents};
 use crate::error::StateError;
-use crate::network::tcp::{TcpEvent, TcpEventData};
+use crate::network::tcp::{DisconnectedReason, TcpEvent, TcpEventData};
 use crate::network::{ConnectionInfo, VoiceStreamType};
 use crate::notifications;
 use crate::state::server::Server;
@@ -12,19 +12,16 @@ use crate::state::user::UserDiff;
 
 use chrono::NaiveDateTime;
 use log::*;
-use mumble_protocol::control::msgs;
-use mumble_protocol::control::ControlPacket;
+use mumble_protocol::control::{ControlPacket, msgs};
 use mumble_protocol::ping::PongPacket;
 use mumble_protocol::voice::Serverbound;
 use mumlib::command::{ChannelTarget, Command, CommandResponse, MessageTarget, MumbleEvent, MumbleEventKind};
 use mumlib::config::Config;
 use mumlib::Error;
-use std::{
-    fmt::Debug,
-    iter,
-    net::{SocketAddr, ToSocketAddrs},
-    sync::{Arc, RwLock},
-};
+use std::fmt::Debug;
+use std::iter;
+use std::net::{SocketAddr, ToSocketAddrs};
+use std::sync::{Arc, RwLock};
 use tokio::sync::{mpsc, watch};
 
 macro_rules! at {