Screen pause bug fixed

src/emulator.rs

@@ -224,13 +224,11 @@ impl Emu {
     fn playpause(&mut self, p: bool) {
         self.t_last_update = None;
         self.playing = p;
+        self.bus.set_pause(p);
         if p {
-            self.bus.turn_on();
             // Perform one tick ignoring breakpoints, in case we're stopped on one.
             self.tick_ignore_breakpoints();
             thread::sleep(Duration::from_secs_f32(1. / self.tick_rate));
-        } else {
-            self.bus.turn_off()
         }
     }
 

src/emulator/devices.rs

@@ -26,8 +26,10 @@ pub(crate) trait Device {
     fn reset(&mut self);
     /// Turns this device on.
     fn on(&mut self);
-    /// Turns this device off (but might not fully clear its state).
+    /// Turns this device off.
     fn off(&mut self);
+    /// Pausing stops time for this device.
+    fn set_pause(&mut self, paused: bool);
 }
 
 /// Memory Mapped IO: Any device that occupies memory addresses shall implement this trait.
@@ -131,6 +133,7 @@ impl Bus {
         }
     }
 
+    /// Clear all state
     pub(crate) fn reset(&mut self) {
         self.crt.reset();
         self.display.reset();
@@ -140,6 +143,8 @@ impl Bus {
         self.ram.reset();
         self.rtc.reset();
     }
+
+    /// Turn the device on. May affect state, not suitable for "pausing" the device.
     pub(crate) fn turn_on(&mut self) {
         self.crt.on();
         self.display.on();
@@ -149,6 +154,8 @@ impl Bus {
         self.ram.on();
         self.rtc.on();
     }
+
+    /// Turn the device off. May affect state, not suitable for "pausing" the device.
     pub(crate) fn turn_off(&mut self) {
         self.crt.off();
         self.display.off();
@@ -158,4 +165,14 @@ impl Bus {
         self.ram.off();
         self.rtc.off();
     }
+
+    pub(crate) fn set_pause(&mut self, paused: bool){
+        self.crt.set_pause(paused);
+        self.display.set_pause(paused);
+        self.kbd.set_pause(paused);
+        //self.pic.set_pause(paused);
+        self.psg.set_pause(paused);
+        self.ram.set_pause(paused);
+        self.rtc.set_pause(paused);
+    }
 }

src/emulator/devices/dev_crt.rs

@@ -27,6 +27,7 @@ impl Device for DevCRT {
     fn reset(&mut self) {}
     fn on(&mut self) {}
     fn off(&mut self) {}
+    fn set_pause(&mut self, _paused: bool) {}
 }
 
 /// Port 0: crt output

src/emulator/devices/dev_display_classic.rs

@@ -21,22 +21,23 @@ impl Default for DevDisplayClassic {
     fn default() -> Self {
         Self {
             tx: None,
-            framebuffer: vec![image::Rgba([0, 0, 0, 255,]); 120 * 160],
+            framebuffer: vec![Rgba([0, 0, 0, 255, ]); 120 * 160],
             interrupt: false,
         }
     }
 }
 
 impl Device for DevDisplayClassic {
     fn reset(&mut self) {
-        self.framebuffer = vec![image::Rgba([0, 0, 0, 255,]); 120 * 160];
+        self.framebuffer = vec![Rgba([0, 0, 0, 255, ]); 120 * 160];
         self.interrupt = false
     }
     fn on(&mut self) {}
     fn off(&mut self) {
-        self.framebuffer = vec![image::Rgba([0, 0, 0, 255,]); 120 * 160];
+        self.framebuffer = vec![Rgba([0, 0, 0, 255, ]); 120 * 160];
         self.interrupt = false
     }
+    fn set_pause(&mut self, _paused: bool) {}
 }
 
 impl DevDisplayClassic {
@@ -59,13 +60,13 @@ impl MMIO for DevDisplayClassic {
             return Err(());
         }
         let color = self.framebuffer[addr];
-        Ok((color[0] << 4) as i32 + (color[1]) as i32 + (color[2] >> 4) as i32)
+        Ok((color[0] << 4) as i32 + color[1] as i32 + (color[2] >> 4) as i32)
     }
     fn write(&mut self, addr: usize, value: i32) -> Result<(), ()> {
         if addr >= self.framebuffer.len() {
             return Err(());
         }
-        let color = Rgba([(value >> 4) as u8, (value) as u8, (value << 4) as u8, 255]);
+        let color = Rgba([(value >> 4) as u8, value as u8, (value << 4) as u8, 255]);
         self.framebuffer[addr] = color;
         Ok(())
     }

src/emulator/devices/dev_kbd.rs

@@ -32,6 +32,7 @@ impl Device for DevKBD {
     fn reset(&mut self) {}
     fn on(&mut self) {}
     fn off(&mut self) {}
+    fn set_pause(&mut self, _paused: bool) {}
 }
 
 impl PMIO for DevKBD {

src/emulator/devices/dev_psg.rs

@@ -25,6 +25,7 @@ mod noise_channel;
 mod note_table;
 mod pulse_channel;
 mod ramp_channel;
+
 use self::noise_channel::NoiseChannel;
 use self::note_table::key_freq;
 use self::pulse_channel::PulseChannel;
@@ -35,6 +36,7 @@ const SAMPLE_RATE: u32 = 22050;
 /// Device struct.
 ///
 pub(crate) struct DevPSG {
+    paused: bool,
     #[allow(dead_code)] // Output stream is never "used", but we have to keep it around in order to
     // get sound.
     stream: Option<OutputStream>,
@@ -95,6 +97,7 @@ impl Default for DevPSG {
         sink3.append(AudioSource::new(ch3.clone()));
 
         DevPSG {
+            paused: false,
             stream,
             sink0,
             sink1,
@@ -137,6 +140,20 @@ impl Device for DevPSG {
         self.sink2.pause();
         self.sink3.pause();
     }
+
+    fn set_pause(&mut self, paused: bool) {
+        if paused {
+            self.sink0.pause();
+            self.sink1.pause();
+            self.sink2.pause();
+            self.sink3.pause();
+        } else {
+            self.sink0.play();
+            self.sink1.play();
+            self.sink2.play();
+            self.sink3.play();
+        }
+    }
 }
 
 impl MMIO for DevPSG {

src/emulator/devices/dev_ram.rs

@@ -24,6 +24,7 @@ impl Device for DevRAM {
     }
     fn on(&mut self) {}
     fn off(&mut self) {}
+    fn set_pause(&mut self, _paused: bool) {}
 }
 
 impl MMIO for DevRAM {

src/emulator/devices/dev_rtc.rs

@@ -17,6 +17,7 @@ impl Device for DevRTC {
     fn reset(&mut self) {}
     fn on(&mut self) {}
     fn off(&mut self) {}
+    fn set_pause(&mut self, _paused: bool) {}
 }
 
 impl PMIO for DevRTC {