[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [314] branches/fusegl/fuse/fusepb

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

Revision: 314
          http://svn.sourceforge.net/fuse-for-macosx/?rev=314&view=rev
Author:   fredm
Date:     2007-04-03 02:28:08 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move interface 2 cartridge menus to Emulator object.

Modified Paths:
--------------
    branches/fusegl/fuse/fusepb/controllers/FuseController.m
    branches/fusegl/fuse/fusepb/models/Emulator.h
    branches/fusegl/fuse/fusepb/models/Emulator.m
    branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
    branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m

Modified: branches/fusegl/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 09:27:23 UTC (rev 313)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 09:28:08 UTC (rev 314)
@@ -47,7 +47,6 @@
 #include "event.h"
 #include "fuse.h"
 #include "if1.h"
-#include "if2.h"
 #include "libspectrum.h"
 #include "profile.h"
 #include "psg.h"
@@ -286,7 +285,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  error = if2_insert( filename );
+  error = [[DisplayOpenGLView instance] if2Insert:filename];
   if(error) goto error;
 
   [self addRecentSnapshot:filename];
@@ -301,7 +300,7 @@
 {
   [[DisplayOpenGLView instance] pause];
 
-  if2_eject();
+  [[DisplayOpenGLView instance] if2Eject];
 
   [[DisplayOpenGLView instance] unpause];
 }

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 09:27:23 UTC (rev 313)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 09:28:08 UTC (rev 314)
@@ -71,6 +71,9 @@
 -(void) pause;
 -(void) unpause;
 
+-(int) if2Insert:(const char *)filename;
+-(void) if2Eject;
+
 -(void) mouseMoved:(NSEvent *)theEvent;
 -(void) mouseDown:(NSEvent *)theEvent;
 -(void) mouseUp:(NSEvent *)theEvent;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 09:27:23 UTC (rev 313)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 09:28:08 UTC (rev 314)
@@ -29,6 +29,7 @@
 #include "event.h"
 #include "fuse.h"
 #include "fusepb/main.h"
+#include "if2.h"
 #include "keyboard.h"
 #include "machine.h"
 #include "settings.h"
@@ -205,6 +206,16 @@
   }
 }
 
+-(int) if2Insert:(const char *)filename
+{
+  return if2_insert( filename );
+}
+
+-(void) if2Eject
+{
+  if2_eject();
+}
+
 -(BOOL) isEmulating
 {  
   return isEmulating;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 09:27:23 UTC (rev 313)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 09:28:08 UTC (rev 314)
@@ -107,6 +107,9 @@
 -(void) pause;
 -(void) unpause;
 
+-(int) if2Insert:(const char *)filename;
+-(void) if2Eject;
+
 -(void) setDiskState:(NSNumber*)state;
 -(void) setTapeState:(NSNumber*)state;
 -(void) setMdrState:(NSNumber*)state;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 09:27:23 UTC (rev 313)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 09:28:08 UTC (rev 314)
@@ -599,6 +599,16 @@
   [proxy_emulator unpause];
 }
 
+-(int) if2Insert:(const char *)filename
+{
+  return [proxy_emulator if2Insert:filename];
+}
+
+-(void) if2Eject
+{
+  [proxy_emulator if2Eject];
+}
+
 -(void) setDiskState:(NSNumber*)state
 {
   disk_state = [state unsignedCharValue];


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