[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[779] trunk/fuse/fusepb/controllers/ FuseController.m

[<fr...@us...>]

Revision: 779
          http://sourceforge.net/p/fuse-for-macosx/code/779
Author:   fredm
Date:     2014-08-14 14:04:13 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
PERIPH_TYPE_BETA128_PENTAGON and PERIPH_TYPE_BETA128_PENTAGON_LATE indicate that
PERIPH_TYPE_BETA128 type actions should be allowed too.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/FuseController.m

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2014-07-25 13:03:15 UTC (rev 778)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2014-08-14 14:04:13 UTC (rev 779)
@@ -189,6 +189,13 @@
   return 0;
 }
 
+static int
+is_beta_active( void ) {
+  return ( periph_is_active( PERIPH_TYPE_BETA128 ) ||
+           periph_is_active( PERIPH_TYPE_BETA128_PENTAGON ) ||
+           periph_is_active( PERIPH_TYPE_BETA128_PENTAGON_LATE ) );
+}
+
 @implementation FuseController
 
 static FuseController *singleton = nil;
@@ -1277,7 +1284,7 @@
   if( !machine_current ) {
   } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     newValue = diskPlus3FlipA;
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     newValue = diskTrDosFlipA;
   } else {
     newValue = diskPlusDFlipA;
@@ -1293,7 +1300,7 @@
   if( !machine_current ) {
   } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     newValue = diskPlus3FlipB;
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     newValue = diskTrDosFlipB;
   } else {
     newValue = diskPlusDFlipB;
@@ -1309,7 +1316,7 @@
   if( !machine_current ) {
   } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     newValue = diskPlus3WpA;
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     newValue = diskTrDosWpA;
   } else {
     newValue = diskPlusDWpA;
@@ -1325,7 +1332,7 @@
   if( !machine_current ) {
   } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     newValue = diskPlus3WpB;
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     newValue = diskTrDosWpB;
   } else {
     newValue = diskPlusDWpB;
@@ -2104,7 +2111,7 @@
 
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     [[DisplayOpenGLView instance] specplus3DiskInsertNew:drive];
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     [[DisplayOpenGLView instance] betaDiskInsertNew:drive];
   } else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
     [[DisplayOpenGLView instance] opusDiskInsertNew:drive];
@@ -2127,7 +2134,7 @@
 
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     fileTypes = plus3FileTypes;
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     fileTypes = betaFileTypes;
   } else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
     fileTypes = opusFileTypes;
@@ -2135,7 +2142,8 @@
     fileTypes = plusdFileTypes;
   }
 
-  if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 || periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ||
+      is_beta_active() ) {
     message = ( drive == SPECPLUS3_DRIVE_A ? @"Insert disk into drive A:" :
                                              @"Insert disk into drive B:" );
   } else {
@@ -2151,7 +2159,7 @@
 
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     [[DisplayOpenGLView instance] specplus3DiskInsert:filename inDrive:drive];
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     [[DisplayOpenGLView instance] betaDiskInsert:filename inDrive:drive];
   } else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
     [[DisplayOpenGLView instance] opusDiskInsert:filename inDrive:drive];
@@ -2676,7 +2684,7 @@
   [[DisplayOpenGLView instance] pause];
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     [[DisplayOpenGLView instance] specplus3DiskEject:drive];
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     [[DisplayOpenGLView instance] betaDiskEject:drive];
   } else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
     [[DisplayOpenGLView instance] opusDiskEject:drive];
@@ -2694,7 +2702,7 @@
   [[DisplayOpenGLView instance] pause];
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     [[DisplayOpenGLView instance] specplus3DiskSave:drive saveAs:saveas];
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     [[DisplayOpenGLView instance] betaDiskSave:drive saveAs:saveas];
   } else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
     [[DisplayOpenGLView instance] opusDiskSave:drive saveAs:saveas];
@@ -2712,7 +2720,7 @@
   [[DisplayOpenGLView instance] pause];
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     [[DisplayOpenGLView instance] specplus3DiskFlip:drive side:flip];
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     [[DisplayOpenGLView instance] betaDiskFlip:drive side:flip];
   } else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
     [[DisplayOpenGLView instance] opusDiskFlip:drive side:flip];
@@ -2730,7 +2738,7 @@
   [[DisplayOpenGLView instance] pause];
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     [[DisplayOpenGLView instance] specplus3DiskWriteProtect:drive protect:wrprot];
-  } else if( periph_is_active( PERIPH_TYPE_BETA128 ) ) {
+  } else if( is_beta_active() ) {
     [[DisplayOpenGLView instance] betaDiskWriteProtect:drive protect:wrprot];
   } else if( periph_is_active( PERIPH_TYPE_OPUS ) ) {
     [[DisplayOpenGLView instance] opusDiskWriteProtect:drive protect:wrprot];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.