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

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

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

Log Message:
-----------
Move reset menu 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:28:08 UTC (rev 314)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 09:34:24 UTC (rev 315)
@@ -459,7 +459,7 @@
 {
   [[DisplayOpenGLView instance] pause];
 
-  machine_reset();
+  [[DisplayOpenGLView instance] reset];
 
   [[DisplayOpenGLView instance] unpause];
 }

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 09:28:08 UTC (rev 314)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 09:34:24 UTC (rev 315)
@@ -70,6 +70,7 @@
 -(void) cocoaBreak;
 -(void) pause;
 -(void) unpause;
+-(void) reset;
 
 -(int) if2Insert:(const char *)filename;
 -(void) if2Eject;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 09:28:08 UTC (rev 314)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 09:34:24 UTC (rev 315)
@@ -206,6 +206,11 @@
   }
 }
 
+-(void) reset
+{
+  machine_reset();
+}
+
 -(int) if2Insert:(const char *)filename
 {
   return if2_insert( filename );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 09:28:08 UTC (rev 314)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 09:34:24 UTC (rev 315)
@@ -106,6 +106,7 @@
 -(void) cocoaBreak;
 -(void) pause;
 -(void) unpause;
+-(void) reset;
 
 -(int) if2Insert:(const char *)filename;
 -(void) if2Eject;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 09:28:08 UTC (rev 314)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 09:34:24 UTC (rev 315)
@@ -599,6 +599,11 @@
   [proxy_emulator unpause];
 }
 
+-(void) reset
+{
+  [proxy_emulator reset];
+}
+
 -(int) if2Insert:(const char *)filename
 {
   return [proxy_emulator if2Insert:filename];


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