diff options
Diffstat (limited to 'src/desktop/input.rs')
-rw-r--r-- | src/desktop/input.rs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/desktop/input.rs b/src/desktop/input.rs index ed604e2..4653d3c 100644 --- a/src/desktop/input.rs +++ b/src/desktop/input.rs @@ -5,6 +5,7 @@ use crate::desktop::window::Keys; use crate::io::Input; use gilrs::{Button, GamepadId, Gilrs}; use winit::keyboard::KeyCode; +use crate::logs::{elog, log, LogLevel}; pub struct Gamepad { gilrs: Gilrs, @@ -17,10 +18,10 @@ impl Gamepad { let gilrs = Gilrs::new().unwrap(); let gamepad_id = if let Some((gamepad_id, _gamepad)) = gilrs.gamepads().next() { - println!("Found Gamepad id: {:?}", gamepad_id); + log(LogLevel::Infos, format!("Gamepad connected: {:?}", gamepad_id)); Some(gamepad_id) } else { - println!("No gamepad found"); + log(LogLevel::Infos, format!("No gamepad found")); None }; @@ -44,12 +45,12 @@ impl Input for Gamepad { fn update_events(&mut self, _cycles: u128) -> Option<u128> { if let Some(gamepad_id) = self.gamepad_id { if self.gilrs.connected_gamepad(gamepad_id).is_none() { - println!("Gamepad (id = {:?}) disconnected", gamepad_id); + log(LogLevel::Infos, format!("Gamepad disconnected: {:?}", gamepad_id)); self.gamepad_id = None; } } else { if let Some((gamepad_id, _gamepad)) = self.gilrs.gamepads().next() { - println!("Found Gamepad id: {:?}", gamepad_id); + log(LogLevel::Infos, format!("Gamepad connected: {:?}", gamepad_id)); self.gamepad_id = Some(gamepad_id); } } @@ -226,21 +227,21 @@ impl Input for GamepadRecorder { let new_direction_reg = self.input.get_direction_gamepad_reg(); if self.action_reg != new_action_reg || self.direction_reg != new_direction_reg { - println!( + log(LogLevel::Debug, format!( "input update on cycle {} ! 0x{:02x} 0x{:02x}", cycles, new_action_reg, new_direction_reg - ); + )); if let Err(err) = self.record_file.write_all(&cycles.to_le_bytes()) { - eprintln!("Failed to write to record file: {}", err); + elog(LogLevel::Error, format!("Failed to write to record file: {}", err)); }; if let Err(err) = self .record_file .write_all(&[new_action_reg, new_direction_reg]) { - eprintln!("Failed to write to record file: {}", err); + elog(LogLevel::Error, format!("Failed to write to record file: {}", err)); } if let Err(err) = self.record_file.flush() { - eprintln!("Failed to flush record file writes: {}", err); + elog(LogLevel::Error, format!("Failed to flush record file writes: {}", err)); } } @@ -331,8 +332,6 @@ impl Input for GamepadReplay { return false; } if self.next_cycle_update == None { - println!("SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE SAVE"); - self.last_save_state = true; return true; } |