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

swapped type checks with convenience function

Browse source
This commit is contained in:
Nickiel12 2022-06-19 20:37:11 -07:00
parent b3a39afa12
commit cdb3666ad7
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/modules/message_handler.rs
View file

@ -41,7 +41,7 @@ impl MessageHandler for StreamState {
}, },
} }
if self.change_scene_on_slide_hotkey { if self.change_scene_on_slide_hotkey && !self.current_scene.is_camera() {
if self.timer_can_run { if self.timer_can_run {
self.timer_finished = false; self.timer_finished = false;
self.timer_start = SystemTime::now(); self.timer_start = SystemTime::now();
@ -82,14 +82,14 @@ impl MessageHandler for StreamState {
StateUpdate::TimerLength(value) => {self.timer_length = value; return (Some(update), None)}, StateUpdate::TimerLength(value) => {self.timer_length = value; return (Some(update), None)},
StateUpdate::TimerText(value) => {self.timer_text = value.clone(); return (Some(StateUpdate::TimerText(value)), None)}, StateUpdate::TimerText(value) => {self.timer_text = value.clone(); return (Some(StateUpdate::TimerText(value)), None)},
StateUpdate::SubScene(value) => { StateUpdate::SubScene(value) => {
if value.get_type() == Scenes::Camera { if value.get_type().is_camera() {
if self.current_scene == Scenes::Camera { if self.current_scene.is_camera() {
hotkey_handler.change_scene(Scenes::Camera, Some(value)); hotkey_handler.change_scene(Scenes::Camera, Some(value));
} }
self.camera_sub_scene = value; self.camera_sub_scene = value;
return (Some(update), None) return (Some(update), None)
} else if value.get_type() == Scenes::Screen { } else if value.get_type().is_screen() {
if self.current_scene == Scenes::Screen{ if self.current_scene.is_screen() {
hotkey_handler.change_scene(Scenes::Screen, Some(value)); hotkey_handler.change_scene(Scenes::Screen, Some(value));
} }
self.screen_sub_scene = value; self.screen_sub_scene = value;
@ -97,9 +97,10 @@ impl MessageHandler for StreamState {
} }
}, },
StateUpdate::Scene(value) => { StateUpdate::Scene(value) => {
println!("{:?}", value); println!("handling scene: {:?}", value);
if value == Scenes::Screen {
if self.current_scene != Scenes::Screen { if value.is_screen() {
if !self.current_scene.is_screen() {
self.timer_start = SystemTime::now(); self.timer_start = SystemTime::now();
self.timer_finished = false; self.timer_finished = false;
} }