[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [487] trunk/fuse/fusepb

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

Revision: 487
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=487&view=rev
Author:   fredm
Date:     2008-02-18 00:45:07 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
Don't use standard Fuse menu.c, move only function we use
(menu_select_roms_with_title) to FuseMenus.m.

Modified Paths:
--------------
    trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
    trunk/fuse/fusepb/FuseMenus.m

Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2008-02-18 07:33:15 UTC (rev 486)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2008-02-18 08:45:07 UTC (rev 487)
@@ -191,7 +191,6 @@
 		B6A6F1060B3D60D0000B88E9 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F520C8BC038D022E01A804BA /* OpenGL.framework */; };
 		B6A6F10E0B3D6360000B88E9 /* cocoaerror.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F10D0B3D6360000B88E9 /* cocoaerror.m */; };
 		B6A6F1200B3EA737000B88E9 /* cocoascreenshot.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F11E0B3EA737000B88E9 /* cocoascreenshot.m */; };
-		B6AB34900C3BC91A0005935E /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = B6AB348E0C3BC91A0005935E /* menu.c */; };
 		B6B076B30B59FE9A00D4F95C /* Emulator.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B076B10B59FE9A00D4F95C /* Emulator.m */; };
 		B6B99F8A0B5F798700EE408F /* cocoadisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B99F890B5F798700EE408F /* cocoadisplay.m */; };
 		B6CA27A70C2CDBC500F06FB3 /* dirty.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CA27A50C2CDBC500F06FB3 /* dirty.c */; };
@@ -428,7 +427,6 @@
 		B6A7F0E904C9A11D001025EB /* NumberFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberFormatter.h; sourceTree = "<group>"; };
 		B6A7F0EA04C9A11D001025EB /* NumberFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NumberFormatter.m; sourceTree = "<group>"; };
 		B6AA8A3C03D2FC1C00FED55D /* trdos.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = trdos.rom; path = ../roms/trdos.rom; sourceTree = SOURCE_ROOT; };
-		B6AB348E0C3BC91A0005935E /* menu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = menu.c; sourceTree = "<group>"; };
 		B6AB348F0C3BC91A0005935E /* menu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
 		B6AB429D0677466E007C50EF /* ula.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ula.c; path = ../ula.c; sourceTree = SOURCE_ROOT; };
 		B6AB429E0677466E007C50EF /* ula.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ula.h; path = ../ula.h; sourceTree = SOURCE_ROOT; };
@@ -1168,7 +1166,6 @@
 				B6403FD70A7E4B1A00E00B11 /* loader.h */,
 				B60B11F7059BC7E70048B64B /* machine.c */,
 				F55985EA038922ED01A804BA /* machine.h */,
-				B6AB348E0C3BC91A0005935E /* menu.c */,
 				B6AB348F0C3BC91A0005935E /* menu.h */,
 				B68CB2CC03DD923C00A804BA /* memory.c */,
 				B6CA2A210C33F8490003CF90 /* module.c */,
@@ -1471,7 +1468,6 @@
 				B6CA27A70C2CDBC500F06FB3 /* dirty.c in Sources */,
 				B6CA2A230C33F84A0003CF90 /* module.c in Sources */,
 				B6CA2A2E0C33F8C10003CF90 /* plusd.c in Sources */,
-				B6AB34900C3BC91A0005935E /* menu.c in Sources */,
 				B6CADD580C47AD90004BA954 /* Texture.m in Sources */,
 				B63225EC0C66BA1300BB081B /* osname.c in Sources */,
 				B63225EE0C66BA3700BB081B /* paths.c in Sources */,

Modified: trunk/fuse/fusepb/FuseMenus.m
===================================================================
--- trunk/fuse/fusepb/FuseMenus.m	2008-02-18 07:33:15 UTC (rev 486)
+++ trunk/fuse/fusepb/FuseMenus.m	2008-02-18 08:45:07 UTC (rev 487)
@@ -31,7 +31,93 @@
 #import "FuseController.h"
 #import "FuseMenus.h"
 
+#include "divide.h"
+#include "if1.h"
+#include "menu.h"
+#include "settings.h"
+#include "simpleide.h"
+#include "tape.h"
+#include "zxatasp.h"
+#include "zxcf.h"
+
 void SetEmulationHz( float hz )
 {
   [[Emulator instance] setEmulationHz:hz];
 }
+
+int
+menu_check_media_changed( void )
+{
+  int confirm, i;
+
+  confirm = tape_close(); if( confirm ) return 1;
+
+#ifdef HAVE_765_H
+
+  confirm = specplus3_disk_eject( SPECPLUS3_DRIVE_A, 0 );
+  if( confirm ) return 1;
+
+  confirm = specplus3_disk_eject( SPECPLUS3_DRIVE_B, 0 );
+  if( confirm ) return 1;
+
+#endif			/* #ifdef HAVE_765_H */
+
+  confirm = beta_disk_eject( BETA_DRIVE_A, 0 );
+  if( confirm ) return 1;
+
+  confirm = beta_disk_eject( BETA_DRIVE_B, 0 );
+  if( confirm ) return 1;
+
+  confirm = beta_disk_eject( BETA_DRIVE_C, 0 );
+  if( confirm ) return 1;
+
+  confirm = beta_disk_eject( BETA_DRIVE_D, 0 );
+  if( confirm ) return 1;
+
+  confirm = plusd_disk_eject( PLUSD_DRIVE_1, 0 );
+  if( confirm ) return 1;
+
+  confirm = plusd_disk_eject( PLUSD_DRIVE_2, 0 );
+  if( confirm ) return 1;
+
+  for( i = 0; i < 8; i++ ) {
+    confirm = if1_mdr_eject( i, 0 );
+    if( confirm ) return 1;
+  }
+
+  if( settings_current.simpleide_master_file ) {
+    confirm = simpleide_eject( LIBSPECTRUM_IDE_MASTER );
+    if( confirm ) return 1;
+  }
+
+  if( settings_current.simpleide_slave_file ) {
+    confirm = simpleide_eject( LIBSPECTRUM_IDE_SLAVE );
+    if( confirm ) return 1;
+  }
+
+  if( settings_current.zxatasp_master_file ) {
+    confirm = zxatasp_eject( LIBSPECTRUM_IDE_MASTER );
+    if( confirm ) return 1;
+  }
+
+  if( settings_current.zxatasp_slave_file ) {
+    confirm = zxatasp_eject( LIBSPECTRUM_IDE_SLAVE );
+    if( confirm ) return 1;
+  }
+
+  if( settings_current.zxcf_pri_file ) {
+    confirm = zxcf_eject(); if( confirm ) return 1;
+  }
+
+  if( settings_current.divide_master_file ) {
+    confirm = divide_eject( LIBSPECTRUM_IDE_MASTER );
+    if( confirm ) return 1;
+  }
+
+  if( settings_current.divide_slave_file ) {
+    confirm = divide_eject( LIBSPECTRUM_IDE_SLAVE );
+    if( confirm ) return 1;
+  }
+
+  return 0;
+}


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