[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [421] trunk/fuse/fusepb
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [421] trunk/fuse/fusepb
|
From: <fr...@us...> - 2007-07-04 12:34:43
|
Revision: 421
http://svn.sourceforge.net/fuse-for-macosx/?rev=421&view=rev
Author: fredm
Date: 2007-07-04 05:33:56 -0700 (Wed, 04 Jul 2007)
Log Message:
-----------
Make sure we clean up from all changed media, not just tapes.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-07-02 13:44:32 UTC (rev 420)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-07-04 12:33:56 UTC (rev 421)
@@ -278,6 +278,8 @@
B6A6F10E0B3D6360000B88E9 /* cocoaerror.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F10D0B3D6360000B88E9 /* cocoaerror.m */; };
B6A6F11F0B3EA737000B88E9 /* cocoascreenshot.h in Headers */ = {isa = PBXBuildFile; fileRef = B6A6F11D0B3EA737000B88E9 /* cocoascreenshot.h */; };
B6A6F1200B3EA737000B88E9 /* cocoascreenshot.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F11E0B3EA737000B88E9 /* cocoascreenshot.m */; };
+ B6AB34900C3BC91A0005935E /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = B6AB348E0C3BC91A0005935E /* menu.c */; };
+ B6AB34910C3BC91A0005935E /* menu.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AB348F0C3BC91A0005935E /* menu.h */; };
B6B076B20B59FE9A00D4F95C /* Emulator.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B076B00B59FE9A00D4F95C /* Emulator.h */; };
B6B076B30B59FE9A00D4F95C /* Emulator.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B076B10B59FE9A00D4F95C /* Emulator.m */; };
B6B99F8A0B5F798700EE408F /* cocoadisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B99F890B5F798700EE408F /* cocoadisplay.m */; };
@@ -497,6 +499,8 @@
B6A7F0E904C9A11D001025EB /* NumberFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberFormatter.h; sourceTree = "<group>"; };
B6A7F0EA04C9A11D001025EB /* NumberFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NumberFormatter.m; sourceTree = "<group>"; };
B6AA8A3C03D2FC1C00FED55D /* trdos.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = trdos.rom; path = ../roms/trdos.rom; sourceTree = SOURCE_ROOT; };
+ B6AB348E0C3BC91A0005935E /* menu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = menu.c; sourceTree = "<group>"; };
+ B6AB348F0C3BC91A0005935E /* menu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
B6AB429D0677466E007C50EF /* ula.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ula.c; path = ../ula.c; sourceTree = SOURCE_ROOT; };
B6AB429E0677466E007C50EF /* ula.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ula.h; path = ../ula.h; sourceTree = SOURCE_ROOT; };
B6AD8FEC06221FD500C70D75 /* machines.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = machines.h; path = ../machines/machines.h; sourceTree = SOURCE_ROOT; };
@@ -1171,6 +1175,8 @@
B6403FD70A7E4B1A00E00B11 /* loader.h */,
B60B11F7059BC7E70048B64B /* machine.c */,
F55985EA038922ED01A804BA /* machine.h */,
+ B6AB348E0C3BC91A0005935E /* menu.c */,
+ B6AB348F0C3BC91A0005935E /* menu.h */,
B68CB2CC03DD923C00A804BA /* memory.c */,
B6CA2A210C33F8490003CF90 /* module.c */,
B6CA2A220C33F84A0003CF90 /* module.h */,
@@ -1321,6 +1327,7 @@
B6CA2A240C33F84A0003CF90 /* module.h in Headers */,
B6CA2A2F0C33F8C10003CF90 /* plusd.h in Headers */,
B6CA2A310C33F8C10003CF90 /* wd1770.h in Headers */,
+ B6AB34910C3BC91A0005935E /* menu.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1567,6 +1574,7 @@
B6CA2A230C33F84A0003CF90 /* module.c in Sources */,
B6CA2A2E0C33F8C10003CF90 /* plusd.c in Sources */,
B6CA2A300C33F8C10003CF90 /* wd1770.c in Sources */,
+ B6AB34900C3BC91A0005935E /* menu.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2007-07-02 13:44:32 UTC (rev 420)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2007-07-04 12:33:56 UTC (rev 421)
@@ -1757,7 +1757,7 @@
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{
if( cocoaui_confirm( "Exit Fuse?" ) ) {
- int error = [[DisplayOpenGLView instance] tapeClose];
+ int error = [[DisplayOpenGLView instance] checkMediaChanged];
if( error ) return NSTerminateCancel;
return NSTerminateNow;
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2007-07-02 13:44:32 UTC (rev 420)
+++ trunk/fuse/fusepb/models/Emulator.h 2007-07-04 12:33:56 UTC (rev 421)
@@ -86,6 +86,7 @@
-(void) reset;
-(void) hard_reset;
-(int) nmi;
+-(int) checkMediaChanged;
-(void) specplus3DiskInsert:(const char *)filename inDrive:(specplus3_drive_number)which;
-(void) specplus3DiskEject:(specplus3_drive_number)drive saveFirst:(int)write;
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2007-07-02 13:44:32 UTC (rev 420)
+++ trunk/fuse/fusepb/models/Emulator.m 2007-07-04 12:33:56 UTC (rev 421)
@@ -35,6 +35,7 @@
#include "if2.h"
#include "keyboard.h"
#include "machine.h"
+#include "menu.h"
#include "profile.h"
#include "psg.h"
#include "rzx.h"
@@ -280,6 +281,11 @@
return event_add( 0, EVENT_TYPE_NMI );
}
+-(int) checkMediaChanged
+{
+ return menu_check_media_changed();
+}
+
-(void) specplus3DiskInsert:(const char *)filename inDrive:(specplus3_drive_number)which
{
specplus3_disk_insert_default_autoload( which, filename );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
