From cff1067ccf4655d5a6e5556922d39f4794624741 Mon Sep 17 00:00:00 2001 From: Nickiel12 <35903114+Nickiel12@users.noreply.github.com> Date: Mon, 20 Dec 2021 14:05:48 -0800 Subject: [PATCH] renamed ChangeSceneOnSlideHotkey to ChangeSceneOnChangedSlide --- src/modules/stream_states/stream_states_class.rs | 2 +- src/tests/state_update_tests.rs | 4 ++-- src/tests/states_io_handler_tests.rs | 2 +- src/tests/stream_states_tests.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/stream_states/stream_states_class.rs b/src/modules/stream_states/stream_states_class.rs index 996f657..9934f55 100644 --- a/src/modules/stream_states/stream_states_class.rs +++ b/src/modules/stream_states/stream_states_class.rs @@ -50,7 +50,7 @@ impl StreamState { StateUpdate::StreamRunning(new_val) => {self.stream_running = new_val;}, StateUpdate::StreamIsMuted(new_val) => {self.stream_is_muted = new_val;}, StateUpdate::ComputerSoundIsOn(new_val) => {self.computer_sound_is_on = new_val;}, - StateUpdate::ChangeSceneOnChangeSlideHotkey(new_val) => {self.change_scene_on_change_slide_hotkey = new_val;}, + StateUpdate::ChangeSceneOnChangeSlide(new_val) => {self.change_scene_on_change_slide_hotkey = new_val;}, StateUpdate::TimerCanRun(new_val) => {self.timer_can_run = new_val;}, StateUpdate::TimerLength(new_val) => {self.timer_length = new_val;}, StateUpdate::TimerText(new_val) => {self.timer_text = new_val;}, diff --git a/src/tests/state_update_tests.rs b/src/tests/state_update_tests.rs index 671d958..af1afcd 100644 --- a/src/tests/state_update_tests.rs +++ b/src/tests/state_update_tests.rs @@ -26,11 +26,11 @@ fn test_json_to_state_update() { assert_eq!(StateUpdate::json_to_state_update(serde_json::from_str( "{\"type\": \"button\", \"button\": \"Change_With_Clicker\", \"data\": true}" - ).unwrap()), StateUpdate::ChangeSceneOnChangeSlideHotkey(true)); + ).unwrap()), StateUpdate::ChangeSceneOnChangeSlide(true)); assert_eq!(StateUpdate::json_to_state_update(serde_json::from_str( "{\"type\": \"button\", \"button\": \"Change_With_Clicker\", \"data\": false}" - ).unwrap()), StateUpdate::ChangeSceneOnChangeSlideHotkey(false)); + ).unwrap()), StateUpdate::ChangeSceneOnChangeSlide(false)); assert_eq!(StateUpdate::json_to_state_update(serde_json::from_str( "{\"type\": \"button\", \"button\": \"Toggle_Computer_Volume\", \"data\": true}" diff --git a/src/tests/states_io_handler_tests.rs b/src/tests/states_io_handler_tests.rs index 2b13d9b..59d48b0 100644 --- a/src/tests/states_io_handler_tests.rs +++ b/src/tests/states_io_handler_tests.rs @@ -35,7 +35,7 @@ fn send_on_multiple_threads() { tx1.send(StateMessage::StateUpdate(StateUpdate::TimerCanRun(false))).unwrap(); }); thread::spawn(move || { - tx2.send(StateMessage::StateUpdate(StateUpdate::ChangeSceneOnChangeSlideHotkey(false))).unwrap(); + tx2.send(StateMessage::StateUpdate(StateUpdate::ChangeSceneOnChangeSlide(false))).unwrap(); }); thread::spawn(move || { tx3.send(StateMessage::StateUpdate(StateUpdate::StreamIsMuted(false))).unwrap(); diff --git a/src/tests/stream_states_tests.rs b/src/tests/stream_states_tests.rs index 5c8d654..c78a043 100644 --- a/src/tests/stream_states_tests.rs +++ b/src/tests/stream_states_tests.rs @@ -120,7 +120,7 @@ fn test_updating() { assert_eq!(stream_state.computer_sound_is_on, false); assert_eq!(stream_state.change_scene_on_change_slide_hotkey, true); - stream_state.update(StateUpdate::ChangeSceneOnChangeSlideHotkey(false)); + stream_state.update(StateUpdate::ChangeSceneOnChangeSlide(false)); assert_eq!(stream_state.change_scene_on_change_slide_hotkey, false); assert_eq!(stream_state.scene_is_augmented, false);