[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[650] trunk
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[650] trunk
|
From: <fr...@us...> - 2010-10-08 13:06:43
|
Revision: 650
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=650&view=rev
Author: fredm
Date: 2010-10-08 13:06:33 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
Merge up to vendor revision 4178.
Revision Links:
--------------
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=4178&view=rev
Modified Paths:
--------------
trunk/FuseGenerator/libspectrum.h
trunk/FuseImporter/libspectrum.h
trunk/fuse/ChangeLog
trunk/fuse/README
trunk/fuse/configure.in
trunk/fuse/disk/beta.c
trunk/fuse/disk/disk.c
trunk/fuse/fuse.c
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/libspectrum.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/fusepb/xibs/Preferences.xib
trunk/fuse/hacking/ChangeLog
trunk/fuse/ide/divide.c
trunk/fuse/ide/divide.h
trunk/fuse/ide/ide.c
trunk/fuse/ide/ide.h
trunk/fuse/ide/simpleide.c
trunk/fuse/ide/simpleide.h
trunk/fuse/ide/zxatasp.c
trunk/fuse/ide/zxatasp.h
trunk/fuse/ide/zxcf.c
trunk/fuse/ide/zxcf.h
trunk/fuse/lib/Makefile.am
trunk/fuse/lib/compressed/disk_plus3.szx
trunk/fuse/lib/compressed/tape_128.szx
trunk/fuse/lib/compressed/tape_16.szx
trunk/fuse/lib/compressed/tape_2048.szx
trunk/fuse/lib/compressed/tape_2068.szx
trunk/fuse/lib/compressed/tape_48.szx
trunk/fuse/lib/compressed/tape_pentagon.szx
trunk/fuse/lib/compressed/tape_plus2.szx
trunk/fuse/lib/compressed/tape_plus2a.szx
trunk/fuse/lib/compressed/tape_plus3.szx
trunk/fuse/lib/compressed/tape_plus3e.szx
trunk/fuse/lib/compressed/tape_scorpion.szx
trunk/fuse/lib/compressed/tape_se.szx
trunk/fuse/lib/compressed/tape_ts2068.szx
trunk/fuse/lib/uncompressed/disk_plus3.szx
trunk/fuse/lib/uncompressed/tape_128.szx
trunk/fuse/lib/uncompressed/tape_16.szx
trunk/fuse/lib/uncompressed/tape_2048.szx
trunk/fuse/lib/uncompressed/tape_2068.szx
trunk/fuse/lib/uncompressed/tape_48.szx
trunk/fuse/lib/uncompressed/tape_pentagon.szx
trunk/fuse/lib/uncompressed/tape_plus2.szx
trunk/fuse/lib/uncompressed/tape_plus2a.szx
trunk/fuse/lib/uncompressed/tape_plus3.szx
trunk/fuse/lib/uncompressed/tape_plus3e.szx
trunk/fuse/lib/uncompressed/tape_scorpion.szx
trunk/fuse/lib/uncompressed/tape_se.szx
trunk/fuse/lib/uncompressed/tape_ts2068.szx
trunk/fuse/machine.c
trunk/fuse/machines/Makefile.am
trunk/fuse/machines/machines.h
trunk/fuse/man/fuse.1
trunk/fuse/menu.c
trunk/fuse/menu.h
trunk/fuse/rzx.c
trunk/fuse/rzx.h
trunk/fuse/sound/coreaudiosound.c
trunk/fuse/tape.c
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkkeyboard.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/statusbar.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ui/win32/installer/fuse.nsi
trunk/fuse/ui.c
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/windres.rc
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tape_block.c
trunk/libspectrum/libspectrum/test/test.c
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum.h
Added Paths:
-----------
trunk/fuse/lib/compressed/tape_48_ntsc.szx
trunk/fuse/lib/uncompressed/tape_48_ntsc.szx
trunk/fuse/machines/spec48_ntsc.c
trunk/libspectrum/libspectrum/test/empty.szx
trunk/libspectrum/libspectrum/test/plus3.z80
trunk/libspectrum/libspectrum/windres.rc
Property Changed:
----------------
trunk/fuse/
trunk/fuse/fusepb/libspectrum.h
trunk/libspectrum/libspectrum/
Modified: trunk/FuseGenerator/libspectrum.h
===================================================================
--- trunk/FuseGenerator/libspectrum.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/FuseGenerator/libspectrum.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4120 2010-02-21 05:06:56Z fredm $
+ $Id: libspectrum.h.in 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -451,6 +451,8 @@
LIBSPECTRUM_MACHINE_PENT512,
LIBSPECTRUM_MACHINE_PENT1024,
+ LIBSPECTRUM_MACHINE_48_NTSC,
+
} libspectrum_machine;
WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/FuseImporter/libspectrum.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4120 2010-02-21 05:06:56Z fredm $
+ $Id: libspectrum.h.in 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -451,6 +451,8 @@
LIBSPECTRUM_MACHINE_PENT512,
LIBSPECTRUM_MACHINE_PENT1024,
+ LIBSPECTRUM_MACHINE_48_NTSC,
+
} libspectrum_machine;
WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
- /vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
/vendor/fuse-emulator/current/fuse:530-638
+ /vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
/vendor/fuse-emulator/current/fuse:530-649
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ChangeLog 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,6 +1,6 @@
-2010-xx-xx Philip Kendall <phi...@sh...>
+2010-10-xx Philip Kendall <phi...@sh...>
- * Fuse 0.11.0 released
+ * Fuse 1.0.0 released.
* Add Opus Discovery disk interface support (Gergely Szasz and Fredrick
Meunier).
@@ -8,6 +8,8 @@
* Many improvements to Win32 UI, including an installer (Marek
Januszewski).
* Support weak data in +3 disk images (Gergely Szasz).
+ * NTSC Spectrum support (Philip Kendall, with thanks to Claudio
+ Bernet).
* Add support for flipping disk images in single sided drives (Gergely
Szasz).
* Add support for automatically merging both both disk images where
@@ -47,8 +49,6 @@
notebooks (thanks, Andrew Owen) (Fredrick Meunier).
* Fixes for speed estimation (Gergely Szasz).
* Fix border colour in Timex HiRes screenshots (Fredrick Meunier).
- * Fix accelerated loaders when compiling with gcc 3.x (Carlos
- Almeida, Alberto Garcia and Philip Kendall).
* Allow "combo" boxes in widget UI (Gergely Szasz).
* Allow Home and End keys to work in widget UI (Gergely Szasz).
* Fix poke finder passing the wrong page to the debugger (Marek
@@ -1035,4 +1035,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4134 2010-05-21 13:16:19Z fredm $
+$Id: ChangeLog 4165 2010-09-30 21:55:05Z pak21 $
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/README 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 0.10.0.2
-===============================================
+The Free Unix Spectrum Emulator (Fuse) 1.0.0
+============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -209,11 +209,11 @@
and the Fuse project page on SourceForge,
http://sourceforge.net/projects/fuse-emulator/
-If you're interested in more general Speccy related discussions, visit
-the Usenet group 'comp.sys.sinclair', but do read the FAQ
-( http://www.worldofspectrum.org/faq/index.html ) first!
+For Spectrum discussions not directly related to Fuse, visit either the
+Usenet newsgroup `comp.sys.sinclair' or the World of Spectrum forums
+<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-14 January 2009
+FIXME October 2010
-$Id: README 4132 2010-05-20 12:06:53Z fredm $
+$Id: README 4172 2010-10-03 22:51:59Z pak21 $
Modified: trunk/fuse/configure.in
===================================================================
--- trunk/fuse/configure.in 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/configure.in 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4132 2010-05-20 12:06:53Z fredm $
+dnl $Id: configure.in 4175 2010-10-06 10:44:19Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -23,8 +23,10 @@
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
+define(FUSE_VERSION, [0.10.0.2])
+
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.10.0.2)
+AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
dnl Checks for programs.
AC_PROG_CC
@@ -40,8 +42,10 @@
AC_SUBST(WINDRES)
if test "$WINDRES" != no; then
WINDRES_OBJ="windres.o"
+ AC_DEFINE([VERSION_WIN32], [translit(FUSE_VERSION, [.], [,])], [Define version information for win32 executable])
fi
AC_SUBST(WINDRES_OBJ)
+AM_SUBST_NOTMAKE(WINDRES_OBJ)
dnl Generate commandy.h
YFLAGS="$YFLAGS -d"
@@ -247,7 +251,11 @@
fi
dnl Check for the MIT-SHM extension
- AC_CHECK_HEADERS( X11/extensions/XShm.h )
+ AC_CHECK_HEADERS( X11/extensions/XShm.h,,,[[
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/Xlib.h>
+ ]])
AC_CHECK_LIB( Xext, XShmAttach, LIBS="$LIBS -lXext" )
AC_DEFINE([UI_X], 1, [Defined if Xlib UI in use])
Modified: trunk/fuse/disk/beta.c
===================================================================
--- trunk/fuse/disk/beta.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/disk/beta.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2008 Stuart Brady
- $Id: beta.c 4131 2010-05-19 10:52:37Z fredm $
+ $Id: beta.c 4147 2010-08-19 12:25:15Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -65,6 +65,8 @@
int beta_active = 0;
int beta_builtin = 0;
+static libspectrum_byte beta_system_register; /* FDC system register */
+
libspectrum_word beta_pc_mask;
libspectrum_word beta_pc_value;
@@ -365,6 +367,8 @@
fdd_set_head( &beta_fdc->current_drive->fdd, ( ( b & 0x10 ) ? 0 : 1 ) );
/* 0x20 = density, reset = FM, set = MFM */
beta_fdc->dden = b & 0x20 ? 1 : 0;
+
+ beta_system_register = b;
}
libspectrum_byte
@@ -725,7 +729,6 @@
void
beta_to_snapshot( libspectrum_snap *snap )
{
- int attached;
wd_fdc *f = beta_fdc;
libspectrum_byte *buffer;
int drive_count = 0;
@@ -759,9 +762,9 @@
libspectrum_snap_set_beta_paged ( snap, beta_active );
libspectrum_snap_set_beta_direction( snap, beta_fdc->direction );
- libspectrum_snap_set_beta_status( snap, beta_sr_read( 0x001f, &attached ) );
+ libspectrum_snap_set_beta_status( snap, f->status_register );
libspectrum_snap_set_beta_track ( snap, f->track_register );
libspectrum_snap_set_beta_sector( snap, f->sector_register );
libspectrum_snap_set_beta_data ( snap, f->data_register );
- libspectrum_snap_set_beta_system( snap, beta_sp_read( 0x00ff, &attached ) );
+ libspectrum_snap_set_beta_system( snap, beta_system_register );
}
Modified: trunk/fuse/disk/disk.c
===================================================================
--- trunk/fuse/disk/disk.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/disk/disk.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* disk.c: Routines for handling disk images
Copyright (c) 2007-2010 Gergely Szasz
- $Id: disk.c 4114 2010-01-15 13:45:51Z fredm $
+ $Id: disk.c 4141 2010-07-19 11:30:21Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -102,6 +102,8 @@
size_t index;
} buffer_t;
+void disk_update_tlens( disk_t *d );
+
const char *
disk_strerror( int error )
{
@@ -742,6 +744,7 @@
d->wrprot = 0;
d->dirty = 0;
+ disk_update_tlens( d );
return d->status = DISK_OK;
}
Modified: trunk/fuse/fuse.c
===================================================================
--- trunk/fuse/fuse.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fuse.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
- Copyright (c) 1999-2009 Philip Kendall
+ Copyright (c) 1999-2010 Philip Kendall and others
- $Id: fuse.c 4109 2009-12-27 06:15:10Z fredm $
+ $Id: fuse.c 4165 2010-09-30 21:55:05Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -383,7 +383,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2009 Philip Kendall and others; see the file\n"
+ "Copyright (c) 1999-2010 Philip Kendall and others; see the file\n"
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
@@ -628,7 +628,7 @@
static int
do_start_files( start_files_t *start_files )
{
- int autoload, error, i;
+ int autoload, error, i, check_snapshot;
/* Can't do both input recording and playback */
if( start_files->playback && start_files->recording ) {
@@ -773,7 +773,8 @@
/* Input recordings */
if( start_files->playback ) {
- error = utils_open_file( start_files->playback, autoload, NULL );
+ check_snapshot = start_files->snapshot ? 0 : 1;
+ error = rzx_start_playback( start_files->playback, check_snapshot );
if( error ) return error;
}
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2010-10-08 13:06:33 UTC (rev 650)
@@ -218,6 +218,8 @@
B6A6F1200B3EA737000B88E9 /* cocoascreenshot.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F11E0B3EA737000B88E9 /* cocoascreenshot.m */; };
B6B076B30B59FE9A00D4F95C /* Emulator.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B076B10B59FE9A00D4F95C /* Emulator.m */; };
B6B99F8A0B5F798700EE408F /* cocoadisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B99F890B5F798700EE408F /* cocoadisplay.m */; };
+ B6BDE2D3125DF48000B81C58 /* tape_48_ntsc.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6BDE2D2125DF48000B81C58 /* tape_48_ntsc.szx */; };
+ B6BDE2DB125DF4A800B81C58 /* spec48_ntsc.c in Sources */ = {isa = PBXBuildFile; fileRef = B6BDE2DA125DF4A800B81C58 /* spec48_ntsc.c */; };
B6CA27A70C2CDBC500F06FB3 /* dirty.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CA27A50C2CDBC500F06FB3 /* dirty.c */; };
B6CA2A230C33F84A0003CF90 /* module.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CA2A210C33F8490003CF90 /* module.c */; };
B6CA2A260C33F8800003CF90 /* plusd.rom in Resources */ = {isa = PBXBuildFile; fileRef = B6CA2A250C33F8800003CF90 /* plusd.rom */; };
@@ -347,6 +349,7 @@
B61F459309121DF100C8096C /* Fuse Help in CopyFiles */,
B61F459409121DF100C8096C /* disk_plus3.szx in CopyFiles */,
B61F459509121DF100C8096C /* tape_16.szx in CopyFiles */,
+ B6BDE2D3125DF48000B81C58 /* tape_48_ntsc.szx in CopyFiles */,
B61F459609121DF100C8096C /* tape_48.szx in CopyFiles */,
B61F459709121DF100C8096C /* tape_128.szx in CopyFiles */,
B61F459809121DF100C8096C /* tape_2048.szx in CopyFiles */,
@@ -573,6 +576,8 @@
B6B076B10B59FE9A00D4F95C /* Emulator.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Emulator.m; sourceTree = "<group>"; };
B6B99F890B5F798700EE408F /* cocoadisplay.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = cocoadisplay.m; sourceTree = "<group>"; };
B6BA1A9404E4F88F0017354F /* uijoystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = uijoystick.h; path = ../ui/uijoystick.h; sourceTree = SOURCE_ROOT; };
+ B6BDE2D2125DF48000B81C58 /* tape_48_ntsc.szx */ = {isa = PBXFileReference; lastKnownFileType = file; name = tape_48_ntsc.szx; path = ../lib/compressed/tape_48_ntsc.szx; sourceTree = "<group>"; };
+ B6BDE2DA125DF4A800B81C58 /* spec48_ntsc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spec48_ntsc.c; path = machines/spec48_ntsc.c; sourceTree = "<group>"; };
B6C3479F044B091100E1BBA7 /* ts2068.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ts2068.png; path = resources/ts2068.png; sourceTree = SOURCE_ROOT; };
B6C57E0005ECA05B0056F1D0 /* periph.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = periph.c; path = ../periph.c; sourceTree = SOURCE_ROOT; };
B6C57E0105ECA05B0056F1D0 /* periph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = periph.h; path = ../periph.h; sourceTree = SOURCE_ROOT; };
@@ -1108,6 +1113,7 @@
B66050F80606AB0B00247454 /* scorpion.c */,
B66050F90606AB0B00247454 /* scorpion.h */,
B6EEA76F03CEF1D500FE73F2 /* spec16.c */,
+ B6BDE2DA125DF4A800B81C58 /* spec48_ntsc.c */,
F559860D0389234A01A804BA /* spec48.c */,
F559860E0389234A01A804BA /* spec48.h */,
F559860F0389234A01A804BA /* spec128.c */,
@@ -1314,6 +1320,7 @@
children = (
B650C3F2076596C700DE7E81 /* disk_plus3.szx */,
B650C3F4076596FD00DE7E81 /* tape_16.szx */,
+ B6BDE2D2125DF48000B81C58 /* tape_48_ntsc.szx */,
B650C3F60765971300DE7E81 /* tape_48.szx */,
B650C3F80765972E00DE7E81 /* tape_128.szx */,
B650C3FA0765974600DE7E81 /* tape_2048.szx */,
@@ -1495,7 +1502,14 @@
isa = PBXProject;
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ Japanese,
+ French,
+ German,
+ );
mainGroup = 29B97314FDCFA39411CA2CEA /* Fuse */;
projectDirPath = "";
projectRoot = "";
@@ -1772,6 +1786,7 @@
B6501DF411AABD6800898AD1 /* blipbuffer.c in Sources */,
B6501DF711AABD9300898AD1 /* sound.c in Sources */,
B6501DFC11AABE2300898AD1 /* rectangle.c in Sources */,
+ B6BDE2DB125DF4A800B81C58 /* spec48_ntsc.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2010-10-08 13:06:33 UTC (rev 650)
@@ -510,11 +510,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>20090605</string>
+ <string>20101007</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>20090605</string>
+ <string>20101007</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/config.h
===================================================================
--- trunk/fuse/fusepb/config.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/config.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -152,7 +152,7 @@
/* #undef USE_WIDGET */
/* Version number of package */
-#define VERSION "0.10.0"
+#define VERSION "1.0.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2010-10-08 13:06:33 UTC (rev 650)
@@ -629,7 +629,7 @@
display_refresh_all();
- ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
+ if( rzx_playback ) ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
[[DisplayOpenGLView instance] unpause];
}
@@ -2021,6 +2021,7 @@
-(int) plus3DiskWrite:(specplus3_drive_number)which
{
+ int err;
char drive, *filename = NULL;
drive = which == SPECPLUS3_DRIVE_A ? 'A' : 'B';
@@ -2033,7 +2034,7 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
/* We will be calling this from the Emulator thread */
- specplus3_disk_write( which, filename );
+ err = specplus3_disk_write( which, filename );
[self addRecentSnapshotWithString:[NSString stringWithUTF8String:filename]];
@@ -2041,11 +2042,12 @@
[[DisplayOpenGLView instance] unpause];
- return 0;
+ return err;
}
-(int) betaDiskWrite:(beta_drive_number)which
{
+ int err;
char drive, *filename = NULL;
switch( which ) {
@@ -2067,7 +2069,7 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
/* We will be calling this from the main thread with emulator paused */
- beta_disk_write( which, filename );
+ err = beta_disk_write( which, filename );
[self addRecentSnapshotWithString:[NSString stringWithUTF8String:filename]];
@@ -2075,11 +2077,12 @@
[[DisplayOpenGLView instance] unpause];
- return 0;
+ return err;
}
-(int) opusDiskWrite:(opus_drive_number)which
{
+ int err;
char drive, *filename = NULL;
switch( which ) {
@@ -2099,7 +2102,7 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
/* We will be calling this from the main thread with emulator paused */
- opus_disk_write( which, filename );
+ err = opus_disk_write( which, filename );
[self addRecentSnapshotWithString:[NSString stringWithUTF8String:filename]];
@@ -2107,11 +2110,12 @@
[[DisplayOpenGLView instance] unpause];
- return 0;
+ return err;
}
-(int) plusdDiskWrite:(plusd_drive_number)which
{
+ int err;
char drive, *filename = NULL;
switch( which ) {
@@ -2131,7 +2135,7 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
/* We will be calling this from the main thread with emulator paused */
- plusd_disk_write( which, filename );
+ err = plusd_disk_write( which, filename );
[self addRecentSnapshotWithString:[NSString stringWithUTF8String:filename]];
@@ -2139,11 +2143,12 @@
[[DisplayOpenGLView instance] unpause];
- return 0;
+ return err;
}
-(int) if1MdrWrite:(int)which
{
+ int err;
char *filename = NULL;
[[DisplayOpenGLView instance] pause];
@@ -2154,7 +2159,7 @@
if( !filename ) { [[DisplayOpenGLView instance] unpause]; return 1; }
/* We will be calling this from the main thread with emulator paused */
- if1_mdr_write( which, filename );
+ err = if1_mdr_write( which, filename );
[self addRecentSnapshotWithString:[NSString stringWithUTF8String:filename]];
@@ -2162,7 +2167,7 @@
[[DisplayOpenGLView instance] unpause];
- return 0;
+ return err;
}
-(ui_confirm_joystick_t) confirmJoystick:(libspectrum_joystick)type inputs:(int)theInputs
@@ -2468,6 +2473,12 @@
return error;
}
+char *
+ui_get_open_filename( const char *title )
+{
+ return cocoaui_openpanel_get_filename( @"Load Snapshot", snapFileTypes );
+}
+
/* Function to (de)activate specific menu items */
int
ui_menu_activate( ui_menu_item item, int active )
Modified: trunk/fuse/fusepb/libspectrum.h
===================================================================
--- trunk/fuse/fusepb/libspectrum.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/libspectrum.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4120 2010-02-21 05:06:56Z fredm $
+ $Id: libspectrum.h.in 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -451,6 +451,8 @@
LIBSPECTRUM_MACHINE_PENT512,
LIBSPECTRUM_MACHINE_PENT1024,
+ LIBSPECTRUM_MACHINE_48_NTSC,
+
} libspectrum_machine;
WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
Property changes on: trunk/fuse/fusepb/libspectrum.h
___________________________________________________________________
Modified: svn:mergeinfo
- /vendor/fuse-emulator/current/libspectrum/libspectrum.h.in:538-600
+ /vendor/fuse-emulator/current/fuse/fusepb/libspectrum.h:638-649
/vendor/fuse-emulator/current/libspectrum/libspectrum.h.in:538-600
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/models/Emulator.m 2010-10-08 13:06:33 UTC (rev 650)
@@ -457,7 +457,7 @@
-(int) rzxStartPlayback:(const char *)filename
{
- return rzx_start_playback( filename );
+ return rzx_start_playback( filename, 1 );
}
-(void) rzxInsertSnap
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2010-10-08 13:06:33 UTC (rev 650)
@@ -14,7 +14,7 @@
name="What's New In Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 0.10.0 of the Fuse emulator." --></font><br>
<div class="refsect1" xml:lang="en" lang="en">
<h2><font face="Lucida Grande,Helvetica,Arial">What's new in Fuse
-For Mac OS X Beta 20100???</font></h2>
+For Mac OS X Beta 201010??</font></h2>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">Changes since last
beta:</font></li>
@@ -37,7 +37,20 @@
before loading a file from a double click/drag-n-drop when Fuse is
already running (Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add x86_64 target to
-Universal Binary (Fredrick Meunier).<br>
+Universal Binary (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Set track lengths
+when inserting a new disk (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Correct writing of
+status and system registers to snapshots (Patrik Rak).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add support for NTSC
+ZX Spectrum 48K (Philip Kendall).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix autoload
+snapshots (thanks, Gergely Szasz) (Fred).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Query for an initial
+snapshot when opening a RZX file which doesn't have one as is common in
+competition mode RZX files (Sergio Baldovi).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Don't close a disk
+or mdr if a write fails (thanks, Crisis) (Gergely Szasz).<br>
</font></li>
</ul>
</ul>
Modified: trunk/fuse/fusepb/xibs/Preferences.xib
===================================================================
--- trunk/fuse/fusepb/xibs/Preferences.xib 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/fusepb/xibs/Preferences.xib 2010-10-08 13:06:33 UTC (rev 650)
@@ -2,38 +2,33 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10D2094</string>
- <string key="IBDocument.InterfaceBuilderVersion">762</string>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">460.00</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">762</string>
+ <string key="NS.object.0">804</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1836"/>
+ <integer value="1582"/>
<integer value="1347"/>
+ <integer value="1714"/>
<integer value="1506"/>
- <integer value="1714"/>
- <integer value="6"/>
<integer value="1488"/>
+ <integer value="1836"/>
<integer value="1408"/>
- <integer value="1582"/>
<integer value="1686"/>
+ <integer value="6"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="729263285">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -279,7 +274,9 @@
<reference ref="943816128"/>
<reference ref="141636598"/>
</object>
- <reference key="NSToolbarIBSelectableItems" ref="0"/>
+ <object class="NSArray" key="NSToolbarIBSelectableItems" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
@@ -3936,15 +3933,15 @@
<object class="NSMatrix" id="145521076">
<reference key="NSNextResponder" ref="453171511"/>
<int key="NSvFlags">260</int>
- <string key="NSFrame">{{246, 20}, {134, 298}}</string>
+ <string key="NSFrame">{{246, 20}, {200, 318}}</string>
<reference key="NSSuperview" ref="453171511"/>
<bool key="NSEnabled">YES</bool>
- <int key="NSNumRows">15</int>
+ <int key="NSNumRows">16</int>
<int key="NSNumCols">1</int>
<object class="NSMutableArray" key="NSCells">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButtonCell" id="698615207">
- <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Spectrum 16K</string>
<reference key="NSSupport" ref="447006373"/>
@@ -3977,7 +3974,7 @@
<object class="NSButtonCell" id="895598075">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Spectrum 128K</string>
+ <string key="NSContents">Spectrum 48K (NTSC)</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">2</int>
@@ -4033,7 +4030,7 @@
<object class="NSButtonCell" id="256002398">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Spectrum +2</string>
+ <string key="NSContents">Spectrum 128K</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">3</int>
@@ -4052,7 +4049,7 @@
<object class="NSButtonCell" id="728047119">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Spectrum +2A</string>
+ <string key="NSContents">Spectrum +2</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">5</int>
@@ -4068,7 +4065,7 @@
<object class="NSButtonCell" id="582602011">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Spectrum +3</string>
+ <string key="NSContents">Spectrum +2A</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">6</int>
@@ -4084,7 +4081,7 @@
<object class="NSButtonCell" id="1043922712">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Spectrum +3e</string>
+ <string key="NSContents">Spectrum +3</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">11</int>
@@ -4140,7 +4137,7 @@
<object class="NSButtonCell" id="207861972">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Timex TC2048</string>
+ <string key="NSContents">Spectrum +3e</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">1</int>
@@ -4194,9 +4191,9 @@
<int key="NSPeriodicInterval">75</int>
</object>
<object class="NSButtonCell" id="298116252">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Timex TC2068</string>
+ <string key="NSContents">Timex TC2048</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">9</int>
@@ -4252,7 +4249,7 @@
<object class="NSButtonCell" id="977182889">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Timex TS2068</string>
+ <string key="NSContents">Timex TC2068</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">13</int>
@@ -4267,7 +4264,7 @@
<object class="NSButtonCell" id="27596798">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Pentagon 128K</string>
+ <string key="NSContents">Timex TS2068</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">4</int>
@@ -4282,7 +4279,7 @@
<object class="NSButtonCell" id="1044447402">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Pentagon 512K</string>
+ <string key="NSContents">Pentagon 128K</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">14</int>
@@ -4297,7 +4294,7 @@
<object class="NSButtonCell" id="849588984">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Pentagon 1024K</string>
+ <string key="NSContents">Pentagon 512K</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">15</int>
@@ -4312,7 +4309,7 @@
<object class="NSButtonCell" id="348598096">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Scorpion ZS 256</string>
+ <string key="NSContents">Pentagon 1024K</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">10</int>
@@ -4327,7 +4324,7 @@
<object class="NSButtonCell" id="287925355">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Spectrum SE</string>
+ <string key="NSContents">Scorpion ZS 256</string>
<reference key="NSSupport" ref="447006373"/>
<reference key="NSControlView" ref="145521076"/>
<int key="NSTag">12</int>
@@ -4339,10 +4336,22 @@
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
+ <object class="NSButtonCell" id="545389380">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Spectrum SE</string>
+ <reference key="NSSupport" ref="447006373"/>
+ <reference key="NSControlView" ref="145521076"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <reference key="NSAlternateImage" ref="32434582"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
</object>
- <string key="NSCellSize">{134, 18}</string>
+ <string key="NSCellSize">{200, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
- <int key="NSMatrixFlags">1143472128</int>
+ <int key="NSMatrixFlags">1151868928</int>
<string key="NSCellClass">NSActionCell</string>
<object class="NSButtonCell" key="NSProtoCell" id="947390470">
<int key="NSCellFlags">67239424</int>
@@ -4461,13 +4470,14 @@
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
- <reference key="NSSelectedCell" ref="698615207"/>
+ <int key="NSSelectedRow">8</int>
+ <reference key="NSSelectedCell" ref="298116252"/>
<reference key="NSBackgroundColor" ref="519317542"/>
<reference key="NSCellBackgroundColor" ref="70288484"/>
<reference key="NSFont" ref="447006373"/>
</object>
</object>
- <string key="NSFrameSize">{627, 338}</string>
+ <string key="NSFrameSize">{627, 358}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -8667,6 +8677,7 @@
<reference ref="895598075"/>
<reference ref="850511965"/>
<reference ref="698615207"/>
+ <reference ref="545389380"/>
</object>
<reference key="parent" ref="453171511"/>
</object>
@@ -9117,6 +9128,11 @@
<reference key="object" ref="766217337"/>
<reference key="parent" ref="833825163"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1882</int>
+ <reference key="object" ref="545389380"/>
+ <reference key="parent" ref="145521076"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -9942,7 +9958,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{31, 211}, {627, 338}}</string>
+ <string>{{31, 191}, {627, 358}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{628, 654}</string>
<string>{{217, 442}, {480, 272}}</string>
@@ -10102,7 +10118,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1881</int>
+ <int key="maxID">1882</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -10153,6 +10169,60 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>chooseFile:</string>
+ <string>chooseROMFile:</string>
+ <string>externalSoundTypeClicked:</string>
+ <string>massStorageTypeClicked:</string>
+ <string>resetROMFile:</string>
+ <string>resetUserDefaults:</string>
+ <string>selectPrefPanel:</string>
+ <string>setup:</string>
+ <string>showWindow:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">chooseFile:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">chooseROMFile:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">externalSoundTypeClicked:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">massStorageTypeClicked:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">resetROMFile:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">resetUserDefaults:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">selectPrefPanel:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">setup:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">showWindow:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -10196,6 +10266,100 @@
<string>NSToolbar</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>externalSoundType</string>
+ <string>filterPrefsView</string>
+ <string>generalPrefsView</string>
+ <string>joysticksPrefsView</string>
+ <string>machinePrefsView</string>
+ <string>machineRomsController</string>
+ <string>massStorageType</string>
+ <string>peripheralsPrefsView</string>
+ <string>rom0Filename</string>
+ <string>rom1Filename</string>
+ <string>rom2Filename</string>
+ <string>rom3Filename</string>
+ <string>romPrefsView</string>
+ <string>rzxPrefsView</string>
+ <string>soundPrefsView</string>
+ <string>tabView</string>
+ <string>toolbar</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">externalSoundType</string>
+ <string key="candidateClassName">NSMatrix</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">filterPrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">generalPrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">joysticksPrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">machinePrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">machineRomsController</string>
+ <string key="candidateClassName">NSArrayController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">massStorageType</string>
+ <string key="candidateClassName">NSMatrix</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">peripheralsPrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">rom0Filename</string>
+ <string key="candidateClassName">NSFormCell</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">rom1Filename</string>
+ <string key="candidateClassName">NSFormCell</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">rom2Filename</string>
+ <string key="candidateClassName">NSFormCell</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">rom3Filename</string>
+ <string key="candidateClassName">NSFormCell</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">romPrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">rzxPrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">soundPrefsView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tabView</string>
+ <string key="candidateClassName">NSTabView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">toolbar</string>
+ <string key="candidateClassName">NSToolbar</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">controllers/PreferencesController.h</string>
@@ -10845,6 +11009,13 @@
<string key="NS.key.0">showWindow:</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">showWindow:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">showWindow:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/hacking/ChangeLog 2010-10-08 13:06:33 UTC (rev 650)
@@ -3299,3 +3299,55 @@
changes from 0.10.0.2 onto trunk (Fred).
20100521 ChangeLog: remove duplicate entry (Fred).
20100522 sound.c: allow a little more treble in the TV Speaker mode (Fred).
+20100527 sound/coreaudiosound.c: add some casts in output statements to avoid
+ annoying warnings about format mismatches (Fred).
+20100530 ChangeLog: remove another duplicate entry (Fred).
+20100627 ui/gtk/gtkdisplay.c: ensure an appropriate scaler is selected when
+ the Fuse window is resized by the user.
+20100719 disk/disk.c: set track lengths when inserting a new disk (fixes bug
+ #3031299) (Gergely Szasz).
+20100819 disk/beta.c: correct writing of status and system regeisters to
+ snapshots (Patrik Rak).
+20100825 machine.c,machines/{Makefile.am,machines.h},tape.c: reintegrate
+ NTSC Spectrum branch.
+20100831 lib/[un]compressed/{disk_plus3.szx,tape_128.szx,tape_16.szx,
+ tape_2048.szx,tape_2068.szx,tape_48.szx,tape_pentagon.szx,
+ tape_plus2.szx,tape_plus2a.szx,tape_plus3.szx,tape_plus3e.szx,
+ tape_scorpion.szx,tape_se.szx,tape_ts2068.szx}: swap A and F and A'
+ and F' registers in autoload snapshots which were written when
+ libspectrum still suffered from bug #2857419 (fixes bug #3040262)
+ (thanks, Gergely Szasz) (Fred).
+20100831 machines/spec48_ntsc.c: add some more peripherals and add display
+ setup code (Fred).
+20100901 lib/{[un]compressed/tape_48_ntsc.szx,Makefile.am}: add autoload
+ snapshot for NTSC Spectrum (Fred).
+20100905 tape.c: remove obsolete reference to munmap (Fred).
+20100909 settings.pl: remove the 80 character limit in ini file settings
+ names+values and change 256 char path lengths to MAX_PATH (patch
+ #3013768) (Gergely Szasz).
+20100912 menu.c,rzx.[ch]: query for an initial snapshot when opening a rzx file
+ which doesn't have one as is common in competition mode rzx files
+ (patch #3054536) (Sergio Baldovi).
+20100912 configure.in,windres.rc: enhancements to Windows version encoding
+ (patch #3061430) (Sergio Baldovi).
+20100913 fuse.c,menu.[ch],rzx.[ch],utils.[ch]: extend RZX playback handling of
+ files without initial embedded snapshots to cover File->Open, the
+ command line and some miscellaneous RZX playback initialisation bugs
+ (more from patch #3054536) (Sergio Baldovi).
+20100919 ui/win32/installer/fuse.nsi: windows installer improvements; correct
+ uninstall registry key, parameterise installation directory path, add
+ version information fields, optionally register file types, make start
+ menu shortcuts optional and add desktop shortcut (patch #3069264)
+ (Sergio Baldovi).
+20100930 ChangeLog,fuse.c,man/fuse.1,README: first updates for a "1.0" release.
+20101002 lib/{compressed,uncompressed}/*.szx: update libspectrum signature in
+ each file so we know they don't have the A-F swap bug.
+20101003 README: small update to mention WoS forums.
+20101006 configure.in: update header check for XShm.h (patch #3081497) (Gergely
+ Szasz).
+20101006 ui/gtk/{gtkkeyboard.c,gtkui.c,statusbar.c,stock.c}: use F1 as shortcut to
+ open menus, set window dialogs as transient for the main window and set a
+ fixed width for the emulation speed display (patch #3081729) (Sergio
+ Baldovi).
+20101007 ui.c: don't close a disk or mdr if a write fails (patch #3058156) (thanks,
+ Crisis) (Gergely Szasz).
Modified: trunk/fuse/ide/divide.c
===================================================================
--- trunk/fuse/ide/divide.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/divide.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: divide.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/divide.h
===================================================================
--- trunk/fuse/ide/divide.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/divide.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: divide.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/ide.c
===================================================================
--- trunk/fuse/ide/ide.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/ide.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4060 2009-07-30 13:21:38Z fredm $
+ $Id: ide.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/ide.h
===================================================================
--- trunk/fuse/ide/ide.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/ide.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: ide.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/simpleide.c
===================================================================
--- trunk/fuse/ide/simpleide.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/simpleide.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4060 2009-07-30 13:21:38Z fredm $
+ $Id: simpleide.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/simpleide.h
===================================================================
--- trunk/fuse/ide/simpleide.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/simpleide.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: simpleide.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/zxatasp.c
===================================================================
--- trunk/fuse/ide/zxatasp.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/zxatasp.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: zxatasp.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/zxatasp.h
===================================================================
--- trunk/fuse/ide/zxatasp.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/zxatasp.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: zxatasp.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/zxcf.c
===================================================================
--- trunk/fuse/ide/zxcf.c 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/zxcf.c 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: zxcf.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/ide/zxcf.h
===================================================================
--- trunk/fuse/ide/zxcf.h 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/ide/zxcf.h 2010-10-08 13:06:33 UTC (rev 650)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: zxcf.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/lib/Makefile.am
===================================================================
--- trunk/fuse/lib/Makefile.am 2010-10-07 11:32:42 UTC (rev 649)
+++ trunk/fuse/lib/Makefile.am 2010-10-08 13:06:33 UTC (rev 650)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 3150 2007-09-05 14:05:00Z pak21 $
+## $Id: Makefile.am 4154 2010-08-31 14:14:34Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
@AUTOLOAD_SNAPS@/tape_2048.szx \
@AUTOLOAD_SNAPS@/tape_2068.szx \
@AUTOLOAD_SNAPS@/tape_48.szx \
+ @AUTOLOAD_SNAPS@/tape_48_ntsc.szx \
@AUTOLOAD_SNAPS@/tape_plus2.szx \
@AUTOLOAD_SNAPS@/tape_plus2a.szx \
@AUTOLOAD_SNAPS@/tape_plus3.szx \
@@ -51,6 +52,7 @@
compressed/tape_2048.szx \
compressed/tape_2068.szx \
compressed/tape_48.szx \
+ compressed/tape_48_ntsc.szx \
compressed/tape_plus2.szx \
compressed/tape_plus2a.szx \
compressed/tape_plus3.szx \
@@ -65,6 +67,7 @@
uncompressed/tape_2048.szx \
uncompressed/tape_2068.szx \
uncompressed/tape_48.szx \
+ uncompressed/tape_48_ntsc.szx \
uncompressed/tape_plus2.szx \
uncompressed/tape_plus2a.szx \
uncompressed/tape_plus3.szx \
Modified: trunk/fuse/lib/compressed/disk_plus3.szx
===================================================================
(Binary files differ)
Modified: trunk/fuse/lib/compressed/tape_128.szx
===================================================================
(Binary files differ)
Modified: trunk/fuse/lib/compressed/tape_16.szx
===================================================================
(Binary files differ)
Modified: trunk/fuse/lib/compressed/tape_2048.szx
===================================================================
(Binary files differ)
Modified: trunk/fuse/lib/compressed/tape_2068.szx
===================================================================
(Binary files differ)
Modified: trunk/fuse/lib/compressed/tape_48.szx
===================================================================
(Binary files dif...
[truncated message content] |
