[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [390] trunk/fuse/fusepb
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [390] trunk/fuse/fusepb
|
From: <fr...@us...> - 2007-06-19 02:56:55
|
Revision: 390
http://svn.sourceforge.net/fuse-for-macosx/?rev=390&view=rev
Author: fredm
Date: 2007-06-18 19:56:57 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
Add direct tape recording menus.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/controllers/FuseController.h 2007-06-19 02:56:57 UTC (rev 390)
@@ -52,6 +52,7 @@
IBOutlet NSMenuItem *zxatasp;
IBOutlet NSMenuItem *zxcf;
IBOutlet NSMenuItem *tapePlay;
+ IBOutlet NSMenuItem *tapeRecord;
IBOutlet NSMenu *recentSnaps;
IBOutlet NSWindow *window;
@@ -114,6 +115,7 @@
- (IBAction)tape_play:(id)sender;
- (IBAction)tape_rewind:(id)sender;
- (IBAction)tape_write:(id)sender;
+- (IBAction)tape_record:(id)sender;
- (IBAction)showRollbackPane:(id)sender;
- (IBAction)showTapeBrowserPane:(id)sender;
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2007-06-19 02:56:57 UTC (rev 390)
@@ -101,6 +101,7 @@
static int if1M8WpSet = 0;
static int profileStart = 1;
static int profileStop = 0;
+static int playTape = 1;
static NSMutableArray *allFileTypes = nil;
static NSMutableArray *dckFileTypes = nil;
@@ -751,6 +752,11 @@
ui_tape_write();
}
+- (IBAction)tape_record:(id)sender
+{
+ [[DisplayOpenGLView instance] tapeToggleRecord];
+}
+
- (IBAction)cocoa_break:(id)sender
{
[[DisplayOpenGLView instance] cocoaBreak];
@@ -1138,10 +1144,17 @@
- (void)ui_menu_activate_machine_profiler:(NSNumber*)active
{
- profileStart = ![active boolValue];
- profileStop = [active boolValue];
+ profileStart = ![active boolValue];
+ profileStop = [active boolValue];
}
+- (void)ui_menu_activate_tape_record:(NSNumber*)active
+{
+ playTape = ![active boolValue];
+ [tapeRecord setTitle:[active boolValue] == NO ? @"Record" :
+ @"Stop Recording"];
+}
+
- (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
{
switch( [menuItem tag] ) {
@@ -1228,6 +1241,13 @@
case 71:
return profileStop == 0 ? NO : YES;
break;
+ case 72:
+ case 73:
+ case 74:
+ case 75:
+ case 76:
+ return playTape == 0 ? NO : YES;
+ break;
default:
return YES;
}
@@ -1825,6 +1845,10 @@
method = @selector(ui_menu_activate_media_ide_divide_slave_eject:);
break;
+ case UI_MENU_ITEM_TAPE_RECORDING:
+ method = @selector(ui_menu_activate_tape_record:);
+ break;
+
default:
ui_error( UI_ERROR_ERROR, "Attempt to activate unknown menu item %d",
item );
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/models/Emulator.h 2007-06-19 02:56:57 UTC (rev 390)
@@ -69,6 +69,7 @@
-(void) tapeOpen:(const char *)filename;
-(void) tapeWrite:(const char *)filename;
-(void) tapeTogglePlay;
+-(void) tapeToggleRecord;
-(void) tapeRewind;
-(void) tapeClear;
-(int) tapeClose;
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/models/Emulator.m 2007-06-19 02:56:57 UTC (rev 390)
@@ -201,6 +201,12 @@
tape_toggle_play( 0 );
}
+-(void) tapeToggleRecord
+{
+ if( tape_recording ) tape_record_stop();
+ else tape_record_start();
+}
+
-(void) tapeRewind
{
tape_select_block( 0 );
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib 2007-06-19 02:56:57 UTC (rev 390)
@@ -62,6 +62,7 @@
"tape_clear" = id;
"tape_open" = id;
"tape_play" = id;
+ "tape_record" = id;
"tape_rewind" = id;
"tape_write" = id;
};
@@ -82,6 +83,7 @@
savePanelAccessoryView = id;
simple8Bit = NSMenuItem;
tapePlay = NSMenuItem;
+ tapeRecord = NSMenuItem;
window = NSWindow;
zxatasp = NSMenuItem;
zxcf = NSMenuItem;
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2007-06-19 02:56:57 UTC (rev 390)
@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>998 637 356 240 0 0 1440 878 </string>
+ <string>615 505 356 240 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>201 691 344 44 0 0 1440 878 </string>
+ <string>121 582 392 44 0 0 1024 746 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -17,6 +17,6 @@
<integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>8L2127</string>
+ <string>8P135</string>
</dict>
</plist>
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.h 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.h 2007-06-19 02:56:57 UTC (rev 390)
@@ -108,6 +108,7 @@
-(void) tapeOpen:(const char *)filename;
-(void) tapeWrite:(const char *)filename;
-(void) tapeTogglePlay;
+-(void) tapeToggleRecord;
-(void) tapeRewind;
-(void) tapeClear;
-(int) tapeClose;
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-18 12:03:30 UTC (rev 389)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-19 02:56:57 UTC (rev 390)
@@ -593,6 +593,11 @@
[proxy_emulator tapeTogglePlay];
}
+-(void) tapeToggleRecord
+{
+ [proxy_emulator tapeToggleRecord];
+}
+
-(void) tapeRewind
{
[proxy_emulator tapeRewind];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
