Nickiel/church_controller_rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stuff

Browse source
This commit is contained in:
Nickiel12 2021-12-30 22:42:49 -08:00
parent 3b0ead5b96
commit 0b35dcd865
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.rs
View file

@ -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";

3
src/modules/external_interface.rs
View file

@ -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(),

5
src/modules/message_handler.rs
View file

@ -13,7 +13,8 @@ impl MessageHandler for StreamState {
fn handle_update(&mut self, update: StateUpdate, hotkey_handler: &Hotkeys)
-> (Option<StateUpdate>, Option<Vec<StateUpdate>>) {
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(_) => {},