diff --git a/src/main.rs b/src/main.rs index d8784c2..289a531 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,7 +12,7 @@ mod modules; #[cfg(target_os = "windows")] -const SERVER_ADDRESS: &str = "10.0.0.168:5000"; +const SERVER_ADDRESS: &str = "10.0.0.209:5000"; #[cfg(target_os = "linux")] const SERVER_ADDRESS: &str = "10.0.0.168:5000"; diff --git a/src/modules/external_interface.rs b/src/modules/external_interface.rs index 9e19ab0..8d16c8a 100644 --- a/src/modules/external_interface.rs +++ b/src/modules/external_interface.rs @@ -41,10 +41,7 @@ impl Hotkeys { } } pub fn send_obs(&self, hotkey: &str) { - println!("send to obs please?"); if cfg!(target_family = "windows") { - println!("yes, send to obs?"); - println!("{}", self.hotkeys["windows"]["propresenter_re"].as_str().unwrap()); Command::new(String::from(AHK_FILES_FOLDER) + "send_obs_back_to_propre.exe") .args([self.hotkeys["windows"]["propresenter_re"].as_str().unwrap(), self.hotkeys["windows"]["obs_re"].as_str().unwrap(), diff --git a/src/modules/message_handler.rs b/src/modules/message_handler.rs index 81a2ad3..4090f51 100644 --- a/src/modules/message_handler.rs +++ b/src/modules/message_handler.rs @@ -13,7 +13,8 @@ impl MessageHandler for StreamState { fn handle_update(&mut self, update: StateUpdate, hotkey_handler: &Hotkeys) -> (Option, Option>) { - if update != StateUpdate::UpdateClient{ + if update != StateUpdate::UpdateClient && update != StateUpdate::ChangeSlide(SlideChange::Next) && + update != StateUpdate::ChangeSlide(SlideChange::Previous){ self.update(update.clone()); } @@ -100,7 +101,7 @@ impl MessageHandler for StreamState { return (Some(update), None); }, StateUpdate::StreamSoundToggleOn(value) => {hotkey_handler.toggle_stream_sound(value); return (Some(update), None)}, - StateUpdate::ToggleComputerSoundOn(value) => {hotkey_handler.toggle_computer_sound(value); return (Some(update), None)}, + StateUpdate::ToggleComputerSoundOn(value) => {hotkey_handler.toggle_computer_sound(!value); return (Some(StateUpdate::ToggleComputerSoundOn(!value)), None)}, StateUpdate::ComputerMediaDoPause => {hotkey_handler.toggle_media_play_pause(); return (Some(update), None)}, StateUpdate::UpdateClient => {}, StateUpdate::StreamRunning(_) => {},