# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1502065792 14400
# Node ID 205427feb9feb7297ca2c70cf6f0c86b452784b6
# Parent  404182110a264282af33961e45bc1f45519fecb8
Update to build with the latest version of my utility library

diff -r 404182110a26 -r 205427feb9fe cl-chip8.asd
--- a/cl-chip8.asd	Tue Mar 14 13:27:13 2017 +0000
+++ b/cl-chip8.asd	Sun Aug 06 20:29:52 2017 -0400
@@ -9,7 +9,6 @@
 
   :depends-on (
                :bordeaux-threads
-               :cl-arrows
                :cl-opengl
                :cl-portaudio
                :iterate
diff -r 404182110a26 -r 205427feb9fe package.lisp
--- a/package.lisp	Tue Mar 14 13:27:13 2017 +0000
+++ b/package.lisp	Sun Aug 06 20:29:52 2017 -0400
@@ -3,15 +3,14 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :chip8.quickutils)
   (:export))
 
 
 (defpackage :chip8.gui.screen
-  (:use :cl+qt :iterate :losh :cl-arrows
+  (:use :cl+qt :iterate :losh
     :chip8.quickutils))
 
 (defpackage :chip8.gui.debugger
-  (:use :cl+qt :iterate :losh :cl-arrows
+  (:use :cl+qt :iterate :losh
     :chip8.quickutils))
diff -r 404182110a26 -r 205427feb9fe src/gui/screen.lisp
--- a/src/gui/screen.lisp	Tue Mar 14 13:27:13 2017 +0000
+++ b/src/gui/screen.lisp	Sun Aug 06 20:29:52 2017 -0400
@@ -108,7 +108,7 @@
   (q+:end-native-painting painter))
 
 (defun render-debug (screen painter)
-  (when (-> screen screen-chip chip8::chip-debugger chip8::debugger-paused)
+  (when (-<> screen screen-chip chip8::chip-debugger chip8::debugger-paused)
          (with-finalizing* ((font (q+:make-qfont "Menlo" 20))
                             (border-color (q+:make-qcolor 255 255 255))
                             (fill-color (q+:make-qcolor 0 0 0))
@@ -169,38 +169,38 @@
     ((q+:qt.key_3) #xB)
     ((q+:qt.key_0) #xF)))
 
-(defun pad-key-for (code)
-  ;; Original Chip-8 Pad → Laptop
-  ;; ┌─┬─┬─┬─┐             ┌─┬─┬─┬─┐
-  ;; │1│2│3│C│             │1│2│3│4│
-  ;; ├─┼─┼─┼─┤             ├─┼─┼─┼─┤
-  ;; │4│5│6│D│             │Q│W│E│R│
-  ;; ├─┼─┼─┼─┤             ├─┼─┼─┼─┤
-  ;; │7│8│9│E│             │A│S│D│F│
-  ;; ├─┼─┼─┼─┤             ├─┼─┼─┼─┤
-  ;; │A│0│B│F│             │Z│X│C│V│
-  ;; └─┴─┴─┴─┘             └─┴─┴─┴─┘
-  ;;
-  (qtenumcase code
-    ((q+:qt.key_1) #x1)
-    ((q+:qt.key_2) #x2)
-    ((q+:qt.key_3) #x3)
-    ((q+:qt.key_4) #xC)
+;; (defun pad-key-for (code)
+;;   ;; Original Chip-8 Pad → Laptop
+;;   ;; ┌─┬─┬─┬─┐             ┌─┬─┬─┬─┐
+;;   ;; │1│2│3│C│             │1│2│3│4│
+;;   ;; ├─┼─┼─┼─┤             ├─┼─┼─┼─┤
+;;   ;; │4│5│6│D│             │Q│W│E│R│
+;;   ;; ├─┼─┼─┼─┤             ├─┼─┼─┼─┤
+;;   ;; │7│8│9│E│             │A│S│D│F│
+;;   ;; ├─┼─┼─┼─┤             ├─┼─┼─┼─┤
+;;   ;; │A│0│B│F│             │Z│X│C│V│
+;;   ;; └─┴─┴─┴─┘             └─┴─┴─┴─┘
+;;   ;;
+;;   (qtenumcase code
+;;     ((q+:qt.key_1) #x1)
+;;     ((q+:qt.key_2) #x2)
+;;     ((q+:qt.key_3) #x3)
+;;     ((q+:qt.key_4) #xC)
 
-    ((q+:qt.key_q) #x4)
-    ((q+:qt.key_w) #x5)
-    ((q+:qt.key_e) #x6)
-    ((q+:qt.key_r) #xD)
+;;     ((q+:qt.key_q) #x4)
+;;     ((q+:qt.key_w) #x5)
+;;     ((q+:qt.key_e) #x6)
+;;     ((q+:qt.key_r) #xD)
 
-    ((q+:qt.key_a) #x7)
-    ((q+:qt.key_s) #x8)
-    ((q+:qt.key_d) #x9)
-    ((q+:qt.key_f) #xE)
+;;     ((q+:qt.key_a) #x7)
+;;     ((q+:qt.key_s) #x8)
+;;     ((q+:qt.key_d) #x9)
+;;     ((q+:qt.key_f) #xE)
 
-    ((q+:qt.key_z) #xA)
-    ((q+:qt.key_x) #x0)
-    ((q+:qt.key_c) #xB)
-    ((q+:qt.key_v) #xF)))
+;;     ((q+:qt.key_z) #xA)
+;;     ((q+:qt.key_x) #x0)
+;;     ((q+:qt.key_c) #xB)
+;;     ((q+:qt.key_v) #xF)))
 
 
 (define-override (screen key-press-event) (ev)
@@ -248,7 +248,7 @@
 
 
 (defun set-screen-wrapping (main-window enabled)
-  (setf (-<> main-window main-chip chip8::chip-screen-wrapping-enabled)
+  (setf (chip8::chip-screen-wrapping-enabled (main-chip main-window))
         enabled))
 
 (define-menu (main-window Display)
@@ -258,7 +258,7 @@
 
 
 (defun set-sound-type (main-window type)
-  (setf (-<> main-window main-chip chip8::chip-sound-type) type))
+  (setf (chip8::chip-sound-type (main-chip main-window)) type))
 
 (define-menu (main-window Sound)
   (:menu "Sound Type"