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

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

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

Log Message:
-----------
Move dck menus over 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:34:24 UTC (rev 315)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 09:41:00 UTC (rev 316)
@@ -42,7 +42,6 @@
 
 #import "DisplayOpenGLView.h"
 
-#include "dck.h"
 #include "divide.h"
 #include "event.h"
 #include "fuse.h"
@@ -254,7 +253,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  error = dck_insert( filename );
+  error = [[DisplayOpenGLView instance] dckInsert:filename];
   if(error) goto error;
 
   [self addRecentSnapshot:filename];
@@ -269,7 +268,7 @@
 {
   [[DisplayOpenGLView instance] pause];
 
-  dck_eject();
+  [[DisplayOpenGLView instance] dckEject];
 
   [[DisplayOpenGLView instance] unpause];
 }

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 09:34:24 UTC (rev 315)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 09:41:00 UTC (rev 316)
@@ -75,6 +75,9 @@
 -(int) if2Insert:(const char *)filename;
 -(void) if2Eject;
 
+-(int) dckInsert:(const char *)filename;
+-(void) dckEject;
+
 -(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:34:24 UTC (rev 315)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 09:41:00 UTC (rev 316)
@@ -25,6 +25,7 @@
 #import "DisplayOpenGLView.h"
 #import "Emulator.h"
 
+#include "dck.h"
 #include "debugger/debugger.h"
 #include "event.h"
 #include "fuse.h"
@@ -221,6 +222,16 @@
   if2_eject();
 }
 
+-(int) dckInsert:(const char *)filename
+{
+  return dck_insert( filename );
+}
+
+-(void) dckEject
+{
+  dck_eject();
+}
+
 -(BOOL) isEmulating
 {  
   return isEmulating;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 09:34:24 UTC (rev 315)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 09:41:00 UTC (rev 316)
@@ -111,6 +111,9 @@
 -(int) if2Insert:(const char *)filename;
 -(void) if2Eject;
 
+-(int) dckInsert:(const char *)filename;
+-(void) dckEject;
+
 -(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:34:24 UTC (rev 315)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 09:41:00 UTC (rev 316)
@@ -614,6 +614,16 @@
   [proxy_emulator if2Eject];
 }
 
+-(int) dckInsert:(const char *)filename
+{
+  return [proxy_emulator dckInsert:filename];
+}
+
+-(void) dckEject
+{
+  [proxy_emulator dckEject];
+}
+
 -(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.