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

renamed ChangeSceneOnSlideHotkey to ChangeSceneOnChangedSlide

Browse source
This commit is contained in:
Nickiel12 2021-12-20 14:05:48 -08:00
parent cdd61e16ef
commit cff1067ccf
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/stream_states/stream_states_class.rs
View file

@ -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;},

4
src/tests/state_update_tests.rs
View file

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

2
src/tests/states_io_handler_tests.rs
View file

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

2
src/tests/stream_states_tests.rs
View file

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