fuse-for-macosx-commits Mailing List for Fuse for macOS (Page 21)

Brought to you by: fredm

fuse-for-macosx-commits — Tracks commits to the repostiory

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (9)	Dec (31)
2007	Jan (24)	Feb (11)	Mar (6)	Apr (48)	May (9)	Jun (38)	Jul (33)	Aug (15)	Sep	Oct (3)	Nov (6)	Dec (3)
2008	Jan	Feb (24)	Mar (11)	Apr (22)	May (7)	Jun	Jul	Aug	Sep (2)	Oct (3)	Nov (18)	Dec (23)
2009	Jan (16)	Feb (1)	Mar (1)	Apr	May	Jun (7)	Jul (4)	Aug (11)	Sep (9)	Oct	Nov (3)	Dec (2)
2010	Jan (1)	Feb	Mar (1)	Apr (2)	May (8)	Jun	Jul	Aug (2)	Sep (2)	Oct (9)	Nov	Dec (8)
2011	Jan	Feb	Mar	Apr (7)	May	Jun	Jul	Aug	Sep	Oct (5)	Nov (2)	Dec
2012	Jan (4)	Feb (5)	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (10)	Nov (13)	Dec (11)
2013	Jan (4)	Feb (1)	Mar (8)	Apr (8)	May (16)	Jun (5)	Jul	Aug	Sep	Oct	Nov	Dec (4)
2014	Jan	Feb (6)	Mar (2)	Apr (1)	May	Jun	Jul (1)	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb	Mar (2)	Apr	May	Jun (5)	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar (1)	Apr	May (10)	Jun (9)	Jul (6)	Aug (5)	Sep (3)	Oct (6)	Nov (5)	Dec

Flat | Threaded

<< < 1 .. 19 20 21 22 23 .. 25 > >> (Page 21 of 25)

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

From: <fr...@us...> - 2007-04-06 01:42:17

Revision: 337
          http://svn.sourceforge.net/fuse-for-macosx/?rev=337&view=rev
Author:   fredm
Date:     2007-04-05 18:42:18 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Move keyboard joystick toggle 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-06 01:37:10 UTC (rev 336)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-06 01:42:18 UTC (rev 337)
@@ -708,13 +708,7 @@
 
 - (IBAction)joystick_keyboard:(id)sender
 {
-    if ( settings_current.joy_keyboard ) {
-      settings_current.joy_keyboard = 0;
-      return;
-    } else {
-      settings_current.joy_keyboard = 1;
-      return;
-    }
+  [[DisplayOpenGLView instance] joystickToggleKeyboard];
 }
 
 - (IBAction)tape_clear:(id)sender

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:37:10 UTC (rev 336)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:42:18 UTC (rev 337)
@@ -90,6 +90,8 @@
 
 -(void) fullscreen;
 
+-(void) joystickToggleKeyboard;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:37:10 UTC (rev 336)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:42:18 UTC (rev 337)
@@ -288,6 +288,11 @@
   settings_current.full_screen = 1;
 }
 
+-(void) joystickToggleKeyboard
+{
+  settings_current.joy_keyboard = !settings_current.joy_keyboard;
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return rzx_start_playback( filename );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:37:10 UTC (rev 336)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:42:18 UTC (rev 337)
@@ -126,6 +126,8 @@
 
 -(void) fullscreen;
 
+-(void) joystickToggleKeyboard;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:37:10 UTC (rev 336)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:42:18 UTC (rev 337)
@@ -669,6 +669,11 @@
   [proxy_emulator fullscreen];
 }
 
+-(void) joystickToggleKeyboard
+{
+  [proxy_emulator joystickToggleKeyboard];
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return [proxy_emulator rzxStartPlayback:filename];


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

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

From: <fr...@us...> - 2007-04-06 01:37:09

Revision: 336
          http://svn.sourceforge.net/fuse-for-macosx/?rev=336&view=rev
Author:   fredm
Date:     2007-04-05 18:37:10 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Move save options 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-06 01:34:45 UTC (rev 335)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-06 01:37:10 UTC (rev 336)
@@ -698,7 +698,7 @@
 
 - (IBAction)save_options:(id)sender
 {
-  settings_write_config( &settings_current );
+  [[DisplayOpenGLView instance] saveOptions];
 }
 
 - (IBAction)fullscreen:(id)sender

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:34:45 UTC (rev 335)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:37:10 UTC (rev 336)
@@ -86,6 +86,8 @@
 -(void) profileStart;
 -(void) profileFinish:(const char *)filename;
 
+-(void) saveOptions;
+
 -(void) fullscreen;
 
 -(int) rzxStartPlayback:(const char *)filename;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:34:45 UTC (rev 335)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:37:10 UTC (rev 336)
@@ -278,6 +278,11 @@
   profile_finish( filename );
 }
 
+-(void) saveOptions
+{
+  settings_write_config( &settings_current );
+}
+
 -(void) fullscreen
 {
   settings_current.full_screen = 1;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:34:45 UTC (rev 335)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:37:10 UTC (rev 336)
@@ -122,6 +122,8 @@
 -(void) profileStart;
 -(void) profileFinish:(const char *)filename;
 
+-(void) saveOptions;
+
 -(void) fullscreen;
 
 -(int) rzxStartPlayback:(const char *)filename;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:34:45 UTC (rev 335)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:37:10 UTC (rev 336)
@@ -659,6 +659,11 @@
   [proxy_emulator profileFinish:filename];
 }
 
+-(void) saveOptions
+{
+  [proxy_emulator saveOptions];
+}
+
 -(void) fullscreen
 {
   [proxy_emulator fullscreen];


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

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

From: <fr...@us...> - 2007-04-06 01:34:44

Revision: 335
          http://svn.sourceforge.net/fuse-for-macosx/?rev=335&view=rev
Author:   fredm
Date:     2007-04-05 18:34:45 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Move fullscreen 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-06 01:27:48 UTC (rev 334)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-06 01:34:45 UTC (rev 335)
@@ -703,7 +703,7 @@
 
 - (IBAction)fullscreen:(id)sender
 {
-  settings_current.full_screen = 1;
+  [[DisplayOpenGLView instance] fullscreen];
 }
 
 - (IBAction)joystick_keyboard:(id)sender

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:27:48 UTC (rev 334)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:34:45 UTC (rev 335)
@@ -86,6 +86,8 @@
 -(void) profileStart;
 -(void) profileFinish:(const char *)filename;
 
+-(void) fullscreen;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:27:48 UTC (rev 334)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:34:45 UTC (rev 335)
@@ -278,6 +278,11 @@
   profile_finish( filename );
 }
 
+-(void) fullscreen
+{
+  settings_current.full_screen = 1;
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return rzx_start_playback( filename );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:27:48 UTC (rev 334)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:34:45 UTC (rev 335)
@@ -122,6 +122,8 @@
 -(void) profileStart;
 -(void) profileFinish:(const char *)filename;
 
+-(void) fullscreen;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:27:48 UTC (rev 334)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:34:45 UTC (rev 335)
@@ -659,6 +659,11 @@
   [proxy_emulator profileFinish:filename];
 }
 
+-(void) fullscreen
+{
+  [proxy_emulator fullscreen];
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return [proxy_emulator rzxStartPlayback:filename];


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

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

From: <fr...@us...> - 2007-04-06 01:27:46

Revision: 334
          http://svn.sourceforge.net/fuse-for-macosx/?rev=334&view=rev
Author:   fredm
Date:     2007-04-05 18:27:48 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Move profiling 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-06 01:14:22 UTC (rev 333)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-06 01:27:48 UTC (rev 334)
@@ -45,7 +45,6 @@
 #include "event.h"
 #include "fuse.h"
 #include "libspectrum.h"
-#include "profile.h"
 #include "rzx.h"
 #include "psg.h"
 #include "settings.h"
@@ -636,7 +635,7 @@
 
 - (IBAction)profiler_start:(id)sender
 {
-  profile_start();
+  [[DisplayOpenGLView instance] profileStart];
 }
 
 - (IBAction)profiler_stop:(id)sender
@@ -648,7 +647,7 @@
   filename = cocoaui_savepanel_get_filename( @"Save Profile Data As", [NSArray arrayWithObjects:@"profile", nil] );
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  profile_finish( filename );
+  [[DisplayOpenGLView instance] profileFinish:filename];
 
   free( filename );
 

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:14:22 UTC (rev 333)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:27:48 UTC (rev 334)
@@ -83,6 +83,9 @@
 -(void) screenshotScrWrite:(const char *)filename;
 -(void) screenshotWrite:(const char *)filename;
 
+-(void) profileStart;
+-(void) profileFinish:(const char *)filename;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:14:22 UTC (rev 333)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:27:48 UTC (rev 334)
@@ -35,6 +35,7 @@
 #include "if2.h"
 #include "keyboard.h"
 #include "machine.h"
+#include "profile.h"
 #include "psg.h"
 #include "rzx.h"
 #include "settings.h"
@@ -267,6 +268,16 @@
   screenshot_write( filename );
 }
 
+-(void) profileStart
+{
+  profile_start();
+}
+
+-(void) profileFinish:(const char *)filename
+{
+  profile_finish( filename );
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return rzx_start_playback( filename );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:14:22 UTC (rev 333)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:27:48 UTC (rev 334)
@@ -119,6 +119,9 @@
 -(void) screenshotScrWrite:(const char *)filename;
 -(void) screenshotWrite:(const char *)filename;
 
+-(void) profileStart;
+-(void) profileFinish:(const char *)filename;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:14:22 UTC (rev 333)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:27:48 UTC (rev 334)
@@ -649,6 +649,16 @@
   [proxy_emulator screenshotWrite:filename];
 }
 
+-(void) profileStart
+{
+  [proxy_emulator profileStart];
+}
+
+-(void) profileFinish:(const char *)filename
+{
+  [proxy_emulator profileFinish:filename];
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return [proxy_emulator rzxStartPlayback:filename];


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

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

From: <fr...@us...> - 2007-04-06 01:14:24

Revision: 333
          http://svn.sourceforge.net/fuse-for-macosx/?rev=333&view=rev
Author:   fredm
Date:     2007-04-05 18:14:22 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Move screenshot 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-04 12:55:57 UTC (rev 332)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-06 01:14:22 UTC (rev 333)
@@ -47,8 +47,6 @@
 #include "libspectrum.h"
 #include "profile.h"
 #include "rzx.h"
-#include "screenshot.h"
-#include "ui/cocoa/cocoascreenshot.h"
 #include "psg.h"
 #include "settings.h"
 #include "settings_cocoa.h"
@@ -625,7 +623,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  screenshot_scr_read( filename );
+  [[DisplayOpenGLView instance] screenshotScrRead:filename];
 
   [self addRecentSnapshot:filename];
 
@@ -667,7 +665,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  screenshot_scr_write( filename );
+  [[DisplayOpenGLView instance] screenshotScrWrite:filename];
 
   if( settings_current.thumbnails )
     add_screen_thumbnail_to( filename );
@@ -689,7 +687,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  screenshot_write( filename );
+  [[DisplayOpenGLView instance] screenshotWrite:filename];
 
   if( settings_current.thumbnails )
     add_screen_thumbnail_to( filename );

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-04 12:55:57 UTC (rev 332)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-06 01:14:22 UTC (rev 333)
@@ -79,6 +79,10 @@
 
 -(void) snapshotWrite:(const char *)filename;
 
+-(void) screenshotScrRead:(const char *)filename;
+-(void) screenshotScrWrite:(const char *)filename;
+-(void) screenshotWrite:(const char *)filename;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-04 12:55:57 UTC (rev 332)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-06 01:14:22 UTC (rev 333)
@@ -39,9 +39,11 @@
 #include "rzx.h"
 #include "settings.h"
 #include "simpleide.h"
+#include "screenshot.h"
 #include "sound.h"
 #include "snapshot.h"
 #include "tape.h"
+#include "ui/cocoa/cocoascreenshot.h"
 #include "ui/ui.h"
 #include "utils.h"
 #include "zxatasp.h"
@@ -250,6 +252,21 @@
   snapshot_write( filename );
 }
 
+-(void) screenshotScrRead:(const char *)filename
+{
+  screenshot_scr_read( filename );
+}
+
+-(void) screenshotScrWrite:(const char *)filename
+{
+  screenshot_scr_write( filename );
+}
+
+-(void) screenshotWrite:(const char *)filename
+{
+  screenshot_write( filename );
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return rzx_start_playback( filename );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-04 12:55:57 UTC (rev 332)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-06 01:14:22 UTC (rev 333)
@@ -115,6 +115,10 @@
 
 -(void) snapshotWrite:(const char *)filename;
 
+-(void) screenshotScrRead:(const char *)filename;
+-(void) screenshotScrWrite:(const char *)filename;
+-(void) screenshotWrite:(const char *)filename;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-04 12:55:57 UTC (rev 332)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-06 01:14:22 UTC (rev 333)
@@ -634,6 +634,21 @@
   [proxy_emulator snapshotWrite:filename];
 }
 
+-(void) screenshotScrRead:(const char *)filename
+{
+  [proxy_emulator screenshotScrRead:filename];
+}
+
+-(void) screenshotScrWrite:(const char *)filename
+{
+  [proxy_emulator screenshotScrWrite:filename];
+}
+
+-(void) screenshotWrite:(const char *)filename
+{
+  [proxy_emulator screenshotWrite:filename];
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return [proxy_emulator rzxStartPlayback:filename];


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

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

From: <fr...@us...> - 2007-04-04 12:55:56

Revision: 332
          http://svn.sourceforge.net/fuse-for-macosx/?rev=332&view=rev
Author:   fredm
Date:     2007-04-04 05:55:57 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
Move snapshot write 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-04 12:51:09 UTC (rev 331)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-04 12:55:57 UTC (rev 332)
@@ -603,7 +603,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  snapshot_write( filename );
+  [[DisplayOpenGLView instance] snapshotWrite:filename];
 
   if( settings_current.thumbnails )
     add_screen_thumbnail_to( filename );

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-04 12:51:09 UTC (rev 331)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-04 12:55:57 UTC (rev 332)
@@ -77,6 +77,8 @@
 -(void) reset;
 -(int) nmi;
 
+-(void) snapshotWrite:(const char *)filename;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-04 12:51:09 UTC (rev 331)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-04 12:55:57 UTC (rev 332)
@@ -245,6 +245,11 @@
   return event_add( 0, EVENT_TYPE_NMI );
 }
 
+-(void) snapshotWrite:(const char *)filename
+{
+  snapshot_write( filename );
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return rzx_start_playback( filename );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-04 12:51:09 UTC (rev 331)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-04 12:55:57 UTC (rev 332)
@@ -113,6 +113,8 @@
 -(void) reset;
 -(int) nmi;
 
+-(void) snapshotWrite:(const char *)filename;
+
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
 -(void) rzxRollback;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-04 12:51:09 UTC (rev 331)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-04 12:55:57 UTC (rev 332)
@@ -629,6 +629,11 @@
   return [proxy_emulator nmi];
 }
 
+-(void) snapshotWrite:(const char *)filename
+{
+  [proxy_emulator snapshotWrite:filename];
+}
+
 -(int) rzxStartPlayback:(const char *)filename
 {
   return [proxy_emulator rzxStartPlayback:filename];


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

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

From: <fr...@us...> - 2007-04-04 12:51:09

Revision: 331
          http://svn.sourceforge.net/fuse-for-macosx/?rev=331&view=rev
Author:   fredm
Date:     2007-04-04 05:51:09 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
Move rzx rollback, start recording and stop 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-04 10:51:40 UTC (rev 330)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-04 12:51:09 UTC (rev 331)
@@ -503,23 +503,7 @@
 
 - (IBAction)rzx_rollback:(id)sender
 {
-  libspectrum_snap *snap;
-  libspectrum_error error;
-
-  if( !rzx_recording ) return;
-
-  [[DisplayOpenGLView instance] pause];
-
-  error = libspectrum_rzx_rollback( rzx, &snap );
-  if( error ) { [[DisplayOpenGLView instance] unpause]; return; }
-
-  error = snapshot_copy_from( snap );
-  if( error ) { [[DisplayOpenGLView instance] unpause]; return; }
-
-  error = libspectrum_rzx_start_input( rzx, tstates );
-  if( error ) { [[DisplayOpenGLView instance] unpause]; return; }
-
-  [[DisplayOpenGLView instance] unpause];
+  [[DisplayOpenGLView instance] rzxRollback];
 }
 
 - (IBAction)rzx_start:(id)sender
@@ -533,7 +517,7 @@
   recording = cocoaui_savepanel_get_filename( @"Start Recording", [NSArray arrayWithObjects:@"rzx", nil] );
   if( !recording ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  rzx_start_recording( recording, 1 );
+  [[DisplayOpenGLView instance] rzxStartRecording:recording embedSnapshot:1];
 
   free( recording );
 
@@ -560,7 +544,8 @@
     free( snap ); free( recording ); [[DisplayOpenGLView instance] unpause]; return;
   }
 
-  rzx_start_recording( recording, settings_current.embed_snapshot );
+  [[DisplayOpenGLView instance] rzxStartRecording:recording
+                                embedSnapshot:settings_current.embed_snapshot];
 
   free( recording );
 
@@ -573,8 +558,7 @@
 
 - (IBAction)rzx_stop:(id)sender
 {
-  if( rzx_recording ) rzx_stop_recording();
-  if( rzx_playback  ) rzx_stop_playback( 1 );
+  [[DisplayOpenGLView instance] rzxStop];
 
   ui_menu_activate( UI_MENU_ITEM_RECORDING, 0 );
 }

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-04 10:51:40 UTC (rev 330)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-04 12:51:09 UTC (rev 331)
@@ -79,6 +79,9 @@
 
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
+-(void) rzxRollback;
+-(int) rzxStartRecording:(const char *)filename embedSnapshot:(int)flag;
+-(void) rzxStop;
 
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-04 10:51:40 UTC (rev 330)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-04 12:51:09 UTC (rev 331)
@@ -270,6 +270,38 @@
   libspectrum_rzx_start_input( rzx, tstates );
 }
 
+-(void) rzxRollback
+{
+  libspectrum_snap *snap;
+  libspectrum_error error;
+
+  if( !rzx_recording ) return;
+
+  [self pause];
+
+  error = libspectrum_rzx_rollback( rzx, &snap );
+  if( error ) { [self unpause]; return; }
+
+  error = snapshot_copy_from( snap );
+  if( error ) { [self unpause]; return; }
+
+  error = libspectrum_rzx_start_input( rzx, tstates );
+  if( error ) { [self unpause]; return; }
+
+  [self unpause];
+}
+
+-(int) rzxStartRecording:(const char *)filename embedSnapshot:(int)flag
+{
+  return rzx_start_recording( filename, flag );
+}
+
+-(void) rzxStop
+{
+  if( rzx_recording ) rzx_stop_recording();
+  if( rzx_playback  ) rzx_stop_playback( 1 );
+}
+
 -(void) if1MdrNew:(int)drive
 {
   if1_mdr_new( drive );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-04 10:51:40 UTC (rev 330)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-04 12:51:09 UTC (rev 331)
@@ -115,6 +115,9 @@
 
 -(int) rzxStartPlayback:(const char *)filename;
 -(void) rzxInsertSnap;
+-(void) rzxRollback;
+-(int) rzxStartRecording:(const char *)filename embedSnapshot:(int)flag;
+-(void) rzxStop;
 
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-04 10:51:40 UTC (rev 330)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-04 12:51:09 UTC (rev 331)
@@ -639,6 +639,21 @@
   [proxy_emulator rzxInsertSnap];
 }
 
+-(void) rzxRollback
+{
+  [proxy_emulator rzxRollback];
+}
+
+-(int) rzxStartRecording:(const char *)filename embedSnapshot:(int)flag
+{
+  return [proxy_emulator rzxStartRecording:filename embedSnapshot:flag];
+}
+
+-(void) rzxStop
+{
+  [proxy_emulator rzxStop];
+}
+
 -(void) if1MdrNew:(int)drive
 {
   [proxy_emulator if1MdrNew:drive];


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

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

From: <fr...@us...> - 2007-04-04 10:51:39

Revision: 330
          http://svn.sourceforge.net/fuse-for-macosx/?rev=330&view=rev
Author:   fredm
Date:     2007-04-04 03:51:40 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
Move rzx start playback and insert snapshot 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 22:11:30 UTC (rev 329)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-04 10:51:40 UTC (rev 330)
@@ -485,7 +485,7 @@
 
   [self addRecentSnapshot:recording];
 
-  rzx_start_playback( recording );
+  [[DisplayOpenGLView instance] rzxStartPlayback:recording];
 
   free( recording );
 
@@ -498,22 +498,7 @@
 
 - (IBAction)rzx_insert_snap:(id)sender
 {
-  libspectrum_snap *snap;
-  libspectrum_error error;
-
-  if( !rzx_recording ) return;
-
-  libspectrum_rzx_stop_input( rzx );
-
-  error = libspectrum_snap_alloc( &snap );
-  if( error ) return;
-
-  error = snapshot_copy_to( snap );
-  if( error ) { libspectrum_snap_free( snap ); return; }
-
-  libspectrum_rzx_add_snap( rzx, snap );
-
-  libspectrum_rzx_start_input( rzx, tstates );
+  [[DisplayOpenGLView instance] rzxInsertSnap];
 }
 
 - (IBAction)rzx_rollback:(id)sender

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 22:11:30 UTC (rev 329)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-04 10:51:40 UTC (rev 330)
@@ -77,6 +77,9 @@
 -(void) reset;
 -(int) nmi;
 
+-(int) rzxStartPlayback:(const char *)filename;
+-(void) rzxInsertSnap;
+
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrSync:(const char *)filename inDrive:(int)drive;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 22:11:30 UTC (rev 329)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-04 10:51:40 UTC (rev 330)
@@ -36,9 +36,11 @@
 #include "keyboard.h"
 #include "machine.h"
 #include "psg.h"
+#include "rzx.h"
 #include "settings.h"
 #include "simpleide.h"
 #include "sound.h"
+#include "snapshot.h"
 #include "tape.h"
 #include "ui/ui.h"
 #include "utils.h"
@@ -243,6 +245,31 @@
   return event_add( 0, EVENT_TYPE_NMI );
 }
 
+-(int) rzxStartPlayback:(const char *)filename
+{
+  return rzx_start_playback( filename );
+}
+
+-(void) rzxInsertSnap
+{
+  libspectrum_snap *snap;
+  libspectrum_error error;
+
+  if( !rzx_recording ) return;
+
+  libspectrum_rzx_stop_input( rzx );
+
+  error = libspectrum_snap_alloc( &snap );
+  if( error ) return;
+
+  error = snapshot_copy_to( snap );
+  if( error ) { libspectrum_snap_free( snap ); return; }
+
+  libspectrum_rzx_add_snap( rzx, snap );
+
+  libspectrum_rzx_start_input( rzx, tstates );
+}
+
 -(void) if1MdrNew:(int)drive
 {
   if1_mdr_new( drive );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 22:11:30 UTC (rev 329)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-04 10:51:40 UTC (rev 330)
@@ -113,6 +113,9 @@
 -(void) reset;
 -(int) nmi;
 
+-(int) rzxStartPlayback:(const char *)filename;
+-(void) rzxInsertSnap;
+
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrSync:(const char *)filename inDrive:(int)drive;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 22:11:30 UTC (rev 329)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-04 10:51:40 UTC (rev 330)
@@ -629,6 +629,16 @@
   return [proxy_emulator nmi];
 }
 
+-(int) rzxStartPlayback:(const char *)filename
+{
+  return [proxy_emulator rzxStartPlayback:filename];
+}
+
+-(void) rzxInsertSnap
+{
+  [proxy_emulator rzxInsertSnap];
+}
+
 -(void) if1MdrNew:(int)drive
 {
   [proxy_emulator if1MdrNew:drive];


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

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

From: <fr...@us...> - 2007-04-03 22:11:33

Revision: 329
          http://svn.sourceforge.net/fuse-for-macosx/?rev=329&view=rev
Author:   fredm
Date:     2007-04-03 15:11:30 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move zxcf and nmi 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 13:58:32 UTC (rev 328)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 22:11:30 UTC (rev 329)
@@ -58,7 +58,6 @@
 #include "ui.h"
 #include "uidisplay.h"
 #include "utils.h"
-#include "zxcf.h"
 
 static char* cocoaui_openpanel_get_filename( NSString *title, NSArray *fileTypes );
 static char* cocoaui_savepanel_get_filename( NSString *title, NSArray *fileTypes );
@@ -315,7 +314,7 @@
   case 42: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
   case 43: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
   case 44: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 45: error = zxcf_insert( filename ); break;
+  case 45: error = [[DisplayOpenGLView instance] zxcfInsert:filename]; break;
   case 46: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
   case 47: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
   }
@@ -339,7 +338,7 @@
   case 52: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
   case 53: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_MASTER]; break;
   case 54: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 55: zxcf_commit(); break;
+  case 55: [[DisplayOpenGLView instance] zxcfCommit]; break;
   case 56: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_MASTER]; break;
   case 57: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
   }
@@ -354,7 +353,7 @@
   case 62: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_SLAVE]; break;
   case 63: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_MASTER]; break;
   case 64: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 65: zxcf_eject(); break;
+  case 65: [[DisplayOpenGLView instance] zxcfEject]; break;
   case 66: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_MASTER]; break;
   case 67: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_SLAVE]; break;
   }
@@ -466,7 +465,7 @@
   
   [[DisplayOpenGLView instance] pause];
 
-  error = event_add( 0, EVENT_TYPE_NMI );
+  error = [[DisplayOpenGLView instance] nmi];
   /* Complain if( error ) return error; */
 
   [[DisplayOpenGLView instance] unpause];

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:58:32 UTC (rev 328)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 22:11:30 UTC (rev 329)
@@ -75,6 +75,7 @@
 -(void) pause;
 -(void) unpause;
 -(void) reset;
+-(int) nmi;
 
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
@@ -99,6 +100,10 @@
 -(int) zxataspCommit:(libspectrum_ide_unit)unit;
 -(int) zxataspEject:(libspectrum_ide_unit)unit;
 
+-(int) zxcfInsert:(const char *)filename;
+-(int) zxcfCommit;
+-(int) zxcfEject;
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
 -(int) divideEject:(libspectrum_ide_unit)unit;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:58:32 UTC (rev 328)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 22:11:30 UTC (rev 329)
@@ -43,6 +43,7 @@
 #include "ui/ui.h"
 #include "utils.h"
 #include "zxatasp.h"
+#include "zxcf.h"
 
 extern keysyms_map_t unicode_keysyms_map[];
 
@@ -237,6 +238,11 @@
   machine_reset();
 }
 
+-(int) nmi
+{
+  return event_add( 0, EVENT_TYPE_NMI );
+}
+
 -(void) if1MdrNew:(int)drive
 {
   if1_mdr_new( drive );
@@ -322,6 +328,21 @@
   return zxatasp_eject( unit );
 }
 
+-(int) zxcfInsert:(const char *)filename
+{
+  return zxcf_insert( filename );
+}
+
+-(int) zxcfCommit
+{
+  return zxcf_commit();
+}
+
+-(int) zxcfEject
+{
+  return zxcf_eject();
+}
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
 {
   return divide_insert( filename, unit );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:58:32 UTC (rev 328)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 22:11:30 UTC (rev 329)
@@ -111,6 +111,7 @@
 -(void) pause;
 -(void) unpause;
 -(void) reset;
+-(int) nmi;
 
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
@@ -135,6 +136,10 @@
 -(int) zxataspCommit:(libspectrum_ide_unit)unit;
 -(int) zxataspEject:(libspectrum_ide_unit)unit;
 
+-(int) zxcfInsert:(const char *)filename;
+-(int) zxcfCommit;
+-(int) zxcfEject;
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
 -(int) divideEject:(libspectrum_ide_unit)unit;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:58:32 UTC (rev 328)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 22:11:30 UTC (rev 329)
@@ -624,6 +624,11 @@
   [proxy_emulator reset];
 }
 
+-(int) nmi
+{
+  return [proxy_emulator nmi];
+}
+
 -(void) if1MdrNew:(int)drive
 {
   [proxy_emulator if1MdrNew:drive];
@@ -709,6 +714,21 @@
   return [proxy_emulator zxataspEject:unit];
 }
 
+-(int) zxcfInsert:(const char *)filename
+{
+  return [proxy_emulator zxcfInsert:filename];
+}
+
+-(int) zxcfCommit
+{
+  return [proxy_emulator zxcfCommit];
+}
+
+-(int) zxcfEject
+{
+  return [proxy_emulator zxcfEject];
+}
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
 {
   return [proxy_emulator divideInsert:filename inUnit:unit];


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

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

From: <fr...@us...> - 2007-04-03 13:58:35

Revision: 328
          http://svn.sourceforge.net/fuse-for-macosx/?rev=328&view=rev
Author:   fredm
Date:     2007-04-03 06:58:32 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move zxatasp 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 13:49:21 UTC (rev 327)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 13:58:32 UTC (rev 328)
@@ -58,7 +58,6 @@
 #include "ui.h"
 #include "uidisplay.h"
 #include "utils.h"
-#include "zxatasp.h"
 #include "zxcf.h"
 
 static char* cocoaui_openpanel_get_filename( NSString *title, NSArray *fileTypes );
@@ -314,8 +313,8 @@
   switch( [sender tag] ) {
   case 41: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
   case 42: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 43: error = zxatasp_insert( filename, LIBSPECTRUM_IDE_MASTER ); break;
-  case 44: error = zxatasp_insert( filename, LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 43: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
+  case 44: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
   case 45: error = zxcf_insert( filename ); break;
   case 46: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
   case 47: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
@@ -338,8 +337,8 @@
   switch( [sender tag] ) {
   case 51: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_MASTER]; break;
   case 52: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 53: zxatasp_commit( LIBSPECTRUM_IDE_MASTER ); break;
-  case 54: zxatasp_commit( LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 53: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_MASTER]; break;
+  case 54: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_SLAVE]; break;
   case 55: zxcf_commit(); break;
   case 56: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_MASTER]; break;
   case 57: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
@@ -353,8 +352,8 @@
   switch( [sender tag] ) {
   case 61: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_MASTER]; break;
   case 62: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 63: zxatasp_eject( LIBSPECTRUM_IDE_MASTER ); break;
-  case 64: zxatasp_eject( LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 63: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_MASTER]; break;
+  case 64: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_SLAVE]; break;
   case 65: zxcf_eject(); break;
   case 66: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_MASTER]; break;
   case 67: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_SLAVE]; break;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:49:21 UTC (rev 327)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:58:32 UTC (rev 328)
@@ -95,6 +95,10 @@
 -(int) simpleideCommit:(libspectrum_ide_unit)unit;
 -(int) simpleideEject:(libspectrum_ide_unit)unit;
 
+-(int) zxataspInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+-(int) zxataspCommit:(libspectrum_ide_unit)unit;
+-(int) zxataspEject:(libspectrum_ide_unit)unit;
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
 -(int) divideEject:(libspectrum_ide_unit)unit;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:49:21 UTC (rev 327)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:58:32 UTC (rev 328)
@@ -42,6 +42,7 @@
 #include "tape.h"
 #include "ui/ui.h"
 #include "utils.h"
+#include "zxatasp.h"
 
 extern keysyms_map_t unicode_keysyms_map[];
 
@@ -306,6 +307,21 @@
   return simpleide_eject( unit );
 }
 
+-(int) zxataspInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
+{
+  return zxatasp_insert( filename, unit );
+}
+
+-(int) zxataspCommit:(libspectrum_ide_unit)unit
+{
+  return zxatasp_commit( unit );
+}
+
+-(int) zxataspEject:(libspectrum_ide_unit)unit
+{
+  return zxatasp_eject( unit );
+}
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
 {
   return divide_insert( filename, unit );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:49:21 UTC (rev 327)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:58:32 UTC (rev 328)
@@ -131,6 +131,10 @@
 -(int) simpleideCommit:(libspectrum_ide_unit)unit;
 -(int) simpleideEject:(libspectrum_ide_unit)unit;
 
+-(int) zxataspInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+-(int) zxataspCommit:(libspectrum_ide_unit)unit;
+-(int) zxataspEject:(libspectrum_ide_unit)unit;
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
 -(int) divideEject:(libspectrum_ide_unit)unit;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:49:21 UTC (rev 327)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:58:32 UTC (rev 328)
@@ -694,6 +694,21 @@
   return [proxy_emulator simpleideEject:unit];
 }
 
+-(int) zxataspInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator zxataspInsert:filename inUnit:unit];
+}
+
+-(int) zxataspCommit:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator zxataspCommit:unit];
+}
+
+-(int) zxataspEject:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator zxataspEject:unit];
+}
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
 {
   return [proxy_emulator divideInsert:filename inUnit:unit];


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

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

From: <fr...@us...> - 2007-04-03 13:49:20

Revision: 327
          http://svn.sourceforge.net/fuse-for-macosx/?rev=327&view=rev
Author:   fredm
Date:     2007-04-03 06:49:21 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move simpleide 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 13:21:48 UTC (rev 326)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 13:49:21 UTC (rev 327)
@@ -52,7 +52,6 @@
 #include "psg.h"
 #include "settings.h"
 #include "settings_cocoa.h"
-#include "simpleide.h"
 #include "snapshot.h"
 #include "thumbnail.h"
 #include "trdos.h"
@@ -313,8 +312,8 @@
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
   switch( [sender tag] ) {
-  case 41: error = simpleide_insert( filename, LIBSPECTRUM_IDE_MASTER ); break;
-  case 42: error = simpleide_insert( filename, LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 41: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
+  case 42: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
   case 43: error = zxatasp_insert( filename, LIBSPECTRUM_IDE_MASTER ); break;
   case 44: error = zxatasp_insert( filename, LIBSPECTRUM_IDE_SLAVE  ); break;
   case 45: error = zxcf_insert( filename ); break;
@@ -337,8 +336,8 @@
   [[DisplayOpenGLView instance] pause];
 
   switch( [sender tag] ) {
-  case 51: simpleide_commit( LIBSPECTRUM_IDE_MASTER ); break;
-  case 52: simpleide_commit( LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 51: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_MASTER]; break;
+  case 52: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
   case 53: zxatasp_commit( LIBSPECTRUM_IDE_MASTER ); break;
   case 54: zxatasp_commit( LIBSPECTRUM_IDE_SLAVE  ); break;
   case 55: zxcf_commit(); break;
@@ -352,8 +351,8 @@
 - (IBAction)ide_eject:(id)sender
 {
   switch( [sender tag] ) {
-  case 61: simpleide_eject( LIBSPECTRUM_IDE_MASTER ); break;
-  case 62: simpleide_eject( LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 61: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_MASTER]; break;
+  case 62: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_SLAVE]; break;
   case 63: zxatasp_eject( LIBSPECTRUM_IDE_MASTER ); break;
   case 64: zxatasp_eject( LIBSPECTRUM_IDE_SLAVE  ); break;
   case 65: zxcf_eject(); break;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:21:48 UTC (rev 326)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:49:21 UTC (rev 327)
@@ -91,6 +91,10 @@
 -(void) psgStart:(const char *)psgfile;
 -(void) psgStop;
 
+-(int) simpleideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+-(int) simpleideCommit:(libspectrum_ide_unit)unit;
+-(int) simpleideEject:(libspectrum_ide_unit)unit;
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
 -(int) divideEject:(libspectrum_ide_unit)unit;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:21:48 UTC (rev 326)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:49:21 UTC (rev 327)
@@ -37,6 +37,7 @@
 #include "machine.h"
 #include "psg.h"
 #include "settings.h"
+#include "simpleide.h"
 #include "sound.h"
 #include "tape.h"
 #include "ui/ui.h"
@@ -290,6 +291,21 @@
   psg_stop_recording();
 }
 
+-(int) simpleideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
+{
+  return simpleide_insert( filename, unit );
+}
+
+-(int) simpleideCommit:(libspectrum_ide_unit)unit
+{
+  return simpleide_commit( unit );
+}
+
+-(int) simpleideEject:(libspectrum_ide_unit)unit
+{
+  return simpleide_eject( unit );
+}
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
 {
   return divide_insert( filename, unit );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:21:48 UTC (rev 326)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:49:21 UTC (rev 327)
@@ -127,6 +127,10 @@
 -(void) psgStart:(const char *)psgfile;
 -(void) psgStop;
 
+-(int) simpleideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+-(int) simpleideCommit:(libspectrum_ide_unit)unit;
+-(int) simpleideEject:(libspectrum_ide_unit)unit;
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
 -(int) divideEject:(libspectrum_ide_unit)unit;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:21:48 UTC (rev 326)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:49:21 UTC (rev 327)
@@ -679,6 +679,21 @@
   [proxy_emulator psgStop];
 }
 
+-(int) simpleideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator simpleideInsert:filename inUnit:unit];
+}
+
+-(int) simpleideCommit:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator simpleideCommit:unit];
+}
+
+-(int) simpleideEject:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator simpleideEject:unit];
+}
+
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
 {
   return [proxy_emulator divideInsert:filename inUnit:unit];


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

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

From: <fr...@us...> - 2007-04-03 13:21:47

Revision: 326
          http://svn.sourceforge.net/fuse-for-macosx/?rev=326&view=rev
Author:   fredm
Date:     2007-04-03 06:21:48 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move divide eject 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 13:18:17 UTC (rev 325)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 13:21:48 UTC (rev 326)
@@ -42,7 +42,6 @@
 
 #import "DisplayOpenGLView.h"
 
-#include "divide.h"
 #include "event.h"
 #include "fuse.h"
 #include "libspectrum.h"
@@ -358,8 +357,8 @@
   case 63: zxatasp_eject( LIBSPECTRUM_IDE_MASTER ); break;
   case 64: zxatasp_eject( LIBSPECTRUM_IDE_SLAVE  ); break;
   case 65: zxcf_eject(); break;
-  case 66: divide_eject( LIBSPECTRUM_IDE_MASTER ); break;
-  case 67: divide_eject( LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 66: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_MASTER]; break;
+  case 67: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_SLAVE]; break;
   }
 }
 

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:18:17 UTC (rev 325)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:21:48 UTC (rev 326)
@@ -93,6 +93,7 @@
 
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
+-(int) divideEject:(libspectrum_ide_unit)unit;
 
 -(void) mouseMoved:(NSEvent *)theEvent;
 -(void) mouseDown:(NSEvent *)theEvent;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:18:17 UTC (rev 325)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:21:48 UTC (rev 326)
@@ -300,6 +300,11 @@
   return divide_commit( unit );
 }
 
+-(int) divideEject:(libspectrum_ide_unit)unit
+{
+  return divide_eject( unit );
+}
+
 -(BOOL) isEmulating
 {  
   return isEmulating;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:18:17 UTC (rev 325)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:21:48 UTC (rev 326)
@@ -129,6 +129,7 @@
 
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
 -(int) divideCommit:(libspectrum_ide_unit)unit;
+-(int) divideEject:(libspectrum_ide_unit)unit;
 
 -(void) setDiskState:(NSNumber*)state;
 -(void) setTapeState:(NSNumber*)state;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:18:17 UTC (rev 325)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:21:48 UTC (rev 326)
@@ -689,6 +689,11 @@
   return [proxy_emulator divideCommit:unit];
 }
 
+-(int) divideEject:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator divideEject:unit];
+}
+
 -(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.

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

From: <fr...@us...> - 2007-04-03 13:18:15

Revision: 325
          http://svn.sourceforge.net/fuse-for-macosx/?rev=325&view=rev
Author:   fredm
Date:     2007-04-03 06:18:17 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move divide commit 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 13:13:49 UTC (rev 324)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 13:18:17 UTC (rev 325)
@@ -343,8 +343,8 @@
   case 53: zxatasp_commit( LIBSPECTRUM_IDE_MASTER ); break;
   case 54: zxatasp_commit( LIBSPECTRUM_IDE_SLAVE  ); break;
   case 55: zxcf_commit(); break;
-  case 56: divide_commit( LIBSPECTRUM_IDE_MASTER ); break;
-  case 57: divide_commit( LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 56: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_MASTER]; break;
+  case 57: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
   }
 
   [[DisplayOpenGLView instance] unpause];

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:13:49 UTC (rev 324)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:18:17 UTC (rev 325)
@@ -92,6 +92,7 @@
 -(void) psgStop;
 
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+-(int) divideCommit:(libspectrum_ide_unit)unit;
 
 -(void) mouseMoved:(NSEvent *)theEvent;
 -(void) mouseDown:(NSEvent *)theEvent;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:13:49 UTC (rev 324)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:18:17 UTC (rev 325)
@@ -295,6 +295,11 @@
   return divide_insert( filename, unit );
 }
 
+-(int) divideCommit:(libspectrum_ide_unit)unit
+{
+  return divide_commit( unit );
+}
+
 -(BOOL) isEmulating
 {  
   return isEmulating;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:13:49 UTC (rev 324)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:18:17 UTC (rev 325)
@@ -128,6 +128,7 @@
 -(void) psgStop;
 
 -(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+-(int) divideCommit:(libspectrum_ide_unit)unit;
 
 -(void) setDiskState:(NSNumber*)state;
 -(void) setTapeState:(NSNumber*)state;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:13:49 UTC (rev 324)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:18:17 UTC (rev 325)
@@ -684,6 +684,11 @@
   return [proxy_emulator divideInsert:filename inUnit:unit];
 }
 
+-(int) divideCommit:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator divideCommit:unit];
+}
+
 -(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.

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

From: <fr...@us...> - 2007-04-03 13:13:48

Revision: 324
          http://svn.sourceforge.net/fuse-for-macosx/?rev=324&view=rev
Author:   fredm
Date:     2007-04-03 06:13:49 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move mdr write protect and divide insert 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 12:59:44 UTC (rev 323)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 13:13:49 UTC (rev 324)
@@ -45,7 +45,6 @@
 #include "divide.h"
 #include "event.h"
 #include "fuse.h"
-#include "if1.h"
 #include "libspectrum.h"
 #include "profile.h"
 #include "rzx.h"
@@ -320,8 +319,8 @@
   case 43: error = zxatasp_insert( filename, LIBSPECTRUM_IDE_MASTER ); break;
   case 44: error = zxatasp_insert( filename, LIBSPECTRUM_IDE_SLAVE  ); break;
   case 45: error = zxcf_insert( filename ); break;
-  case 46: error = divide_insert( filename, LIBSPECTRUM_IDE_MASTER ); break;
-  case 47: error = divide_insert( filename, LIBSPECTRUM_IDE_SLAVE  ); break;
+  case 46: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
+  case 47: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
   }
 
   if(error) goto error;
@@ -433,7 +432,7 @@
 {
   int no = [sender tag] - 30;
 
-  if1_mdr_writep( no & 0xf0, ( no & 0x0f ) );
+  [[DisplayOpenGLView instance] if1MdrWriteProtect:no & 0xf0 inDrive:( no & 0x0f )];
 }
 
 - (IBAction)open:(id)sender

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 12:59:44 UTC (rev 323)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 13:13:49 UTC (rev 324)
@@ -80,6 +80,7 @@
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrSync:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrEject:(const char *)filename inDrive:(int)drive;
+-(void) if1MdrWriteProtect:(int)w inDrive:(int)drive;
 
 -(int) if2Insert:(const char *)filename;
 -(void) if2Eject;
@@ -90,6 +91,8 @@
 -(void) psgStart:(const char *)psgfile;
 -(void) psgStop;
 
+-(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+
 -(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 12:59:44 UTC (rev 323)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 13:13:49 UTC (rev 324)
@@ -27,6 +27,7 @@
 
 #include "dck.h"
 #include "debugger/debugger.h"
+#include "divide.h"
 #include "event.h"
 #include "fuse.h"
 #include "fusepb/main.h"
@@ -254,6 +255,11 @@
   return if1_mdr_eject( filename, drive );
 }
 
+-(void) if1MdrWriteProtect:(int)w inDrive:(int)drive
+{
+  if1_mdr_writep( w, drive );
+}
+
 -(int) if2Insert:(const char *)filename
 {
   return if2_insert( filename );
@@ -284,6 +290,11 @@
   psg_stop_recording();
 }
 
+-(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
+{
+  return divide_insert( filename, unit );
+}
+
 -(BOOL) isEmulating
 {  
   return isEmulating;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 12:59:44 UTC (rev 323)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 13:13:49 UTC (rev 324)
@@ -116,6 +116,7 @@
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrSync:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrEject:(const char *)filename inDrive:(int)drive;
+-(void) if1MdrWriteProtect:(int)w inDrive:(int)drive;
 
 -(int) if2Insert:(const char *)filename;
 -(void) if2Eject;
@@ -126,6 +127,8 @@
 -(void) psgStart:(const char *)psgfile;
 -(void) psgStop;
 
+-(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit;
+
 -(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 12:59:44 UTC (rev 323)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 13:13:49 UTC (rev 324)
@@ -644,6 +644,11 @@
   return [proxy_emulator if1MdrEject:filename inDrive:drive];
 }
 
+-(void) if1MdrWriteProtect:(int)w inDrive:(int)drive
+{
+  [proxy_emulator if1MdrWriteProtect:w inDrive:drive];
+}
+
 -(int) if2Insert:(const char *)filename
 {
   return [proxy_emulator if2Insert:filename];
@@ -674,6 +679,11 @@
   [proxy_emulator psgStop];
 }
 
+-(int) divideInsert:(const char *)filename inUnit:(libspectrum_ide_unit)unit
+{
+  return [proxy_emulator divideInsert:filename inUnit:unit];
+}
+
 -(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.

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

From: <fr...@us...> - 2007-04-03 12:59:42

Revision: 323
          http://svn.sourceforge.net/fuse-for-macosx/?rev=323&view=rev
Author:   fredm
Date:     2007-04-03 05:59:44 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move mdr eject 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 12:55:27 UTC (rev 322)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 12:59:44 UTC (rev 323)
@@ -412,14 +412,15 @@
 {
   char *filename = NULL;
 
-  if( !if1_mdr_eject( NULL, [sender tag] - 30 ) ) return;
+  if( ![[DisplayOpenGLView instance] if1MdrEject:NULL inDrive:[sender tag] - 30] )
+    return;
 
   [[DisplayOpenGLView instance] pause];
 
   filename = cocoaui_savepanel_get_filename( @"Write Microdrive Cartridge As", [NSArray arrayWithObjects:@"mdr", nil] );
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  if1_mdr_eject( filename, [sender tag] - 30 );
+  [[DisplayOpenGLView instance] if1MdrEject:filename inDrive:[sender tag] - 30];
 
   [self addRecentSnapshot:filename];
 

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 12:55:27 UTC (rev 322)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 12:59:44 UTC (rev 323)
@@ -79,6 +79,7 @@
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrSync:(const char *)filename inDrive:(int)drive;
+-(int) if1MdrEject:(const char *)filename inDrive:(int)drive;
 
 -(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 12:55:27 UTC (rev 322)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 12:59:44 UTC (rev 323)
@@ -249,6 +249,11 @@
   return if1_mdr_sync( filename, drive );
 }
 
+-(int) if1MdrEject:(const char *)filename inDrive:(int)drive
+{
+  return if1_mdr_eject( filename, drive );
+}
+
 -(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 12:55:27 UTC (rev 322)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 12:59:44 UTC (rev 323)
@@ -115,6 +115,7 @@
 -(void) if1MdrNew:(int)drive;
 -(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
 -(int) if1MdrSync:(const char *)filename inDrive:(int)drive;
+-(int) if1MdrEject:(const char *)filename inDrive:(int)drive;
 
 -(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 12:55:27 UTC (rev 322)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 12:59:44 UTC (rev 323)
@@ -639,6 +639,11 @@
   return [proxy_emulator if1MdrSync:filename inDrive:drive];
 }
 
+-(int) if1MdrEject:(const char *)filename inDrive:(int)drive
+{
+  return [proxy_emulator if1MdrEject:filename inDrive:drive];
+}
+
 -(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.

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

From: <fr...@us...> - 2007-04-03 12:55:26

Revision: 322
          http://svn.sourceforge.net/fuse-for-macosx/?rev=322&view=rev
Author:   fredm
Date:     2007-04-03 05:55:27 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Move mdr insert and sync 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 11:43:54 UTC (rev 321)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 12:55:27 UTC (rev 322)
@@ -378,7 +378,7 @@
   filename = cocoaui_openpanel_get_filename( @"Insert microdrive disk file", mdrFileTypes );
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  if1_mdr_insert( filename, [sender tag] - 30 );
+  [[DisplayOpenGLView instance] if1MdrInsert:filename inDrive:[sender tag] - 30];
 
   [self addRecentSnapshot:filename];
 
@@ -391,14 +391,15 @@
 {
   char *filename = NULL;
 
-  if( !if1_mdr_sync( NULL, [sender tag] - 30 ) ) return;
+  if( ![[DisplayOpenGLView instance] if1MdrSync:NULL inDrive:[sender tag] - 30] )
+    return;
 
   [[DisplayOpenGLView instance] pause];
 
   filename = cocoaui_savepanel_get_filename( @"Write Microdrive Cartridge As", [NSArray arrayWithObjects:@"mdr", nil] );
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  if1_mdr_sync( filename, [sender tag] - 30 );
+  [[DisplayOpenGLView instance] if1MdrSync:filename inDrive:[sender tag] - 30];
 
   [self addRecentSnapshot:filename];
 

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:43:54 UTC (rev 321)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 12:55:27 UTC (rev 322)
@@ -77,6 +77,8 @@
 -(void) reset;
 
 -(void) if1MdrNew:(int)drive;
+-(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
+-(int) if1MdrSync:(const char *)filename inDrive:(int)drive;
 
 -(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 11:43:54 UTC (rev 321)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 12:55:27 UTC (rev 322)
@@ -239,6 +239,16 @@
   if1_mdr_new( drive );
 }
 
+-(void) if1MdrInsert:(const char *)filename inDrive:(int)drive
+{
+  if1_mdr_insert( filename, drive );
+}
+
+-(int) if1MdrSync:(const char *)filename inDrive:(int)drive
+{
+  return if1_mdr_sync( filename, drive );
+}
+
 -(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 11:43:54 UTC (rev 321)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 12:55:27 UTC (rev 322)
@@ -113,6 +113,8 @@
 -(void) reset;
 
 -(void) if1MdrNew:(int)drive;
+-(void) if1MdrInsert:(const char *)filename inDrive:(int)drive;
+-(int) if1MdrSync:(const char *)filename inDrive:(int)drive;
 
 -(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 11:43:54 UTC (rev 321)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 12:55:27 UTC (rev 322)
@@ -629,6 +629,16 @@
   [proxy_emulator if1MdrNew:drive];
 }
 
+-(void) if1MdrInsert:(const char *)filename inDrive:(int)drive
+{
+  [proxy_emulator if1MdrInsert:filename inDrive:drive];
+}
+
+-(int) if1MdrSync:(const char *)filename inDrive:(int)drive
+{
+  return [proxy_emulator if1MdrSync:filename inDrive:drive];
+}
+
 -(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.

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

From: <fr...@us...> - 2007-04-03 11:44:08

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

Log Message:
-----------
Move tape close and if1 mdr new 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 11:21:50 UTC (rev 320)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 11:43:54 UTC (rev 321)
@@ -56,7 +56,6 @@
 #include "settings_cocoa.h"
 #include "simpleide.h"
 #include "snapshot.h"
-#include "tape.h"
 #include "thumbnail.h"
 #include "trdos.h"
 #include "ui.h"
@@ -367,7 +366,7 @@
 
 - (IBAction)mdr_insert_new:(id)sender
 {
-  if1_mdr_new( [sender tag] - 30 );
+  [[DisplayOpenGLView instance] if1MdrNew:[sender tag] - 30];
 }
 
 - (IBAction)mdr_insert:(id)sender
@@ -1321,7 +1320,8 @@
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
   if( cocoaui_confirm( "Exit Fuse?" ) ) {
-    int error = tape_close(); if( error ) return NSTerminateCancel;
+    int error = [[DisplayOpenGLView instance] tapeClose];
+    if( error ) return NSTerminateCancel;
 
     return NSTerminateNow;
   }

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:21:50 UTC (rev 320)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:43:54 UTC (rev 321)
@@ -69,12 +69,15 @@
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
 -(void) tapeClear;
+-(int) tapeClose;
 -(void) tapeWindowInitialise;
 -(void) cocoaBreak;
 -(void) pause;
 -(void) unpause;
 -(void) reset;
 
+-(void) if1MdrNew:(int)drive;
+
 -(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 11:21:50 UTC (rev 320)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:43:54 UTC (rev 321)
@@ -30,6 +30,7 @@
 #include "event.h"
 #include "fuse.h"
 #include "fusepb/main.h"
+#include "if1.h"
 #include "if2.h"
 #include "keyboard.h"
 #include "machine.h"
@@ -193,6 +194,11 @@
   tape_close();
 }
 
+-(int) tapeClose
+{
+  return tape_close();
+}
+
 -(void) tapeWindowInitialise
 {
   ui_tape_browser_update( UI_TAPE_BROWSER_NEW_TAPE, NULL );
@@ -228,6 +234,11 @@
   machine_reset();
 }
 
+-(void) if1MdrNew:(int)drive
+{
+  if1_mdr_new( drive );
+}
+
 -(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 11:21:50 UTC (rev 320)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:43:54 UTC (rev 321)
@@ -105,12 +105,15 @@
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
 -(void) tapeClear;
+-(int) tapeClose;
 -(void) tapeWindowInitialise;
 -(void) cocoaBreak;
 -(void) pause;
 -(void) unpause;
 -(void) reset;
 
+-(void) if1MdrNew:(int)drive;
+
 -(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 11:21:50 UTC (rev 320)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:43:54 UTC (rev 321)
@@ -593,6 +593,11 @@
   [proxy_emulator tapeClear];
 }
 
+-(int) tapeClose
+{
+  return [proxy_emulator tapeClose];
+}
+
 -(void) tapeWindowInitialise
 {
   [proxy_emulator tapeWindowInitialise];
@@ -619,6 +624,11 @@
   [proxy_emulator reset];
 }
 
+-(void) if1MdrNew:(int)drive
+{
+  [proxy_emulator if1MdrNew:drive];
+}
+
 -(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.

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

From: <fr...@us...> - 2007-04-03 11:21:49

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

Log Message:
-----------
Move tape write 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 11:17:12 UTC (rev 319)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 11:21:50 UTC (rev 320)
@@ -1675,7 +1675,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
 
-  tape_write( filename );
+  [[DisplayOpenGLView instance] tapeWrite:filename];
 
   [[FuseController singleton] addRecentSnapshot:filename];
 

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:17:12 UTC (rev 319)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:21:50 UTC (rev 320)
@@ -65,6 +65,7 @@
 
 -(void) openFile:(const char *)filename;
 -(void) tapeOpen:(const char *)filename;
+-(void) tapeWrite:(const char *)filename;
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
 -(void) tapeClear;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:17:12 UTC (rev 319)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:21:50 UTC (rev 320)
@@ -173,6 +173,11 @@
   tape_open_default_autoload( filename, NULL );
 }
 
+-(void) tapeWrite:(const char *)filename;
+{
+  tape_write( filename );
+}
+
 -(void) tapeTogglePlay
 {
   tape_toggle_play( 0 );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:17:12 UTC (rev 319)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:21:50 UTC (rev 320)
@@ -101,6 +101,7 @@
 
 -(void) openFile:(const char *)filename;
 -(void) tapeOpen:(const char *)filename;
+-(void) tapeWrite:(const char *)filename;
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
 -(void) tapeClear;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:17:12 UTC (rev 319)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:21:50 UTC (rev 320)
@@ -573,6 +573,11 @@
   [proxy_emulator tapeOpen:filename];
 }
 
+-(void) tapeWrite:(const char *)filename;
+{
+  [proxy_emulator tapeWrite:filename];
+}
+
 -(void) tapeTogglePlay
 {
   [proxy_emulator tapeTogglePlay];


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

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

From: <fr...@us...> - 2007-04-03 11:17:14

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

Log Message:
-----------
Move tape open 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 11:11:42 UTC (rev 318)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 11:17:12 UTC (rev 319)
@@ -770,7 +770,7 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  tape_open_default_autoload( filename, NULL );
+  [[DisplayOpenGLView instance] tapeOpen:filename];
 
   [self addRecentSnapshot:filename];
 

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:11:42 UTC (rev 318)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:17:12 UTC (rev 319)
@@ -64,6 +64,7 @@
 -(id) init;
 
 -(void) openFile:(const char *)filename;
+-(void) tapeOpen:(const char *)filename;
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
 -(void) tapeClear;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:11:42 UTC (rev 318)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:17:12 UTC (rev 319)
@@ -168,6 +168,11 @@
   display_refresh_all();
 }
 
+-(void) tapeOpen:(const char *)filename
+{
+  tape_open_default_autoload( filename, NULL );
+}
+
 -(void) tapeTogglePlay
 {
   tape_toggle_play( 0 );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:11:42 UTC (rev 318)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:17:12 UTC (rev 319)
@@ -100,6 +100,7 @@
 -(void) setNeedsDisplayYes;
 
 -(void) openFile:(const char *)filename;
+-(void) tapeOpen:(const char *)filename;
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
 -(void) tapeClear;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:11:42 UTC (rev 318)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:17:12 UTC (rev 319)
@@ -568,6 +568,11 @@
   [proxy_emulator openFile:filename];
 }
 
+-(void) tapeOpen:(const char *)filename
+{
+  [proxy_emulator tapeOpen:filename];
+}
+
 -(void) tapeTogglePlay
 {
   [proxy_emulator tapeTogglePlay];


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

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

From: <fr...@us...> - 2007-04-03 11:11:41

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

Log Message:
-----------
Move tape clear 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 11:05:10 UTC (rev 317)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 11:11:42 UTC (rev 318)
@@ -757,7 +757,7 @@
 
 - (IBAction)tape_clear:(id)sender
 {
-  tape_close();
+  [[DisplayOpenGLView instance] tapeClear];
 }
 
 - (IBAction)tape_open:(id)sender

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:05:10 UTC (rev 317)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:11:42 UTC (rev 318)
@@ -66,6 +66,7 @@
 -(void) openFile:(const char *)filename;
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
+-(void) tapeClear;
 -(void) tapeWindowInitialise;
 -(void) cocoaBreak;
 -(void) pause;

Modified: branches/fusegl/fuse/fusepb/models/Emulator.m
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:05:10 UTC (rev 317)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:11:42 UTC (rev 318)
@@ -178,6 +178,11 @@
   tape_select_block( 0 );
 }
 
+-(void) tapeClear
+{
+  tape_close();
+}
+
 -(void) tapeWindowInitialise
 {
   ui_tape_browser_update( UI_TAPE_BROWSER_NEW_TAPE, NULL );

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:05:10 UTC (rev 317)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:11:42 UTC (rev 318)
@@ -102,6 +102,7 @@
 -(void) openFile:(const char *)filename;
 -(void) tapeTogglePlay;
 -(void) tapeRewind;
+-(void) tapeClear;
 -(void) tapeWindowInitialise;
 -(void) cocoaBreak;
 -(void) pause;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:05:10 UTC (rev 317)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:11:42 UTC (rev 318)
@@ -578,6 +578,11 @@
   [proxy_emulator tapeRewind];
 }
 
+-(void) tapeClear
+{
+  [proxy_emulator tapeClear];
+}
+
 -(void) tapeWindowInitialise
 {
   [proxy_emulator tapeWindowInitialise];


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

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

From: <fr...@us...> - 2007-04-03 11:05:12

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

Log Message:
-----------
Move psg 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:41:00 UTC (rev 316)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m	2007-04-03 11:05:10 UTC (rev 317)
@@ -48,10 +48,10 @@
 #include "if1.h"
 #include "libspectrum.h"
 #include "profile.h"
-#include "psg.h"
 #include "rzx.h"
 #include "screenshot.h"
 #include "ui/cocoa/cocoascreenshot.h"
+#include "psg.h"
 #include "settings.h"
 #include "settings_cocoa.h"
 #include "simpleide.h"
@@ -609,7 +609,7 @@
   psgfile = cocoaui_savepanel_get_filename( @"Start AY Sound Recording", [NSArray arrayWithObjects:@"psg", nil] );
   if( !psgfile ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  psg_start_recording( psgfile );
+  [[DisplayOpenGLView instance] psgStart:psgfile];
 
   free( psgfile );
 
@@ -623,7 +623,7 @@
 - (IBAction)psg_stop:(id)sender
 {
   if ( !psg_recording ) return;
-  psg_stop_recording();
+  [[DisplayOpenGLView instance] psgStop];
 
   ui_menu_activate( UI_MENU_ITEM_AY_LOGGING, 0 );
 }

Modified: branches/fusegl/fuse/fusepb/models/Emulator.h
===================================================================
--- branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 09:41:00 UTC (rev 316)
+++ branches/fusegl/fuse/fusepb/models/Emulator.h	2007-04-03 11:05:10 UTC (rev 317)
@@ -78,6 +78,9 @@
 -(int) dckInsert:(const char *)filename;
 -(void) dckEject;
 
+-(void) psgStart:(const char *)psgfile;
+-(void) psgStop;
+
 -(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:41:00 UTC (rev 316)
+++ branches/fusegl/fuse/fusepb/models/Emulator.m	2007-04-03 11:05:10 UTC (rev 317)
@@ -33,6 +33,7 @@
 #include "if2.h"
 #include "keyboard.h"
 #include "machine.h"
+#include "psg.h"
 #include "settings.h"
 #include "sound.h"
 #include "tape.h"
@@ -232,6 +233,16 @@
   dck_eject();
 }
 
+-(void) psgStart:(const char *)psgfile
+{
+  psg_start_recording( psgfile );
+}
+
+-(void) psgStop
+{
+  psg_stop_recording();
+}
+
 -(BOOL) isEmulating
 {  
   return isEmulating;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 09:41:00 UTC (rev 316)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-04-03 11:05:10 UTC (rev 317)
@@ -114,6 +114,9 @@
 -(int) dckInsert:(const char *)filename;
 -(void) dckEject;
 
+-(void) psgStart:(const char *)psgfile;
+-(void) psgStop;
+
 -(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:41:00 UTC (rev 316)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-04-03 11:05:10 UTC (rev 317)
@@ -624,6 +624,16 @@
   [proxy_emulator dckEject];
 }
 
+-(void) psgStart:(const char *)psgfile
+{
+  [proxy_emulator psgStart:psgfile];
+}
+
+-(void) psgStop
+{
+  [proxy_emulator psgStop];
+}
+
 -(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.

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

From: <fr...@us...> - 2007-04-03 09:41:01

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.

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

From: <fr...@us...> - 2007-04-03 09:34:25

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.

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

From: <fr...@us...> - 2007-04-03 09:28:10

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.

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [313] branches/fusegl/fuse/fusepb/Fuse. xcodeproj/project.pbxproj

From: <fr...@us...> - 2007-04-03 09:27:25

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

Log Message:
-----------
Put back universal build settings.

Modified Paths:
--------------
    branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj

Modified: branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2007-03-31 05:24:10 UTC (rev 312)
+++ branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2007-04-03 09:27:23 UTC (rev 313)
@@ -1533,7 +1533,10 @@
 		B61F46A609121DF100C8096C /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
+				ARCHS = (
+					ppc,
+					i386,
+				);
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(HOME)/Library/Frameworks",
@@ -1575,7 +1578,10 @@
 		B61F46A709121DF100C8096C /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
+				ARCHS = (
+					ppc,
+					i386,
+				);
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(HOME)/Library/Frameworks",
@@ -1616,7 +1622,10 @@
 		B61F46A809121DF100C8096C /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = i386;
+				ARCHS = (
+					ppc,
+					i386,
+				);
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(HOME)/Library/Frameworks",
 					../../libspectrum/build/Deployment,


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

Flat | Threaded

<< < 1 .. 19 20 21 22 23 .. 25 > >> (Page 21 of 25)