From e552035142b36fa1da78faed5cf83ff89f4506c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Mon, 19 Oct 2020 01:32:50 +0200
Subject: initial reading of config file

---
 mumd/Cargo.toml   |  1 -
 mumd/src/state.rs | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'mumd')

diff --git a/mumd/Cargo.toml b/mumd/Cargo.toml
index 9101b43..ffb463a 100644
--- a/mumd/Cargo.toml
+++ b/mumd/Cargo.toml
@@ -27,6 +27,5 @@ tokio = { version = "0.2", features = ["full"] }
 tokio-tls = "0.3"
 tokio-util = { version = "0.3", features = ["codec", "udp"] }
 
-#clap = "2.33"
 #compressor = "0.3"
 #daemonize = "0.4"
diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 55fd8ae..e2892fc 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -6,6 +6,7 @@ use mumble_protocol::control::msgs;
 use mumble_protocol::control::ControlPacket;
 use mumble_protocol::voice::Serverbound;
 use mumlib::command::{Command, CommandResponse};
+use mumlib::config::Config;
 use mumlib::error::{ChannelIdentifierError, Error};
 use serde::{Deserialize, Serialize};
 use std::collections::hash_map::Entry;
@@ -21,6 +22,7 @@ pub enum StatePhase {
 }
 
 pub struct State {
+    config: Config,
     server: Option<Server>,
     audio: Audio,
 
@@ -28,6 +30,7 @@ pub struct State {
     connection_info_sender: watch::Sender<Option<ConnectionInfo>>,
 
     phase_watcher: (watch::Sender<StatePhase>, watch::Receiver<StatePhase>),
+
 }
 
 impl State {
@@ -35,9 +38,17 @@ impl State {
         packet_sender: mpsc::UnboundedSender<ControlPacket<Serverbound>>,
         connection_info_sender: watch::Sender<Option<ConnectionInfo>>,
     ) -> Self {
+        let config = mumlib::config::read_default_cfg();
+        let audio = Audio::new();
+        if let Some(ref audio_config) = config.audio {
+            if let Some(input_volume) = audio_config.input_volume {
+                audio.set_input_volume(input_volume);
+            }
+        }
         Self {
+            config,
             server: None,
-            audio: Audio::new(),
+            audio,
             packet_sender,
             connection_info_sender,
             phase_watcher: watch::channel(StatePhase::Disconnected),
-- 
cgit v1.2.1