diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2020-10-19 01:32:50 +0200 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2020-10-19 01:32:50 +0200 |
| commit | e552035142b36fa1da78faed5cf83ff89f4506c5 (patch) | |
| tree | ef576829909de84f2ddc3ecac78d7a0b87d317b4 /mumd/src | |
| parent | ec323df881c3aad82ed963fbfbdd9ade9f96e830 (diff) | |
| download | mum-e552035142b36fa1da78faed5cf83ff89f4506c5.tar.gz | |
initial reading of config file
Diffstat (limited to 'mumd/src')
| -rw-r--r-- | mumd/src/state.rs | 13 |
1 files changed, 12 insertions, 1 deletions
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), |
