From 857f187d96c92c35e2848aa320cf93ee3be8cf28 Mon Sep 17 00:00:00 2001
From: Jorj Bauer <jorj@jorj.org>
Date: Thu, 9 Jul 2020 02:50:56 -0400
Subject: [PATCH] remove obsolete display/sound priority option

---
 bios.cpp          | 23 ++++++-----------------
 globals.cpp       |  1 -
 globals.h         |  1 -
 prefsstore.h      |  3 +--
 sdl/aiie.cpp      |  2 --
 teensy/teensy.ino |  2 --
 6 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/bios.cpp b/bios.cpp
index b329a5b..07a9e32 100644
--- a/bios.cpp
+++ b/bios.cpp
@@ -28,12 +28,11 @@ enum {
   ACT_VOLMINUS = 12,
   ACT_SUSPEND = 13,
   ACT_RESTORE = 14,
-  ACT_PRIMODE = 15,
-  ACT_PADX_INV = 16,
-  ACT_PADY_INV = 17,
-  ACT_PADDLES = 18,
-  ACT_SPEED = 19,
-  ACT_ABOUT = 20,
+  ACT_PADX_INV = 15,
+  ACT_PADY_INV = 16,
+  ACT_PADDLES = 17,
+  ACT_SPEED = 18,
+  ACT_ABOUT = 19,
 };
 
 #define NUM_TITLES 4
@@ -45,7 +44,7 @@ const uint8_t aiieActions[] = { ACT_ABOUT };
 const uint8_t vmActions[] = { ACT_EXIT, ACT_RESET, ACT_COLDBOOT, ACT_MONITOR,
 			      ACT_DEBUG, ACT_SUSPEND, ACT_RESTORE };
 const uint8_t hardwareActions[] = { ACT_DISPLAYTYPE,  ACT_SPEED,
-				    ACT_PRIMODE, ACT_PADX_INV, ACT_PADY_INV,
+				    ACT_PADX_INV, ACT_PADY_INV,
 				    ACT_PADDLES, ACT_VOLPLUS, ACT_VOLMINUS };
 const uint8_t diskActions[] = { ACT_DISK1, ACT_DISK2, 
 				ACT_HD1, ACT_HD2 };
@@ -167,9 +166,6 @@ bool BIOS::runUntilDone()
       g_debugMode++;
       g_debugMode %= 9; // FIXME: abstract max #
       break;
-    case ACT_PRIMODE:
-      g_prioritizeDisplay = !g_prioritizeDisplay;
-      break;
     case ACT_DISK1:
       if (((AppleVM *)g_vm)->DiskName(0)[0] != '\0') {
 	((AppleVM *)g_vm)->ejectDisk(0);
@@ -372,7 +368,6 @@ bool BIOS::isActionActive(int8_t action)
   case ACT_SPEED:
   case ACT_ABOUT:
   case ACT_DEBUG:
-  case ACT_PRIMODE:
   case ACT_DISK1:
   case ACT_DISK2:
   case ACT_HD1:
@@ -537,12 +532,6 @@ void BIOS::DrawHardwareMenu()
 	}
       }
       break;
-    case ACT_PRIMODE:
-      if (g_prioritizeDisplay)
-	strcpy(buf, "Prioritize display over audio");
-      else
-	strcpy(buf, "Prioritize audio over display");
-      break;
     case ACT_PADX_INV:
       if (g_invertPaddleX)
 	strcpy(buf, "Paddle X inverted");
diff --git a/globals.cpp b/globals.cpp
index 90045d7..3ad428c 100644
--- a/globals.cpp
+++ b/globals.cpp
@@ -13,7 +13,6 @@ int8_t g_volume = 15;
 uint8_t g_displayType = 3; // FIXME m_perfectcolor
 VMRam g_ram;
 volatile uint8_t g_debugMode = D_NONE;
-bool g_prioritizeDisplay = false;
 volatile bool g_biosInterrupt = false;
 uint32_t g_speed = 1023000; // Hz
 bool g_invertPaddleX = false;
diff --git a/globals.h b/globals.h
index 1162169..2a6b5aa 100644
--- a/globals.h
+++ b/globals.h
@@ -48,7 +48,6 @@ extern int8_t g_volume;
 extern uint8_t g_displayType;
 extern VMRam g_ram;
 extern volatile uint8_t g_debugMode;
-extern bool g_prioritizeDisplay;
 extern volatile bool g_biosInterrupt;
 extern uint32_t g_speed;
 extern bool g_invertPaddleX;
diff --git a/prefsstore.h b/prefsstore.h
index 8a1af57..d4dcce9 100644
--- a/prefsstore.h
+++ b/prefsstore.h
@@ -6,7 +6,7 @@
 // Fun trivia: the Apple //e was in production from January 1983 to
 // November 1993. And the 65C02 in them supported weird BCD math modes.
 #define PREFSMAGIC 0x01831093
-#define PREFSVERSION 2
+#define PREFSVERSION 3
 
 #ifndef MAXPATH
 #define MAXPATH 255
@@ -22,7 +22,6 @@ typedef struct _prefs {
   uint8_t volume;
   uint8_t displayType;
   uint8_t debug;
-  uint8_t priorityMode;
   uint8_t speed;
 
   uint8_t invertPaddleX;
diff --git a/sdl/aiie.cpp b/sdl/aiie.cpp
index bb10eff..e124491 100644
--- a/sdl/aiie.cpp
+++ b/sdl/aiie.cpp
@@ -432,7 +432,6 @@ void readPrefs()
     g_volume = p.volume;
     g_displayType = p.displayType;
     g_debugMode = p.debug;
-    g_prioritizeDisplay = p.priorityMode;
     g_speed = (p.speed * (1023000/2)); // steps of half normal speed
     if (g_speed < (1023000/2))
       g_speed = (1023000/2);
@@ -467,7 +466,6 @@ void writePrefs()
   p.volume = g_volume;
   p.displayType = g_displayType;
   p.debug = g_debugMode;
-  p.priorityMode = g_prioritizeDisplay;
   p.speed = g_speed / (1023000/2);
   strcpy(p.disk1, ((AppleVM *)g_vm)->DiskName(0));
   strcpy(p.disk2, ((AppleVM *)g_vm)->DiskName(1));
diff --git a/teensy/teensy.ino b/teensy/teensy.ino
index 50b9b55..2c014fb 100644
--- a/teensy/teensy.ino
+++ b/teensy/teensy.ino
@@ -491,7 +491,6 @@ void readPrefs()
     g_volume = p.volume;
     g_displayType = p.displayType;
     g_debugMode = p.debug;
-    g_prioritizeDisplay = p.priorityMode;
     g_speed = (p.speed * (1023000/2)); // steps of half normal speed
     if (g_speed < (1023000/2))
       g_speed = (1023000/2);
@@ -533,7 +532,6 @@ void writePrefs()
   p.volume = g_volume;
   p.displayType = g_displayType;
   p.debug = g_debugMode;
-  p.priorityMode = g_prioritizeDisplay;
   p.speed = g_speed / (1023000/2);
   strcpy(p.disk1, ((AppleVM *)g_vm)->DiskName(0));
   strcpy(p.disk2, ((AppleVM *)g_vm)->DiskName(1));