From ce92342bc2593fb93a2aa7757bef1463af72c527 Mon Sep 17 00:00:00 2001 From: Nickiel12 <35903114+Nickiel12@users.noreply.github.com> Date: Fri, 31 Dec 2021 02:08:37 -0800 Subject: [PATCH] windows stuff --- Cargo.toml | 2 +- {src/ahk_files => ahk_files}/music_toggle.ahk | 0 {src/ahk_files => ahk_files}/pause_play_global.ahk | 0 {src/ahk_files => ahk_files}/program_opener.ahk | 0 {src/ahk_files => ahk_files}/program_opener_debug.ahk | 0 {src/ahk_files => ahk_files}/propre_send.ahk | 0 {src/ahk_files => ahk_files}/send_obs_back_to_propre.ahk | 0 {src/ahk_files => ahk_files}/window_activator.ahk | 0 src/main.rs | 2 +- src/modules/external_interface.rs | 9 +++++++-- src/modules/socket_handler.rs | 1 + 11 files changed, 10 insertions(+), 4 deletions(-) rename {src/ahk_files => ahk_files}/music_toggle.ahk (100%) rename {src/ahk_files => ahk_files}/pause_play_global.ahk (100%) rename {src/ahk_files => ahk_files}/program_opener.ahk (100%) rename {src/ahk_files => ahk_files}/program_opener_debug.ahk (100%) rename {src/ahk_files => ahk_files}/propre_send.ahk (100%) rename {src/ahk_files => ahk_files}/send_obs_back_to_propre.ahk (100%) rename {src/ahk_files => ahk_files}/window_activator.ahk (100%) diff --git a/Cargo.toml b/Cargo.toml index 13f2c9b..fba248a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,4 +10,4 @@ workctl = "0.2.0" ctrlc = "3.2.1" serde_json = "1.0" crossbeam-channel = "0.5" -inputbot = {path = "/home/nick/Documents/GitHub/InputBot"} \ No newline at end of file +inputbot = {path = "D:\\InputBot"} \ No newline at end of file diff --git a/src/ahk_files/music_toggle.ahk b/ahk_files/music_toggle.ahk similarity index 100% rename from src/ahk_files/music_toggle.ahk rename to ahk_files/music_toggle.ahk diff --git a/src/ahk_files/pause_play_global.ahk b/ahk_files/pause_play_global.ahk similarity index 100% rename from src/ahk_files/pause_play_global.ahk rename to ahk_files/pause_play_global.ahk diff --git a/src/ahk_files/program_opener.ahk b/ahk_files/program_opener.ahk similarity index 100% rename from src/ahk_files/program_opener.ahk rename to ahk_files/program_opener.ahk diff --git a/src/ahk_files/program_opener_debug.ahk b/ahk_files/program_opener_debug.ahk similarity index 100% rename from src/ahk_files/program_opener_debug.ahk rename to ahk_files/program_opener_debug.ahk diff --git a/src/ahk_files/propre_send.ahk b/ahk_files/propre_send.ahk similarity index 100% rename from src/ahk_files/propre_send.ahk rename to ahk_files/propre_send.ahk diff --git a/src/ahk_files/send_obs_back_to_propre.ahk b/ahk_files/send_obs_back_to_propre.ahk similarity index 100% rename from src/ahk_files/send_obs_back_to_propre.ahk rename to ahk_files/send_obs_back_to_propre.ahk diff --git a/src/ahk_files/window_activator.ahk b/ahk_files/window_activator.ahk similarity index 100% rename from src/ahk_files/window_activator.ahk rename to ahk_files/window_activator.ahk diff --git a/src/main.rs b/src/main.rs index 289a531..d8784c2 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.209:5000"; +const SERVER_ADDRESS: &str = "10.0.0.168: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 8b45fb9..05cdbe1 100644 --- a/src/modules/external_interface.rs +++ b/src/modules/external_interface.rs @@ -1,8 +1,13 @@ use std::process::Command; use super::stream_states::{state_update::StateUpdate, enums::{SlideChange, SubScenes, Scenes}}; -const AHK_FILES_FOLDER: &str = "./src/ahk_files/"; -pub const OPTIONS_PATH: &str = "./options.json"; +const AHK_FILES_FOLDER: &str = ".\\ahk_files\\"; +pub const OPTIONS_PATH: &str = ".\\options.json"; + + /* + const AHK_FILES_FOLDER: &str = "./src/ahk_files/"; + pub const OPTIONS_PATH: &str = "./options.json"; + */ pub fn create_keyboard_hooks(channel_tx: crossbeam_channel::Sender, close_flag: workctl::sync_flag::SyncFlagRx) { diff --git a/src/modules/socket_handler.rs b/src/modules/socket_handler.rs index 7bc4453..9734d5f 100644 --- a/src/modules/socket_handler.rs +++ b/src/modules/socket_handler.rs @@ -81,6 +81,7 @@ impl Socket { pub fn send(&self, message: String) { let mut streams = self.socket_txs.lock().unwrap(); + if streams.len() == 0 {return} for i in 0..streams.len(){ let mut tx = streams.get(i).unwrap().as_ref();