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

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 .. 17 18 19 20 21 .. 25 > >> (Page 19 of 25)

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [387] trunk/fuse/fusepb/models/Emulator.m

From: <fr...@us...> - 2007-06-17 13:35:22

Revision: 387
          http://svn.sourceforge.net/fuse-for-macosx/?rev=387&view=rev
Author:   fredm
Date:     2007-06-17 06:35:22 -0700 (Sun, 17 Jun 2007)

Log Message:
-----------
Short circuit sound-enabled emlation loop if we have run out of puff so the
user can still have a shot at using the menus to control the emulator.

Modified Paths:
--------------
    trunk/fuse/fusepb/models/Emulator.m

Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m	2007-06-17 12:26:52 UTC (rev 386)
+++ trunk/fuse/fusepb/models/Emulator.m	2007-06-17 13:35:22 UTC (rev 387)
@@ -146,9 +146,17 @@
 -(void) updateEmulationForTimeDelta:(CFAbsoluteTime)deltaTime
 {
   if( sound_enabled ) {
-    /* emulate until fifo is full */
-    while( sfifo_space( &sound_fifo ) >= (sound_stereo+1) * 2 * sound_framesiz ) {
+    int too_long = 0;
+    /* emulate until fifo is full or it takes more than a frames-worth of
+       time to do a frame because we will never catch up */
+    while( ( sfifo_space( &sound_fifo ) >=
+             (sound_stereo+1) * 2 * sound_framesiz ) && !too_long ) {
+      CFTimeInterval startTime = CFAbsoluteTimeGetCurrent();
       event_do_frame();
+      CFTimeInterval endTime = CFAbsoluteTimeGetCurrent();
+      if( (endTime - startTime) > 
+          (0.8 * sound_framesiz / (float)settings_current.sound_freq ) ) 
+        too_long = 1;
     }
   } else {
     float speed = ( settings_current.emulation_speed < 1 ?


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: [386] trunk/fuse/fusepb

From: <fr...@us...> - 2007-06-17 12:26:50

Revision: 386
          http://svn.sourceforge.net/fuse-for-macosx/?rev=386&view=rev
Author:   fredm
Date:     2007-06-17 05:26:52 -0700 (Sun, 17 Jun 2007)

Log Message:
-----------
Work around a problem that can cause an exception to be raised using the
NSConnection from several threads, don't allow the joystick selection dialog
to be posted from the emulator thread.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/fusepb/views/DisplayOpenGLView.m

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2007-06-17 11:15:49 UTC (rev 385)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2007-06-17 12:26:52 UTC (rev 386)
@@ -1235,7 +1235,7 @@
 
 - (void)openFile:(const char *)filename
 {
-  if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
+  if( !filename ) return;
 
   [[DisplayOpenGLView instance] openFile:filename];
 }

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m	2007-06-17 11:15:49 UTC (rev 385)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m	2007-06-17 12:26:52 UTC (rev 386)
@@ -218,6 +218,8 @@
   kitConnection = [[NSConnection alloc] initWithReceivePort:port1 sendPort:port2];
   [kitConnection setRootObject:self];
 
+  [kitConnection enableMultipleThreads];
+
   /* Ports switched here */
   portArray = [NSArray arrayWithObjects:port2, port1, nil];
 
@@ -571,7 +573,9 @@
 
 -(void) openFile:(const char *)filename
 {
-  [proxy_emulator openFile:filename];
+  /* openFile can end up calling a dialog for joystick selection, this must
+     run on the main thread */
+  [real_emulator openFile:filename];
 }
 
 -(void) tapeOpen:(const char *)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: [385] trunk

From: <fr...@us...> - 2007-06-17 11:15:48

Revision: 385
          http://svn.sourceforge.net/fuse-for-macosx/?rev=385&view=rev
Author:   fredm
Date:     2007-06-17 04:15:49 -0700 (Sun, 17 Jun 2007)

Log Message:
-----------
Switch to DWARF debugging format.

Modified Paths:
--------------
    trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
    trunk/audiofile/audiofile.xcodeproj/project.pbxproj
    trunk/bzip2/libbz2.xcodeproj/project.pbxproj
    trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
    trunk/lib765/lib765.xcodeproj/project.pbxproj
    trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
    trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj

Property Changed:
----------------
    trunk/audiofile/audiofile.xcodeproj/

Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2007-06-17 11:15:49 UTC (rev 385)
@@ -553,6 +553,7 @@
 		B6B0E30108CC65D5001D8411 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Development;
@@ -560,6 +561,7 @@
 		B6B0E30208CC65D5001D8411 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Deployment;
@@ -567,6 +569,7 @@
 		B6B0E30308CC65D5001D8411 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Default;


Property changes on: trunk/audiofile/audiofile.xcodeproj
___________________________________________________________________
Name: svn:ignore
   + *.mode1
*.pbxuser


Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj	2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj	2007-06-17 11:15:49 UTC (rev 385)
@@ -394,6 +394,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				FRAMEWORK_VERSION = 0.2.6;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -409,6 +410,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				FRAMEWORK_VERSION = 0.2.6;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -424,6 +426,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				FRAMEWORK_VERSION = 0.2.6;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;

Modified: trunk/bzip2/libbz2.xcodeproj/project.pbxproj
===================================================================
--- trunk/bzip2/libbz2.xcodeproj/project.pbxproj	2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/bzip2/libbz2.xcodeproj/project.pbxproj	2007-06-17 11:15:49 UTC (rev 385)
@@ -309,6 +309,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -324,6 +325,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -339,6 +341,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;

Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2007-06-17 11:15:49 UTC (rev 385)
@@ -1677,6 +1677,7 @@
 					ppc,
 				);
 				DEAD_CODE_STRIPPING = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -1694,6 +1695,8 @@
 					ppc,
 				);
 				DEAD_CODE_STRIPPING = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -1711,6 +1714,7 @@
 					ppc,
 				);
 				DEAD_CODE_STRIPPING = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;

Modified: trunk/lib765/lib765.xcodeproj/project.pbxproj
===================================================================
--- trunk/lib765/lib765.xcodeproj/project.pbxproj	2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/lib765/lib765.xcodeproj/project.pbxproj	2007-06-17 11:15:49 UTC (rev 385)
@@ -657,6 +657,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -671,6 +672,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -685,6 +687,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;

Modified: trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
===================================================================
--- trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj	2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj	2007-06-17 11:15:49 UTC (rev 385)
@@ -553,6 +553,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -567,6 +568,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -581,6 +583,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;

Modified: trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
===================================================================
--- trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj	2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj	2007-06-17 11:15:49 UTC (rev 385)
@@ -353,6 +353,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -367,6 +368,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -381,6 +383,7 @@
 					i386,
 					ppc,
 				);
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;


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: [384] trunk/fuse/machine.c

From: <fr...@us...> - 2007-06-17 01:41:08

Revision: 384
          http://svn.sourceforge.net/fuse-for-macosx/?rev=384&view=rev
Author:   fredm
Date:     2007-06-16 18:41:07 -0700 (Sat, 16 Jun 2007)

Log Message:
-----------
Make sure display is reset when loading a snapshot from the "same" machine.

Modified Paths:
--------------
    trunk/fuse/machine.c

Modified: trunk/fuse/machine.c
===================================================================
--- trunk/fuse/machine.c	2007-06-17 01:28:16 UTC (rev 383)
+++ trunk/fuse/machine.c	2007-06-17 01:41:07 UTC (rev 384)
@@ -430,6 +430,9 @@
   zxatasp_reset();
   zxcf_reset();
 
+  /* clear out old display image ready for new one */
+  display_refresh_all();
+
   return 0;
 }
 


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: [383] trunk/fuse

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

Revision: 383
          http://svn.sourceforge.net/fuse-for-macosx/?rev=383&view=rev
Author:   fredm
Date:     2007-06-16 18:28:16 -0700 (Sat, 16 Jun 2007)

Log Message:
-----------
Add OS X support for HiFi beeper.

Modified Paths:
--------------
    trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
    trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
    trunk/fuse/sound/coreaudiosound.c
    trunk/fuse/sound.c

Modified: trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Preferences.nib/info.nib	2007-06-16 13:20:50 UTC (rev 382)
+++ trunk/fuse/fusepb/nibs/Preferences.nib/info.nib	2007-06-17 01:28:16 UTC (rev 383)
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>112 18 356 240 0 0 1440 878 </string>
+	<string>69 14 356 240 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
 	<key>IBGroupedObjects</key>
@@ -32,7 +32,7 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8P2137</string>
+	<string>8P135</string>
 	<key>IBUsesTextArchiving</key>
 	<true/>
 </dict>

Modified: trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
===================================================================
--- trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib	2007-06-16 13:20:50 UTC (rev 382)
+++ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib	2007-06-17 01:28:16 UTC (rev 383)
@@ -11,32 +11,32 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1566</integer>
+				<integer>1564</integer>
 			</dict>
 			<key>NSAccessibilityConnectors</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1563</integer>
+				<integer>1561</integer>
 			</dict>
 			<key>NSAccessibilityOidsKeys</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1564</integer>
+				<integer>1562</integer>
 			</dict>
 			<key>NSAccessibilityOidsValues</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1565</integer>
+				<integer>1563</integer>
 			</dict>
 			<key>NSClassesKeys</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1260</integer>
+				<integer>1256</integer>
 			</dict>
 			<key>NSClassesValues</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1261</integer>
+				<integer>1257</integer>
 			</dict>
 			<key>NSConnections</key>
 			<dict>
@@ -56,34 +56,34 @@
 			<key>NSNamesKeys</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1195</integer>
+				<integer>1190</integer>
 			</dict>
 			<key>NSNamesValues</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1196</integer>
+				<integer>1191</integer>
 			</dict>
 			<key>NSNextOid</key>
-			<integer>1106</integer>
+			<integer>1109</integer>
 			<key>NSObjectsKeys</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1188</integer>
+				<integer>1183</integer>
 			</dict>
 			<key>NSObjectsValues</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1194</integer>
+				<integer>1189</integer>
 			</dict>
 			<key>NSOidsKeys</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1262</integer>
+				<integer>1258</integer>
 			</dict>
 			<key>NSOidsValues</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>1263</integer>
+				<integer>1259</integer>
 			</dict>
 			<key>NSRoot</key>
 			<dict>
@@ -142,7 +142,7 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
+				<integer>94</integer>
 			</dict>
 			<key>NS.objects</key>
 			<array>
@@ -160,22 +160,18 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>827</integer>
+					<integer>830</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>836</integer>
+					<integer>839</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>837</integer>
+					<integer>840</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>841</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
 					<integer>844</integer>
 				</dict>
 				<dict>
@@ -256,11 +252,11 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>910</integer>
+					<integer>904</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>917</integer>
+					<integer>913</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -268,15 +264,15 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>921</integer>
+					<integer>923</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>923</integer>
+					<integer>924</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>932</integer>
+					<integer>926</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -284,23 +280,23 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>939</integer>
+					<integer>938</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>955</integer>
+					<integer>942</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>959</integer>
+					<integer>958</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>963</integer>
+					<integer>962</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>968</integer>
+					<integer>966</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -316,7 +312,7 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>983</integer>
+					<integer>980</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -328,43 +324,43 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>993</integer>
+					<integer>992</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>995</integer>
+					<integer>996</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>997</integer>
+					<integer>998</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>999</integer>
+					<integer>1000</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1001</integer>
+					<integer>1002</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1003</integer>
+					<integer>1004</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1004</integer>
+					<integer>1006</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1005</integer>
+					<integer>1007</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1006</integer>
+					<integer>1008</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1008</integer>
+					<integer>1009</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -384,19 +380,19 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1027</integer>
+					<integer>1023</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1028</integer>
+					<integer>1030</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1029</integer>
+					<integer>1031</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1030</integer>
+					<integer>1032</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -404,7 +400,7 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1034</integer>
+					<integer>1036</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -416,7 +412,7 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1041</integer>
+					<integer>1043</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -424,55 +420,55 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1049</integer>
+					<integer>1047</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1050</integer>
+					<integer>1052</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1051</integer>
+					<integer>1053</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1052</integer>
+					<integer>1054</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1053</integer>
+					<integer>1055</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1058</integer>
+					<integer>1056</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1062</integer>
+					<integer>1061</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1068</integer>
+					<integer>1065</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1073</integer>
+					<integer>1071</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1077</integer>
+					<integer>1076</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1081</integer>
+					<integer>1080</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1083</integer>
+					<integer>1084</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1084</integer>
+					<integer>1086</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -484,15 +480,15 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1094</integer>
+					<integer>1093</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1096</integer>
+					<integer>1097</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1098</integer>
+					<integer>1099</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -504,11 +500,11 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1106</integer>
+					<integer>1107</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1108</integer>
+					<integer>1109</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -528,39 +524,39 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1122</integer>
+					<integer>1123</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1124</integer>
+					<integer>1125</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1125</integer>
+					<integer>1127</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1126</integer>
+					<integer>1128</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1127</integer>
+					<integer>1129</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1129</integer>
+					<integer>1130</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1131</integer>
+					<integer>1132</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1133</integer>
+					<integer>1134</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1135</integer>
+					<integer>1136</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -576,11 +572,11 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1148</integer>
+					<integer>1147</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1152</integer>
+					<integer>1150</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -588,43 +584,51 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1161</integer>
+					<integer>1156</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
+					<integer>1158</integer>
+				</dict>
+				<dict>
+					<key>CF$UID</key>
+					<integer>1160</integer>
+				</dict>
+				<dict>
+					<key>CF$UID</key>
 					<integer>1163</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1166</integer>
+					<integer>1165</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1168</integer>
+					<integer>1167</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1170</integer>
+					<integer>1169</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1172</integer>
+					<integer>1171</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1174</integer>
+					<integer>1173</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1176</integer>
+					<integer>1175</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1178</integer>
+					<integer>1177</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>1183</integer>
+					<integer>1179</integer>
 				</dict>
 			</array>
 		</dict>
@@ -685,12 +689,12 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>115</integer>
+				<integer>96</integer>
 			</dict>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>217</integer>
+				<integer>199</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -700,7 +704,7 @@
 			<key>NSSubviews</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>120</integer>
+				<integer>101</integer>
 			</dict>
 		</dict>
 		<string>{{18, 103}, {105, 18}}</string>
@@ -1120,7 +1124,7 @@
 			<key>NSLabel</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>826</integer>
+				<integer>829</integer>
 			</dict>
 			<key>NSSource</key>
 			<dict>
@@ -1132,22 +1136,22 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>825</integer>
+				<integer>828</integer>
 			</dict>
 			<key>NSMaxSize</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>824</integer>
+				<integer>827</integer>
 			</dict>
 			<key>NSMinSize</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>823</integer>
+				<integer>826</integer>
 			</dict>
 			<key>NSScreenRect</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>822</integer>
+				<integer>825</integer>
 			</dict>
 			<key>NSViewClass</key>
 			<dict>
@@ -1181,7 +1185,7 @@
 				<integer>46</integer>
 			</dict>
 		</dict>
-		<string>{{153, 336}, {634, 393}}</string>
+		<string>{{153, 331}, {634, 393}}</string>
 		<string>Preferences</string>
 		<string>NSPanel</string>
 		<dict>
@@ -1207,12 +1211,12 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>115</integer>
+				<integer>96</integer>
 			</dict>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>821</integer>
+				<integer>824</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -1229,7 +1233,7 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
+				<integer>94</integer>
 			</dict>
 			<key>NS.objects</key>
 			<array>
@@ -1239,11 +1243,11 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>783</integer>
+					<integer>786</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>816</integer>
+					<integer>819</integer>
 				</dict>
 			</array>
 		</dict>
@@ -1251,7 +1255,7 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>782</integer>
+				<integer>785</integer>
 			</dict>
 			<key>NSAllowTruncatedLabels</key>
 			<true/>
@@ -1265,7 +1269,7 @@
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>116</integer>
+				<integer>97</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -1275,7 +1279,7 @@
 			<key>NSSelectedTabViewItem</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>780</integer>
+				<integer>202</integer>
 			</dict>
 			<key>NSSubviews</key>
 			<dict>
@@ -1290,7 +1294,7 @@
 			<key>NSTabViewItems</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>117</integer>
+				<integer>98</integer>
 			</dict>
 			<key>NSTvFlags</key>
 			<integer>4</integer>
@@ -1299,7 +1303,7 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
+				<integer>94</integer>
 			</dict>
 			<key>NS.objects</key>
 			<array>
@@ -1313,12 +1317,12 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>115</integer>
+				<integer>96</integer>
 			</dict>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>114</integer>
+				<integer>95</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -1340,7 +1344,7 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
+				<integer>94</integer>
 			</dict>
 			<key>NS.objects</key>
 			<array>
@@ -1350,87 +1354,53 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>102</integer>
+					<integer>56</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>106</integer>
+					<integer>60</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>110</integer>
+					<integer>64</integer>
 				</dict>
+				<dict>
+					<key>CF$UID</key>
+					<integer>72</integer>
+				</dict>
+				<dict>
+					<key>CF$UID</key>
+					<integer>76</integer>
+				</dict>
+				<dict>
+					<key>CF$UID</key>
+					<integer>90</integer>
+				</dict>
 			</array>
 		</dict>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>101</integer>
+				<integer>23</integer>
 			</dict>
-			<key>NSBackgroundColor</key>
+			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>95</integer>
-			</dict>
-			<key>NSCellBackgroundColor</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>100</integer>
-			</dict>
-			<key>NSCellClass</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>93</integer>
-			</dict>
-			<key>NSCellSize</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>91</integer>
-			</dict>
-			<key>NSCells</key>
-			<dict>
-				<key>CF$UID</key>
 				<integer>54</integer>
 			</dict>
 			<key>NSEnabled</key>
 			<true/>
-			<key>NSFont</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
 				<integer>53</integer>
 			</dict>
-			<key>NSIntercellSpacing</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>92</integer>
-			</dict>
-			<key>NSMatrixFlags</key>
-			<integer>1143472128</integer>
 			<key>NSNextResponder</key>
 			<dict>
 				<key>CF$UID</key>
 				<integer>50</integer>
 			</dict>
-			<key>NSNumCols</key>
-			<integer>2</integer>
-			<key>NSNumRows</key>
-			<integer>8</integer>
-			<key>NSProtoCell</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>94</integer>
-			</dict>
-			<key>NSSelectedCell</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>55</integer>
-			</dict>
 			<key>NSSuperview</key>
 			<dict>
 				<key>CF$UID</key>
@@ -1439,85 +1409,11 @@
 			<key>NSvFlags</key>
 			<integer>256</integer>
 		</dict>
-		<string>{{13, 122}, {244, 158}}</string>
+		<string>{{18, 168}, {154, 18}}</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
-			</dict>
-			<key>NS.objects</key>
-			<array>
-				<dict>
-					<key>CF$UID</key>
-					<integer>55</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>59</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>61</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>63</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>66</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>68</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>70</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>72</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>74</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>76</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>78</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>80</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>82</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>84</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>86</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>88</integer>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
 				<integer>22</integer>
 			</dict>
 			<key>NSAlternateContents</key>
@@ -1528,20 +1424,20 @@
 			<key>NSAlternateImage</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>18</integer>
 			</dict>
 			<key>NSButtonFlags</key>
 			<integer>1211912703</integer>
 			<key>NSButtonFlags2</key>
-			<integer>0</integer>
+			<integer>2</integer>
 			<key>NSCellFlags</key>
-			<integer>-2080244224</integer>
+			<integer>67239424</integer>
 			<key>NSCellFlags2</key>
 			<integer>0</integer>
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>56</integer>
+				<integer>55</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
@@ -1562,75 +1458,40 @@
 				<key>CF$UID</key>
 				<integer>15</integer>
 			</dict>
-			<key>NSTag</key>
-			<integer>2</integer>
 		</dict>
-		<string>None</string>
+		<string>AY stereo seperation</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>20</integer>
+				<integer>23</integer>
 			</dict>
-			<key>NSImageName</key>
+			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
 				<integer>58</integer>
 			</dict>
-		</dict>
-		<string>NSRadioButton</string>
-		<dict>
-			<key>$class</key>
+			<key>NSEnabled</key>
+			<true/>
+			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
-			</dict>
-			<key>NSAlternateContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
 				<integer>57</integer>
 			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
+			<key>NSNextResponder</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>60</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSControlView</key>
+			<key>NSSuperview</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>12</integer>
+			<key>NSvFlags</key>
+			<integer>256</integer>
 		</dict>
-		<string>Timex TV</string>
+		<string>{{18, 146}, {162, 18}}</string>
 		<dict>
 			<key>$class</key>
 			<dict>
@@ -1645,12 +1506,12 @@
 			<key>NSAlternateImage</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>18</integer>
 			</dict>
 			<key>NSButtonFlags</key>
 			<integer>1211912703</integer>
 			<key>NSButtonFlags2</key>
-			<integer>0</integer>
+			<integer>2</integer>
 			<key>NSCellFlags</key>
 			<integer>67239424</integer>
 			<key>NSCellFlags2</key>
@@ -1658,12 +1519,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>62</integer>
+				<integer>59</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>56</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -1671,71 +1532,48 @@
 				<integer>21</integer>
 			</dict>
 			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
+			<integer>200</integer>
 			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
+			<integer>25</integer>
 			<key>NSSupport</key>
 			<dict>
 				<key>CF$UID</key>
 				<integer>15</integer>
 			</dict>
-			<key>NSTag</key>
-			<integer>5</integer>
 		</dict>
-		<string>2xSaI</string>
+		<string>Beeper pseudo-stereo</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>23</integer>
 			</dict>
-			<key>NSAlternateContents</key>
+			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>65</integer>
+				<integer>62</integer>
 			</dict>
-			<key>NSAlternateImage</key>
+			<key>NSEnabled</key>
+			<true/>
+			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>61</integer>
 			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
+			<key>NSNextResponder</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>64</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSControlView</key>
+			<key>NSSuperview</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>15</integer>
+			<key>NSvFlags</key>
+			<integer>256</integer>
 		</dict>
-		<string>PAL TV</string>
-		<string></string>
+		<string>{{18, 190}, {126, 18}}</string>
 		<dict>
 			<key>$class</key>
 			<dict>
@@ -1750,12 +1588,12 @@
 			<key>NSAlternateImage</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>18</integer>
 			</dict>
 			<key>NSButtonFlags</key>
 			<integer>1211912703</integer>
 			<key>NSButtonFlags2</key>
-			<integer>0</integer>
+			<integer>2</integer>
 			<key>NSCellFlags</key>
 			<integer>67239424</integer>
 			<key>NSCellFlags2</key>
@@ -1763,12 +1601,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>67</integer>
+				<integer>63</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>60</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -1776,90 +1614,58 @@
 				<integer>21</integer>
 			</dict>
 			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
+			<integer>200</integer>
 			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
+			<integer>25</integer>
 			<key>NSSupport</key>
 			<dict>
 				<key>CF$UID</key>
 				<integer>15</integer>
 			</dict>
-			<key>NSTag</key>
-			<integer>6</integer>
 		</dict>
-		<string>Super 2xSaI</string>
+		<string>Loading  sounds</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>71</integer>
 			</dict>
-			<key>NSAlternateContents</key>
+			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>65</integer>
+				<integer>66</integer>
 			</dict>
-			<key>NSAlternateImage</key>
+			<key>NSEnabled</key>
+			<true/>
+			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>65</integer>
 			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
+			<key>NSNextResponder</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>69</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSControlView</key>
+			<key>NSSuperview</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>16</integer>
+			<key>NSvFlags</key>
+			<integer>256</integer>
 		</dict>
-		<string>PAL TV 2x</string>
+		<string>{{97, 222}, {115, 25}}</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>70</integer>
 			</dict>
-			<key>NSAlternateContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>57</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
+			<key>NSAllowsTickMarkValuesOnly</key>
+			<true/>
+			<key>NSAltIncValue</key>
+			<real>0.0</real>
 			<key>NSCellFlags</key>
 			<integer>67239424</integer>
 			<key>NSCellFlags2</key>
@@ -1867,187 +1673,112 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>71</integer>
+				<integer>67</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>64</integer>
 			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
+			<key>NSMaxValue</key>
+			<real>8</real>
+			<key>NSMinValue</key>
+			<real>3</real>
+			<key>NSNumberOfTickMarks</key>
+			<integer>6</integer>
 			<key>NSSupport</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>15</integer>
+				<integer>68</integer>
 			</dict>
-			<key>NSTag</key>
-			<integer>7</integer>
+			<key>NSTickMarkPosition</key>
+			<integer>0</integer>
+			<key>NSValue</key>
+			<real>8</real>
+			<key>NSVertical</key>
+			<false/>
 		</dict>
-		<string>SuperEagle</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>45</integer>
 			</dict>
-			<key>NSAlternateContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>65</integer>
-			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>57</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>73</integer>
-			</dict>
-			<key>NSControlView</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>52</integer>
-			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>17</integer>
+			<key>NS.string</key>
+			<string></string>
 		</dict>
-		<string>PAL TV 3x</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>17</integer>
 			</dict>
-			<key>NSAlternateContents</key>
+			<key>NSName</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>21</integer>
+				<integer>69</integer>
 			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>57</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>75</integer>
-			</dict>
-			<key>NSControlView</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>52</integer>
-			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>9</integer>
+			<key>NSSize</key>
+			<real>12</real>
+			<key>NSfFlags</key>
+			<integer>16</integer>
 		</dict>
-		<string>AdvMAME 3x</string>
+		<string>Helvetica</string>
 		<dict>
+			<key>$classes</key>
+			<array>
+				<string>NSSliderCell</string>
+				<string>NSActionCell</string>
+				<string>NSCell</string>
+				<string>NSObject</string>
+			</array>
+			<key>$classname</key>
+			<string>NSSliderCell</string>
+		</dict>
+		<dict>
+			<key>$classes</key>
+			<array>
+				<string>NSSlider</string>
+				<string>NSControl</string>
+				<string>NSView</string>
+				<string>NSResponder</string>
+				<string>NSObject</string>
+			</array>
+			<key>$classname</key>
+			<string>NSSlider</string>
+		</dict>
+		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>23</integer>
 			</dict>
-			<key>NSAlternateContents</key>
+			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>21</integer>
+				<integer>74</integer>
 			</dict>
-			<key>NSAlternateImage</key>
+			<key>NSEnabled</key>
+			<true/>
+			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>73</integer>
 			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
+			<key>NSNextResponder</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>77</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSControlView</key>
+			<key>NSSuperview</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>18</integer>
+			<key>NSvFlags</key>
+			<integer>256</integer>
 		</dict>
-		<string>HQ 2x</string>
+		<string>{{18, 249}, {116, 18}}</string>
 		<dict>
 			<key>$class</key>
 			<dict>
@@ -2062,12 +1793,12 @@
 			<key>NSAlternateImage</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>18</integer>
 			</dict>
 			<key>NSButtonFlags</key>
 			<integer>1211912703</integer>
 			<key>NSButtonFlags2</key>
-			<integer>0</integer>
+			<integer>2</integer>
 			<key>NSCellFlags</key>
 			<integer>67239424</integer>
 			<key>NSCellFlags2</key>
@@ -2075,12 +1806,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>79</integer>
+				<integer>75</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>72</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -2088,396 +1819,194 @@
 				<integer>21</integer>
 			</dict>
 			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
+			<integer>200</integer>
 			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
+			<integer>25</integer>
 			<key>NSSupport</key>
 			<dict>
 				<key>CF$UID</key>
 				<integer>15</integer>
 			</dict>
-			<key>NSTag</key>
-			<integer>8</integer>
 		</dict>
-		<string>AdvMAME 2x</string>
+		<string>Enabled</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>89</integer>
 			</dict>
-			<key>NSAlternateContents</key>
+			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>21</integer>
+				<integer>78</integer>
 			</dict>
-			<key>NSAlternateImage</key>
+			<key>NSEnabled</key>
+			<true/>
+			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>77</integer>
 			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
+			<key>NSNextResponder</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>81</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSControlView</key>
+			<key>NSSuperview</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>50</integer>
 			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>19</integer>
+			<key>NSvFlags</key>
+			<integer>256</integer>
 		</dict>
-		<string>HQ 3x</string>
+		<string>{{34, 226}, {60, 17}}</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>88</integer>
 			</dict>
-			<key>NSAlternateContents</key>
+			<key>NSBackgroundColor</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>21</integer>
+				<integer>80</integer>
 			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>57</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
 			<key>NSCellFlags</key>
 			<integer>67239424</integer>
 			<key>NSCellFlags2</key>
-			<integer>0</integer>
+			<integer>4194304</integer>
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>83</integer>
+				<integer>79</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>52</integer>
+				<integer>76</integer>
 			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
 			<key>NSSupport</key>
 			<dict>
 				<key>CF$UID</key>
 				<integer>15</integer>
 			</dict>
-			<key>NSTag</key>
-			<integer>10</integer>
-		</dict>
-		<string>TV 2x</string>
-		<dict>
-			<key>$class</key>
+			<key>NSTextColor</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
-			</dict>
-			<key>NSAlternateContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>57</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
-			<dict>
-				<key>CF$UID</key>
 				<integer>85</integer>
 			</dict>
-			<key>NSControlView</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>52</integer>
-			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>13</integer>
 		</dict>
-		<string>Dot Matrix</string>
+		<string>Volume</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>84</integer>
 			</dict>
-			<key>NSAlternateContents</key>
+			<key>NSCatalogName</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>21</integer>
+				<integer>81</integer>
 			</dict>
-			<key>NSAlternateImage</key>
+			<key>NSColor</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>57</integer>
+				<integer>83</integer>
 			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
+			<key>NSColorName</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>87</integer>
+				<integer>82</integer>
 			</dict>
-			<key>NSControlView</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>52</integer>
-			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>NSTag</key>
-			<integer>11</integer>
+			<key>NSColorSpace</key>
+			<integer>6</integer>
 		</dict>
-		<string>TV 3x</string>
+		<string>System</string>
+		<string>controlColor</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>84</integer>
 			</dict>
-			<key>NSAlternateContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>65</integer>
-			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>57</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211945471</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>89</integer>
-			</dict>
-			<key>NSControlView</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>52</integer>
-			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
+			<key>NSColorSpace</key>
+			<integer>3</integer>
+			<key>NSWhite</key>
+			<data>
+			MC42NjY2NjY2OQA=
+			</data>
 		</dict>
-		<string>Radio</string>
 		<dict>
 			<key>$classes</key>
 			<array>
-				<string>NSMutableArray</string>
-				<string>NSArray</string>
+				<string>NSColor</string>
 				<string>NSObject</string>
 			</array>
 			<key>$classname</key>
-			<string>NSMutableArray</string>
+			<string>NSColor</string>
 		</dict>
-		<string>{120, 18}</string>
-		<string>{4, 2}</string>
-		<string>NSActionCell</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>22</integer>
+				<integer>84</integer>
 			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>57</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211650559</integer>
-			<key>NSButtonFlags2</key>
-			<integer>0</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>89</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>400</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>75</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>99</integer>
-			</dict>
 			<key>NSCatalogName</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>96</integer>
+				<integer>81</integer>
 			</dict>
 			<key>NSColor</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>98</integer>
+				<integer>87</integer>
 			</dict>
 			<key>NSColorName</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>97</integer>
+				<integer>86</integer>
 			</dict>
 			<key>NSColorSpace</key>
 			<integer>6</integer>
 		</dict>
-		<string>System</string>
-		<string>controlColor</string>
+		<string>controlTextColor</string>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>99</integer>
+				<integer>84</integer>
 			</dict>
 			<key>NSColorSpace</key>
 			<integer>3</integer>
 			<key>NSWhite</key>
 			<data>
-			MC42NjY2NjY2OQA=
+			MAA=
 			</data>
 		</dict>
 		<dict>
 			<key>$classes</key>
 			<array>
-				<string>NSColor</string>
+				<string>NSTextFieldCell</string>
+				<string>NSActionCell</string>
+				<string>NSCell</string>
 				<string>NSObject</string>
 			</array>
 			<key>$classname</key>
-			<string>NSColor</string>
+			<string>NSTextFieldCell</string>
 		</dict>
 		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>99</integer>
-			</dict>
-			<key>NSColorSpace</key>
-			<integer>3</integer>
-			<key>NSWhite</key>
-			<data>
-			MQA=
-			</data>
-		</dict>
-		<dict>
 			<key>$classes</key>
 			<array>
-				<string>NSMatrix</string>
-				<string>%NSMatrix</string>
+				<string>NSTextField</string>
+				<string>%NSTextField</string>
 				<string>NSControl</string>
 				<string>NSView</string>
 				<string>NSResponder</string>
 				<string>NSObject</string>
 			</array>
 			<key>$classname</key>
-			<string>NSMatrix</string>
+			<string>NSTextField</string>
 		</dict>
 		<dict>
 			<key>$class</key>
@@ -2488,14 +2017,14 @@
 			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>104</integer>
+				<integer>92</integer>
 			</dict>
 			<key>NSEnabled</key>
 			<true/>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>103</integer>
+				<integer>91</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -2510,7 +2039,7 @@
 			<key>NSvFlags</key>
 			<integer>256</integer>
 		</dict>
-		<string>{{13, 80}, {151, 18}}</string>
+		<string>{{18, 126}, {162, 18}}</string>
 		<dict>
 			<key>$class</key>
 			<dict>
@@ -2538,12 +2067,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>105</integer>
+				<integer>93</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>102</integer>
+				<integer>90</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -2560,171 +2089,17 @@
 				<integer>15</integer>
 			</dict>
 		</dict>
-		<string>Black and white TV</string>
+		<string>Hi-Fi beeper</string>
 		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>23</integer>
-			</dict>
-			<key>NSCell</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>108</integer>
-			</dict>
-			<key>NSEnabled</key>
-			<true/>
-			<key>NSFrame</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>107</integer>
-			</dict>
-			<key>NSNextResponder</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>50</integer>
-			</dict>
-			<key>NSSuperview</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>50</integer>
-			</dict>
-			<key>NSvFlags</key>
-			<integer>256</integer>
+			<key>$classes</key>
+			<array>
+				<string>NSMutableArray</string>
+				<string>NSArray</string>
+				<string>NSObject</string>
+			</array>
+			<key>$classname</key>
+			<string>NSMutableArray</string>
 		</dict>
-		<string>{{13, 100}, {86, 18}}</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>22</integer>
-			</dict>
-			<key>NSAlternateContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>18</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>2</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>109</integer>
-			</dict>
-			<key>NSControlView</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>106</integer>
-			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>200</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>25</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-		</dict>
-		<string>Bilinear</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>23</integer>
-			</dict>
-			<key>NSCell</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>112</integer>
-			</dict>
-			<key>NSEnabled</key>
-			<true/>
-			<key>NSFrame</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>111</integer>
-			</dict>
-			<key>NSNextResponder</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>50</integer>
-			</dict>
-			<key>NSSuperview</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>50</integer>
-			</dict>
-			<key>NSvFlags</key>
-			<integer>256</integer>
-		</dict>
-		<string>{{13, 60}, {218, 18}}</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>22</integer>
-			</dict>
-			<key>NSAlternateContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSAlternateImage</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>18</integer>
-			</dict>
-			<key>NSButtonFlags</key>
-			<integer>1211912703</integer>
-			<key>NSButtonFlags2</key>
-			<integer>2</integer>
-			<key>NSCellFlags</key>
-			<integer>67239424</integer>
-			<key>NSCellFlags2</key>
-			<integer>0</integer>
-			<key>NSContents</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>113</integer>
-			</dict>
-			<key>NSControlView</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>110</integer>
-			</dict>
-			<key>NSKeyEquivalent</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>21</integer>
-			</dict>
-			<key>NSPeriodicDelay</key>
-			<integer>200</integer>
-			<key>NSPeriodicInterval</key>
-			<integer>25</integer>
-			<key>NSSupport</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-		</dict>
-		<string>Use scanlines in PAL TV filters</string>
 		<string>{{10, 7}, {585, 299}}</string>
 		<dict>
 			<key>$classes</key>
@@ -2741,41 +2116,41 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
+				<integer>94</integer>
 			</dict>
 			<key>NS.objects</key>
 			<array>
 				<dict>
 					<key>CF$UID</key>
-					<integer>118</integer>
+					<integer>99</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>220</integer>
+					<integer>202</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>259</integer>
+					<integer>205</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>414</integer>
+					<integer>365</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>452</integer>
+					<integer>403</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>591</integer>
+					<integer>542</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>692</integer>
+					<integer>643</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>780</integer>
+					<integer>731</integer>
 				</dict>
 			</array>
 		</dict>
@@ -2783,22 +2158,22 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>219</integer>
+				<integer>201</integer>
 			</dict>
 			<key>NSColor</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>95</integer>
+				<integer>80</integer>
 			</dict>
 			<key>NSIdentifier</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>119</integer>
+				<integer>100</integer>
 			</dict>
 			<key>NSLabel</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>218</integer>
+				<integer>200</integer>
 			</dict>
 			<key>NSTabView</key>
 			<dict>
@@ -2824,21 +2199,21 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
+				<integer>94</integer>
 			</dict>
 			<key>NS.objects</key>
 			<array>
 				<dict>
 					<key>CF$UID</key>
-					<integer>121</integer>
+					<integer>102</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>125</integer>
+					<integer>106</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>129</integer>
+					<integer>110</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -2854,7 +2229,7 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>133</integer>
+					<integer>114</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
@@ -2862,19 +2237,19 @@
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>137</integer>
+					<integer>118</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>205</integer>
+					<integer>187</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>209</integer>
+					<integer>191</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>213</integer>
+					<integer>195</integer>
 				</dict>
 			</array>
 		</dict>
@@ -2887,14 +2262,14 @@
 			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>123</integer>
+				<integer>104</integer>
 			</dict>
 			<key>NSEnabled</key>
 			<true/>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>122</integer>
+				<integer>103</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -2937,12 +2312,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>124</integer>
+				<integer>105</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>121</integer>
+				<integer>102</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -2969,14 +2344,14 @@
 			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>127</integer>
+				<integer>108</integer>
 			</dict>
 			<key>NSEnabled</key>
 			<true/>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>126</integer>
+				<integer>107</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -3019,12 +2394,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>128</integer>
+				<integer>109</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>125</integer>
+				<integer>106</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -3051,14 +2426,14 @@
 			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>131</integer>
+				<integer>112</integer>
 			</dict>
 			<key>NSEnabled</key>
 			<true/>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>130</integer>
+				<integer>111</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -3101,12 +2476,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>132</integer>
+				<integer>113</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>129</integer>
+				<integer>110</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -3133,14 +2508,14 @@
 			<key>NSCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>135</integer>
+				<integer>116</integer>
 			</dict>
 			<key>NSEnabled</key>
 			<true/>
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>134</integer>
+				<integer>115</integer>
 			</dict>
 			<key>NSNextResponder</key>
 			<dict>
@@ -3183,12 +2558,12 @@
 			<key>NSContents</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>136</integer>
+				<integer>117</integer>
 			</dict>
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>133</integer>
+				<integer>114</integer>
 			</dict>
 			<key>NSKeyEquivalent</key>
 			<dict>
@@ -3210,32 +2585,32 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>204</integer>
+				<integer>186</integer>
 			</dict>
 			<key>NSBackgroundColor</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>95</integer>
+				<integer>80</integer>
 			</dict>
 			<key>NSCellBackgroundColor</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>100</integer>
+				<integer>185</integer>
 			</dict>
 			<key>NSCellClass</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>200</integer>
+				<integer>181</integer>
 			</dict>
 			<key>NSCellSize</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>198</integer>
+				<integer>179</integer>
 			</dict>
 			<key>NSCells</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>139</integer>
+				<integer>120</integer>
 			</dict>
 			<key>NSEnabled</key>
 			<true/>
@@ -3247,12 +2622,12 @@
 			<key>NSFrame</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>138</integer>
+				<integer>119</integer>
 			</dict>
 			<key>NSIntercellSpacing</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>199</integer>
+				<integer>180</integer>
 			</dict>
 			<key>NSMatrixFlags</key>
 			<integer>67633152</integer>
@@ -3268,7 +2643,7 @@
 			<key>NSProtoCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>201</integer>
+				<integer>182</integer>
 			</dict>
 			<key>NSSelectedCol</key>
 			<integer>-1</integer>
@@ -3287,17 +2662,17 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>90</integer>
+				<integer>94</integer>
 			</dict>
 			<key>NS.objects</key>
 			<array>
 				<dict>
 					<key>CF$UID</key>
-					<integer>140</integer>
+					<integer>121</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>181</integer>
+					<integer>162</integer>
 				</dict>
 			</array>
 		</dict>
@@ -3305,7 +2680,7 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>180</integer>
+				<integer>161</integer>
 			</dict>
 			<key>NSCellFlags</key>
 			<integer>343014977</integer>
@@ -3319,12 +2694,12 @@
 			<key>NSControlView</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>137</integer>
+				<integer>118</integer>
 			</dict>
 			<key>NSFormatter</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>141</integer>
+				<integer>122</integer>
 			</dict>
 			<key>NSSupport</key>
 			<dict>
@@ -3334,7 +2709,7 @@
 			<key>NSTitleCell</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>177</integer>
+				<integer>158</integer>
 			</dict>
 			<key>NSTitleWidth</key>
 			<real>161</real>
@@ -3343,19 +2718,19 @@
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>176</integer>
+				<integer>157</integer>
 			</dict>
 			<key>NS.allowsfloats</key>
 			<true/>
 			<key>NS.attributes</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>142</integer>
+				<integer>123</integer>
 			</dict>
 			<key>NS.decimal</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>167</integer>
+				<integer>148</integer>
 			</dict>
 			<key>NS.hasthousands</key>
 			<false/>
@@ -3364,17 +2739,17 @@
 			<key>NS.max</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>175</integer>
+				<integer>156</integer>
 			</dict>
 			<key>NS.min</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>158</integer>
+				<integer>139</integer>
 			</dict>
 			<key>NS.nan</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>172</integer>
+				<integer>153</integer>
 			</dict>
 			<key>NS.negativeattrs</key>
 			<dict>
@@ -3384,12 +2759,12 @@
 			<key>NS.negativeformat</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>169</integer>
+				<integer>150</integer>
 			</dict>
 			<key>NS.nil</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>170</integer>
+				<integer>151</integer>
 			</dict>
 			<key>NS.positiveattrs</key>
 			<dict>
@@ -3399,7 +2774,7 @@
 			<key>NS.positiveformat</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>160</integer>
+				<integer>141</integer>
 			</dict>
 			<key>NS.rounding</key>
 			<dict>
@@ -3409,120 +2784,120 @@
 			<key>NS.thousand</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>155</integer>
+				<integer>136</integer>
 			</dict>
 			<key>NS.zero</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>162</integer>
+				<integer>143</integer>
 			</dict>
 		</dict>
 		<dict>
 			<key>$class</key>
 			<dict>
 				<key>CF$UID</key>
-				<integer>174</integer>
+				<integer>155</integer>
 			</dict>
 			<key>NS.keys</key>
 			<array>
 				<dict>
 					<key>CF$UID</key>
-					<integer>143</integer>
+					<integer>124</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>144</integer>
+					<integer>125</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>145</integer>
+					<integer>126</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>146</integer>
+					<integer>127</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>147</integer>
+					<integer>128</integer>
 				</dict>
 				<dict>
 					<key>CF$UID</key>
-					<integer>148</integer>
+					<integer>129</intege...
 
[truncated message content]

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [382] trunk

From: <fr...@us...> - 2007-06-16 13:20:50

Revision: 382
          http://svn.sourceforge.net/fuse-for-macosx/?rev=382&view=rev
Author:   fredm
Date:     2007-06-16 06:20:50 -0700 (Sat, 16 Jun 2007)

Log Message:
-----------
Merge up to vendor r2957, still some local integration of new vendor
features required (record menu, hifi beeper at least).

Modified Paths:
--------------
    trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
    trunk/FuseImporter/libspectrum.h
    trunk/README
    trunk/fuse/.cvsignore
    trunk/fuse/AUTHORS
    trunk/fuse/COPYING
    trunk/fuse/Makefile.am
    trunk/fuse/README
    trunk/fuse/THANKS
    trunk/fuse/TODO
    trunk/fuse/acinclude.m4
    trunk/fuse/autogen.sh
    trunk/fuse/ay.c
    trunk/fuse/ay.h
    trunk/fuse/compat/.cvsignore
    trunk/fuse/compat/Makefile.am
    trunk/fuse/compat/dirname.c
    trunk/fuse/compat/getopt.c
    trunk/fuse/compat/getopt.h
    trunk/fuse/compat/getopt1.c
    trunk/fuse/compat/mkstemp.c
    trunk/fuse/compat.h
    trunk/fuse/configure.in
    trunk/fuse/dck.c
    trunk/fuse/dck.h
    trunk/fuse/debugger/.cvsignore
    trunk/fuse/debugger/Makefile.am
    trunk/fuse/debugger/breakpoint.c
    trunk/fuse/debugger/breakpoint.h
    trunk/fuse/debugger/command.c
    trunk/fuse/debugger/commandl.l
    trunk/fuse/debugger/commandy.y
    trunk/fuse/debugger/debugger.c
    trunk/fuse/debugger/debugger.h
    trunk/fuse/debugger/debugger_internals.h
    trunk/fuse/debugger/disassemble.c
    trunk/fuse/debugger/expression.c
    trunk/fuse/display.c
    trunk/fuse/display.h
    trunk/fuse/divide.c
    trunk/fuse/divide.h
    trunk/fuse/event.c
    trunk/fuse/event.h
    trunk/fuse/fuse.cpp
    trunk/fuse/fuse.h
    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/settings_cocoa.h
    trunk/fuse/hacking/.cvsignore
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/hacking/Makefile.am
    trunk/fuse/hacking/coding_style.txt
    trunk/fuse/hacking/cvs-tags
    trunk/fuse/hacking/implementation_notes.txt
    trunk/fuse/hacking/sound.txt
    trunk/fuse/hacking/timer.txt
    trunk/fuse/hacking/ui.txt
    trunk/fuse/ide.c
    trunk/fuse/ide.h
    trunk/fuse/if1.c
    trunk/fuse/if1.h
    trunk/fuse/if2.c
    trunk/fuse/if2.h
    trunk/fuse/input.c
    trunk/fuse/input.h
    trunk/fuse/joystick.c
    trunk/fuse/joystick.h
    trunk/fuse/kempmouse.c
    trunk/fuse/kempmouse.h
    trunk/fuse/keyboard.c
    trunk/fuse/keyboard.h
    trunk/fuse/keysyms.dat
    trunk/fuse/keysyms.pl
    trunk/fuse/lib/.cvsignore
    trunk/fuse/lib/Makefile.am
    trunk/fuse/loader.c
    trunk/fuse/loader.h
    trunk/fuse/machine.c
    trunk/fuse/machine.h
    trunk/fuse/machines/.cvsignore
    trunk/fuse/machines/Makefile.am
    trunk/fuse/machines/machines.h
    trunk/fuse/machines/pentagon.c
    trunk/fuse/machines/scorpion.c
    trunk/fuse/machines/scorpion.h
    trunk/fuse/machines/spec128.c
    trunk/fuse/machines/spec128.h
    trunk/fuse/machines/spec16.c
    trunk/fuse/machines/spec48.c
    trunk/fuse/machines/spec48.h
    trunk/fuse/machines/spec_se.c
    trunk/fuse/machines/specplus2.c
    trunk/fuse/machines/specplus2a.c
    trunk/fuse/machines/specplus3.c
    trunk/fuse/machines/specplus3.h
    trunk/fuse/machines/specplus3e.c
    trunk/fuse/machines/tc2048.c
    trunk/fuse/machines/tc2068.c
    trunk/fuse/machines/tc2068.h
    trunk/fuse/machines/ts2068.c
    trunk/fuse/man/.cvsignore
    trunk/fuse/man/Makefile.am
    trunk/fuse/man/fuse.1
    trunk/fuse/memory.c
    trunk/fuse/memory.h
    trunk/fuse/menu.c
    trunk/fuse/menu.h
    trunk/fuse/menu_data.pl
    trunk/fuse/periph.c
    trunk/fuse/periph.h
    trunk/fuse/perl/.cvsignore
    trunk/fuse/perl/Fuse/.cvsignore
    trunk/fuse/perl/Fuse/Dialog.pm
    trunk/fuse/perl/Fuse/Makefile.am
    trunk/fuse/perl/Fuse.pm
    trunk/fuse/perl/Makefile.am
    trunk/fuse/perl/cpp-perl.pl
    trunk/fuse/pokefinder/.cvsignore
    trunk/fuse/pokefinder/Makefile.am
    trunk/fuse/pokefinder/pokefinder.c
    trunk/fuse/pokefinder/pokefinder.h
    trunk/fuse/printer.c
    trunk/fuse/printer.h
    trunk/fuse/profile.c
    trunk/fuse/profile.h
    trunk/fuse/psg.c
    trunk/fuse/psg.h
    trunk/fuse/roms/.cvsignore
    trunk/fuse/roms/Makefile.am
    trunk/fuse/rzx.c
    trunk/fuse/rzx.h
    trunk/fuse/scld.c
    trunk/fuse/scld.h
    trunk/fuse/screenshot.c
    trunk/fuse/screenshot.h
    trunk/fuse/settings-header.pl
    trunk/fuse/settings.dat
    trunk/fuse/settings.pl
    trunk/fuse/simpleide.c
    trunk/fuse/simpleide.h
    trunk/fuse/slt.c
    trunk/fuse/slt.h
    trunk/fuse/snapshot.c
    trunk/fuse/snapshot.h
    trunk/fuse/sound/.cvsignore
    trunk/fuse/sound/Makefile.am
    trunk/fuse/sound/aosound.c
    trunk/fuse/sound/coreaudiosound.c
    trunk/fuse/sound/dxsound.c
    trunk/fuse/sound/hpsound.c
    trunk/fuse/sound/lowlevel.h
    trunk/fuse/sound/nullsound.c
    trunk/fuse/sound/osssound.c
    trunk/fuse/sound/sdlsound.c
    trunk/fuse/sound/sunsound.c
    trunk/fuse/sound.c
    trunk/fuse/sound.h
    trunk/fuse/spectrum.c
    trunk/fuse/spectrum.h
    trunk/fuse/tape.c
    trunk/fuse/tape.h
    trunk/fuse/timer.c
    trunk/fuse/timer.h
    trunk/fuse/trdos.c
    trunk/fuse/trdos.h
    trunk/fuse/ui/.cvsignore
    trunk/fuse/ui/Makefile.am
    trunk/fuse/ui/fb/.cvsignore
    trunk/fuse/ui/fb/Makefile.am
    trunk/fuse/ui/fb/fbdisplay.c
    trunk/fuse/ui/fb/fbdisplay.h
    trunk/fuse/ui/fb/fbjoystick.c
    trunk/fuse/ui/fb/fbkeyboard.c
    trunk/fuse/ui/fb/fbkeyboard.h
    trunk/fuse/ui/fb/fbmouse.c
    trunk/fuse/ui/fb/fbmouse.h
    trunk/fuse/ui/fb/fbui.c
    trunk/fuse/ui/ggi/.cvsignore
    trunk/fuse/ui/ggi/Makefile.am
    trunk/fuse/ui/ggi/ggi_internals.h
    trunk/fuse/ui/ggi/ggidisplay.c
    trunk/fuse/ui/ggi/ggikeyboard.c
    trunk/fuse/ui/ggi/ggiui.c
    trunk/fuse/ui/gtk/.cvsignore
    trunk/fuse/ui/gtk/Makefile.am
    trunk/fuse/ui/gtk/binary.c
    trunk/fuse/ui/gtk/browse.c
    trunk/fuse/ui/gtk/confirm.c
    trunk/fuse/ui/gtk/debugger.c
    trunk/fuse/ui/gtk/fileselector.c
    trunk/fuse/ui/gtk/gtkdisplay.c
    trunk/fuse/ui/gtk/gtkinternals.h
    trunk/fuse/ui/gtk/gtkjoystick.c
    trunk/fuse/ui/gtk/gtkkeyboard.c
    trunk/fuse/ui/gtk/gtkmouse.c
    trunk/fuse/ui/gtk/gtkui.c
    trunk/fuse/ui/gtk/memory.c
    trunk/fuse/ui/gtk/options-header.pl
    trunk/fuse/ui/gtk/options.pl
    trunk/fuse/ui/gtk/picture.c
    trunk/fuse/ui/gtk/pixmaps.c
    trunk/fuse/ui/gtk/pokefinder.c
    trunk/fuse/ui/gtk/rollback.c
    trunk/fuse/ui/gtk/roms.c
    trunk/fuse/ui/gtk/statusbar.c
    trunk/fuse/ui/gtk/stock.c
    trunk/fuse/ui/options.dat
    trunk/fuse/ui/scaler/.cvsignore
    trunk/fuse/ui/scaler/Makefile.am
    trunk/fuse/ui/scaler/scaler.c
    trunk/fuse/ui/scaler/scaler.h
    trunk/fuse/ui/scaler/scaler_internals.h
    trunk/fuse/ui/scaler/scalers.cpp
    trunk/fuse/ui/sdl/.cvsignore
    trunk/fuse/ui/sdl/Makefile.am
    trunk/fuse/ui/sdl/sdldisplay.c
    trunk/fuse/ui/sdl/sdldisplay.h
    trunk/fuse/ui/sdl/sdljoystick.c
    trunk/fuse/ui/sdl/sdljoystick.h
    trunk/fuse/ui/sdl/sdlkeyboard.c
    trunk/fuse/ui/sdl/sdlkeyboard.h
    trunk/fuse/ui/sdl/sdlui.c
    trunk/fuse/ui/svga/.cvsignore
    trunk/fuse/ui/svga/Makefile.am
    trunk/fuse/ui/svga/svgadisplay.c
    trunk/fuse/ui/svga/svgadisplay.h
    trunk/fuse/ui/svga/svgajoystick.c
    trunk/fuse/ui/svga/svgakeyboard.c
    trunk/fuse/ui/svga/svgakeyboard.h
    trunk/fuse/ui/svga/svgaui.c
    trunk/fuse/ui/ui.h
    trunk/fuse/ui/uidisplay.h
    trunk/fuse/ui/uijoystick.c
    trunk/fuse/ui/uijoystick.h
    trunk/fuse/ui/win32/.cvsignore
    trunk/fuse/ui/win32/Makefile.am
    trunk/fuse/ui/win32/debugger.c
    trunk/fuse/ui/win32/debugger.h
    trunk/fuse/ui/win32/debugger.rc
    trunk/fuse/ui/win32/del_o.bat
    trunk/fuse/ui/win32/error.c
    trunk/fuse/ui/win32/keysyms.c
    trunk/fuse/ui/win32/menu_data.c
    trunk/fuse/ui/win32/menu_data.h
    trunk/fuse/ui/win32/menu_data.rc
    trunk/fuse/ui/win32/pokefinder.c
    trunk/fuse/ui/win32/pokefinder.h
    trunk/fuse/ui/win32/pokefinder.rc
    trunk/fuse/ui/win32/statusbar.c
    trunk/fuse/ui/win32/todo.txt
    trunk/fuse/ui/win32/win32display.c
    trunk/fuse/ui/win32/win32display.h
    trunk/fuse/ui/win32/win32internals.h
    trunk/fuse/ui/win32/win32keyboard.c
    trunk/fuse/ui/win32/win32keyboard.h
    trunk/fuse/ui/win32/win32ui.c
    trunk/fuse/ui/win32/win32ui.rc
    trunk/fuse/ui/xlib/.cvsignore
    trunk/fuse/ui/xlib/Makefile.am
    trunk/fuse/ui/xlib/xdisplay.c
    trunk/fuse/ui/xlib/xdisplay.h
    trunk/fuse/ui/xlib/xerror.c
    trunk/fuse/ui/xlib/xjoystick.c
    trunk/fuse/ui/xlib/xkeyboard.c
    trunk/fuse/ui/xlib/xkeyboard.h
    trunk/fuse/ui/xlib/xui.c
    trunk/fuse/ui/xlib/xui.h
    trunk/fuse/ui.c
    trunk/fuse/uidisplay.c
    trunk/fuse/ula.c
    trunk/fuse/ula.h
    trunk/fuse/utils.c
    trunk/fuse/utils.h
    trunk/fuse/widget/.cvsignore
    trunk/fuse/widget/Makefile.am
    trunk/fuse/widget/browse.c
    trunk/fuse/widget/debugger.c
    trunk/fuse/widget/error.c
    trunk/fuse/widget/filesel.c
    trunk/fuse/widget/memory.c
    trunk/fuse/widget/menu.c
    trunk/fuse/widget/mkfusefont.pl
    trunk/fuse/widget/options-header.pl
    trunk/fuse/widget/options.pl
    trunk/fuse/widget/picture.c
    trunk/fuse/widget/pokefinder.c
    trunk/fuse/widget/query.c
    trunk/fuse/widget/roms.c
    trunk/fuse/widget/select.c
    trunk/fuse/widget/text.c
    trunk/fuse/widget/widget.c
    trunk/fuse/widget/widget.h
    trunk/fuse/widget/widget_internals.h
    trunk/fuse/z80/.cvsignore
    trunk/fuse/z80/Makefile.am
    trunk/fuse/z80/coretest.c
    trunk/fuse/z80/harness.pl
    trunk/fuse/z80/opcodes_base.dat
    trunk/fuse/z80/opcodes_cb.dat
    trunk/fuse/z80/tests/.cvsignore
    trunk/fuse/z80/tests/Makefile.am
    trunk/fuse/z80/tests/ddcb40.out
    trunk/fuse/z80/tests/ddcb41.out
    trunk/fuse/z80/tests/ddcb42.out
    trunk/fuse/z80/tests/ddcb44.out
    trunk/fuse/z80/tests/ddcb45.out
    trunk/fuse/z80/tests/ddcb46.out
    trunk/fuse/z80/tests/ddcb47.out
    trunk/fuse/z80/tests/ddcb48.out
    trunk/fuse/z80/tests/ddcb49.out
    trunk/fuse/z80/tests/ddcb4a.out
    trunk/fuse/z80/tests/ddcb4b.out
    trunk/fuse/z80/tests/ddcb4c.out
    trunk/fuse/z80/tests/ddcb4d.out
    trunk/fuse/z80/tests/ddcb50.out
    trunk/fuse/z80/tests/ddcb51.out
    trunk/fuse/z80/tests/ddcb52.out
    trunk/fuse/z80/tests/ddcb53.out
    trunk/fuse/z80/tests/ddcb54.out
    trunk/fuse/z80/tests/ddcb55.out
    trunk/fuse/z80/tests/ddcb56.out
    trunk/fuse/z80/tests/ddcb58.out
    trunk/fuse/z80/tests/ddcb5a.out
    trunk/fuse/z80/tests/ddcb5d.out
    trunk/fuse/z80/tests/ddcb5e.out
    trunk/fuse/z80/tests/ddcb60.out
    trunk/fuse/z80/tests/ddcb61.out
    trunk/fuse/z80/tests/ddcb62.out
    trunk/fuse/z80/tests/ddcb63.out
    trunk/fuse/z80/tests/ddcb64.out
    trunk/fuse/z80/tests/ddcb66.out
    trunk/fuse/z80/tests/ddcb67.out
    trunk/fuse/z80/tests/ddcb68.out
    trunk/fuse/z80/tests/ddcb69.out
    trunk/fuse/z80/tests/ddcb6a.out
    trunk/fuse/z80/tests/ddcb6b.out
    trunk/fuse/z80/tests/ddcb6d.out
    trunk/fuse/z80/tests/ddcb6e.out
    trunk/fuse/z80/tests/ddcb6f.out
    trunk/fuse/z80/tests/ddcb70.out
    trunk/fuse/z80/tests/ddcb73.out
    trunk/fuse/z80/tests/ddcb75.out
    trunk/fuse/z80/tests/ddcb76.out
    trunk/fuse/z80/tests/ddcb78.out
    trunk/fuse/z80/tests/ddcb79.out
    trunk/fuse/z80/tests/ddcb7a.out
    trunk/fuse/z80/tests/ddcb7b.out
    trunk/fuse/z80/tests/ddcb7d.out
    trunk/fuse/z80/tests/ddcb7e.out
    trunk/fuse/z80/tests/ddcb7f.out
    trunk/fuse/z80/tests/edb0.out
    trunk/fuse/z80/tests/edb1.out
    trunk/fuse/z80/tests/edb2.out
    trunk/fuse/z80/tests/edb8.out
    trunk/fuse/z80/tests/edb9.out
    trunk/fuse/z80/tests/edba.out
    trunk/fuse/z80/tests/fdcb40.out
    trunk/fuse/z80/tests/fdcb41.out
    trunk/fuse/z80/tests/fdcb42.out
    trunk/fuse/z80/tests/fdcb43.out
    trunk/fuse/z80/tests/fdcb44.out
    trunk/fuse/z80/tests/fdcb45.out
    trunk/fuse/z80/tests/fdcb46.out
    trunk/fuse/z80/tests/fdcb47.out
    trunk/fuse/z80/tests/fdcb48.out
    trunk/fuse/z80/tests/fdcb4a.out
    trunk/fuse/z80/tests/fdcb4c.out
    trunk/fuse/z80/tests/fdcb4d.out
    trunk/fuse/z80/tests/fdcb4e.out
    trunk/fuse/z80/tests/fdcb50.out
    trunk/fuse/z80/tests/fdcb51.out
    trunk/fuse/z80/tests/fdcb52.out
    trunk/fuse/z80/tests/fdcb53.out
    trunk/fuse/z80/tests/fdcb54.out
    trunk/fuse/z80/tests/fdcb55.out
    trunk/fuse/z80/tests/fdcb56.out
    trunk/fuse/z80/tests/fdcb57.out
    trunk/fuse/z80/tests/fdcb58.out
    trunk/fuse/z80/tests/fdcb5c.out
    trunk/fuse/z80/tests/fdcb5e.out
    trunk/fuse/z80/tests/fdcb60.out
    trunk/fuse/z80/tests/fdcb61.out
    trunk/fuse/z80/tests/fdcb62.out
    trunk/fuse/z80/tests/fdcb63.out
    trunk/fuse/z80/tests/fdcb64.out
    trunk/fuse/z80/tests/fdcb66.out
    trunk/fuse/z80/tests/fdcb67.out
    trunk/fuse/z80/tests/fdcb69.out
    trunk/fuse/z80/tests/fdcb6a.out
    trunk/fuse/z80/tests/fdcb6c.out
    trunk/fuse/z80/tests/fdcb6e.out
    trunk/fuse/z80/tests/fdcb6f.out
    trunk/fuse/z80/tests/fdcb70.out
    trunk/fuse/z80/tests/fdcb71.out
    trunk/fuse/z80/tests/fdcb72.out
    trunk/fuse/z80/tests/fdcb74.out
    trunk/fuse/z80/tests/fdcb76.out
    trunk/fuse/z80/tests/fdcb79.out
    trunk/fuse/z80/tests/fdcb7a.out
    trunk/fuse/z80/tests/fdcb7b.out
    trunk/fuse/z80/tests/fdcb7c.out
    trunk/fuse/z80/tests/fdcb7d.out
    trunk/fuse/z80/tests/fdcb7e.out
    trunk/fuse/z80/tests/fdcb7f.out
    trunk/fuse/z80/z80.c
    trunk/fuse/z80/z80.h
    trunk/fuse/z80/z80.pl
    trunk/fuse/z80/z80_macros.h
    trunk/fuse/z80/z80_ops.c
    trunk/fuse/zxatasp.c
    trunk/fuse/zxatasp.h
    trunk/fuse/zxcf.c
    trunk/fuse/zxcf.h
    trunk/libspectrum/config.h
    trunk/libspectrum/libspectrum/AUTHORS
    trunk/libspectrum/libspectrum/COPYING
    trunk/libspectrum/libspectrum/ChangeLog
    trunk/libspectrum/libspectrum/Makefile.am
    trunk/libspectrum/libspectrum/THANKS
    trunk/libspectrum/libspectrum/TODO
    trunk/libspectrum/libspectrum/accessor.pl
    trunk/libspectrum/libspectrum/acinclude.m4
    trunk/libspectrum/libspectrum/autogen.sh
    trunk/libspectrum/libspectrum/bzip2.c
    trunk/libspectrum/libspectrum/config.h.in
    trunk/libspectrum/libspectrum/configure.in
    trunk/libspectrum/libspectrum/creator.c
    trunk/libspectrum/libspectrum/crypto.c
    trunk/libspectrum/libspectrum/dck.c
    trunk/libspectrum/libspectrum/dll.c
    trunk/libspectrum/libspectrum/doc/.cvsignore
    trunk/libspectrum/libspectrum/doc/Makefile.am
    trunk/libspectrum/libspectrum/doc/cvs-tags
    trunk/libspectrum/libspectrum/doc/libspectrum.3
    trunk/libspectrum/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/libspectrum/hacking/.cvsignore
    trunk/libspectrum/libspectrum/hacking/ChangeLog
    trunk/libspectrum/libspectrum/hacking/Makefile.am
    trunk/libspectrum/libspectrum/ide.c
    trunk/libspectrum/libspectrum/internals.h
    trunk/libspectrum/libspectrum/libspectrum.c
    trunk/libspectrum/libspectrum/libspectrum.h.in
    trunk/libspectrum/libspectrum/make-perl.c
    trunk/libspectrum/libspectrum/microdrive.c
    trunk/libspectrum/libspectrum/myglib/.cvsignore
    trunk/libspectrum/libspectrum/myglib/Makefile.am
    trunk/libspectrum/libspectrum/myglib/ghash.c
    trunk/libspectrum/libspectrum/myglib/gslist.c
    trunk/libspectrum/libspectrum/plusd.c
    trunk/libspectrum/libspectrum/rzx.c
    trunk/libspectrum/libspectrum/sna.c
    trunk/libspectrum/libspectrum/snap_accessors.txt
    trunk/libspectrum/libspectrum/snapshot.c
    trunk/libspectrum/libspectrum/snp.c
    trunk/libspectrum/libspectrum/sp.c
    trunk/libspectrum/libspectrum/symbol_table.c
    trunk/libspectrum/libspectrum/szx.c
    trunk/libspectrum/libspectrum/tap.c
    trunk/libspectrum/libspectrum/tape.c
    trunk/libspectrum/libspectrum/tape_accessors.pl
    trunk/libspectrum/libspectrum/tape_accessors.txt
    trunk/libspectrum/libspectrum/tape_block.c
    trunk/libspectrum/libspectrum/tape_block.h
    trunk/libspectrum/libspectrum/tape_set.pl
    trunk/libspectrum/libspectrum/timings.c
    trunk/libspectrum/libspectrum/tzx_read.c
    trunk/libspectrum/libspectrum/tzx_write.c
    trunk/libspectrum/libspectrum/warajevo_read.c
    trunk/libspectrum/libspectrum/z80.c
    trunk/libspectrum/libspectrum/z80em.c
    trunk/libspectrum/libspectrum/zlib.c
    trunk/libspectrum/libspectrum/zxs.c
    trunk/libspectrum/libspectrum.h
    trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj

Added Paths:
-----------
    trunk/audiofile/
    trunk/audiofile/Info.plist
    trunk/audiofile/audiofile/
    trunk/audiofile/audiofile.xcodeproj/
    trunk/audiofile/audiofile.xcodeproj/project.pbxproj
    trunk/audiofile/config.h
    trunk/fuse/hacking/win32_todo.txt
    trunk/fuse/menu_data.dat
    trunk/fuse/sound/alsasound.c
    trunk/fuse/ui/win32/icons/Makefile.am
    trunk/fuse/windres.rc
    trunk/fuse/z80/tests/27_1.in
    trunk/fuse/z80/tests/27_1.out
    trunk/libspectrum/libspectrum/csw.c
    trunk/libspectrum/libspectrum/test/
    trunk/libspectrum/libspectrum/wav.c

Removed Paths:
-------------
    trunk/fuse/menu_data.c

Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2007-06-11 02:30:09 UTC (rev 381)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2007-06-16 13:20:50 UTC (rev 382)
@@ -11,6 +11,8 @@
 		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
 		B60E533A0827207800F2C004 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B60E53390827207800F2C004 /* main.m */; };
 		B60E533C082720EC00F2C004 /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = B60E533B082720EC00F2C004 /* GetMetadataForFile.m */; };
+		B61617260C1CE2980009ADF9 /* csw.c in Sources */ = {isa = PBXBuildFile; fileRef = B61617250C1CE2980009ADF9 /* csw.c */; };
+		B616172A0C1CE2A50009ADF9 /* wav.c in Sources */ = {isa = PBXBuildFile; fileRef = B61617290C1CE2A50009ADF9 /* wav.c */; };
 		B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */ = {isa = PBXBuildFile; fileRef = B62C1CCF0B761515000BA4E0 /* symbol_table.c */; };
 		B639B7930A6BB2C100927E24 /* z80em.c in Sources */ = {isa = PBXBuildFile; fileRef = B639B7920A6BB2C100927E24 /* z80em.c */; };
 		B6687E140A607F1D005D0FDE /* libspectrum.h.in in Resources */ = {isa = PBXBuildFile; fileRef = B6687E130A607F1D005D0FDE /* libspectrum.h.in */; };
@@ -111,6 +113,8 @@
 		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		B60E53390827207800F2C004 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		B60E533B082720EC00F2C004 /* GetMetadataForFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GetMetadataForFile.m; sourceTree = "<group>"; };
+		B61617250C1CE2980009ADF9 /* csw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = csw.c; path = ../../libspectrum/libspectrum/csw.c; sourceTree = "<group>"; };
+		B61617290C1CE2A50009ADF9 /* wav.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = wav.c; path = ../../libspectrum/libspectrum/wav.c; sourceTree = "<group>"; };
 		B62C1CCF0B761515000BA4E0 /* symbol_table.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = symbol_table.c; path = ../../libspectrum/libspectrum/symbol_table.c; sourceTree = "<group>"; };
 		B639B7920A6BB2C100927E24 /* z80em.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = z80em.c; path = ../../libspectrum/libspectrum/z80em.c; sourceTree = "<group>"; };
 		B6687E130A607F1D005D0FDE /* libspectrum.h.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = libspectrum.h.in; path = ../../libspectrum/libspectrum/libspectrum.h.in; sourceTree = "<group>"; };
@@ -233,6 +237,7 @@
 				B6BF29FF0A5FFD0100D16624 /* config.h */,
 				B6BF2A000A5FFD0100D16624 /* creator.c */,
 				B6BF2A010A5FFD0100D16624 /* crypto.c */,
+				B61617250C1CE2980009ADF9 /* csw.c */,
 				B6BF2A020A5FFD0100D16624 /* dck.c */,
 				B6BF2A030A5FFD0100D16624 /* ide.c */,
 				B6BF2A040A5FFD0100D16624 /* internals.h */,
@@ -255,6 +260,7 @@
 				B6BF2A140A5FFD0100D16624 /* tzx_read.c */,
 				B6BF2A150A5FFD0100D16624 /* tzx_write.c */,
 				B6BF2A160A5FFD0100D16624 /* warajevo_read.c */,
+				B61617290C1CE2A50009ADF9 /* wav.c */,
 				B6BF2A170A5FFD0100D16624 /* z80.c */,
 				B639B7920A6BB2C100927E24 /* z80em.c */,
 				B6BF2A180A5FFD0100D16624 /* zlib.c */,
@@ -392,6 +398,8 @@
 				B6BF2A350A5FFD0100D16624 /* zxs.c in Sources */,
 				B639B7930A6BB2C100927E24 /* z80em.c in Sources */,
 				B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */,
+				B61617260C1CE2980009ADF9 /* csw.c in Sources */,
+				B616172A0C1CE2A50009ADF9 /* wav.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -545,18 +553,21 @@
 		B6B0E30108CC65D5001D8411 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Development;
 		};
 		B6B0E30208CC65D5001D8411 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Deployment;
 		};
 		B6B0E30308CC65D5001D8411 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Default;
 		};

Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h	2007-06-11 02:30:09 UTC (rev 381)
+++ trunk/FuseImporter/libspectrum.h	2007-06-16 13:20:50 UTC (rev 382)
@@ -13,9 +13,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
    Author contact information:
 
@@ -272,6 +272,12 @@
   LIBSPECTRUM_ID_TAPE_CSW,		/* .csw tape image */
   LIBSPECTRUM_ID_TAPE_Z80EM,		/* Z80Em tape image */
 
+  /* Below here, present only in x.x.x and later */
+  LIBSPECTRUM_ID_TAPE_WAV,		/* .wav tape image */
+
+  /* Amiga entry for improved compressed file support */
+  LIBSPECTRUM_ID_COMPRESSED_XFD,	/* xfdmaster compressed file */
+
   LIBSPECTRUM_ID_SCREEN_SCR,		/* .scr screen file */
 
 } libspectrum_id_t;
@@ -716,6 +722,7 @@
 } libspectrum_tape_type;
 
 typedef struct libspectrum_tape_block libspectrum_tape_block;
+typedef struct libspectrum_tape_block_state libspectrum_tape_block_state;
 typedef struct libspectrum_tape_generalised_data_symbol_table libspectrum_tape_generalised_data_symbol_table;
 
 /* Something to step through all the blocks in a tape */
@@ -756,7 +763,8 @@
 				 libspectrum_tape_type type );
 
 libspectrum_error WIN32_DLL
-libspectrum_tape_block_init( libspectrum_tape_block *block );
+libspectrum_tape_block_init( libspectrum_tape_block *block,
+                             libspectrum_tape_block_state *state );
 
 libspectrum_error WIN32_DLL
 libspectrum_tape_block_description( char *buffer, size_t length,
@@ -804,10 +812,10 @@
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_table( libspectrum_tape_block *block, libspectrum_tape_generalised_data_symbol_table* pilot_table );
 libspectrum_dword WIN32_DLL libspectrum_tape_block_pulse_length( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_pulse_length( libspectrum_tape_block *block, libspectrum_dword pulse_length );
+libspectrum_dword WIN32_DLL libspectrum_tape_block_scale( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_scale( libspectrum_tape_block *block, libspectrum_dword scale );
 libspectrum_dword WIN32_DLL libspectrum_tape_block_pulse_lengths( libspectrum_tape_block *block, size_t idx );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_pulse_lengths( libspectrum_tape_block *block, libspectrum_dword *pulse_lengths );
-libspectrum_tape_state_type WIN32_DLL libspectrum_tape_block_state( libspectrum_tape_block *block );
-libspectrum_error WIN32_DLL libspectrum_tape_block_set_state( libspectrum_tape_block *block, libspectrum_tape_state_type state );
 libspectrum_dword WIN32_DLL libspectrum_tape_block_sync1_length( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_sync1_length( libspectrum_tape_block *block, libspectrum_dword sync1_length );
 libspectrum_dword WIN32_DLL libspectrum_tape_block_sync2_length( libspectrum_tape_block *block );
@@ -850,6 +858,15 @@
 libspectrum_tape_block WIN32_DLL *
 libspectrum_tape_current_block( libspectrum_tape *tape );
 
+/* Get the state of the active block on the tape */
+libspectrum_tape_state_type WIN32_DLL
+libspectrum_tape_state( libspectrum_tape *tape );
+
+/* Set the state of the active block on the tape */
+libspectrum_error WIN32_DLL
+libspectrum_tape_set_state( libspectrum_tape *tape,
+                            libspectrum_tape_state_type state );
+
 /* Peek at the next block on the tape */
 libspectrum_tape_block WIN32_DLL *
 libspectrum_tape_peek_next_block( libspectrum_tape *tape );
@@ -883,25 +900,36 @@
 
 /*** Routines for .tap format files ***/
 
+/* DEPRECATED: use libspectrum_tape_read() instead */
+DEPRECATED
 libspectrum_error WIN32_DLL
 libspectrum_tap_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
 		      const size_t length );
+
+/* DEPRECATED: use libspectrum_tape_write() instead */
+DEPRECATED
 libspectrum_error WIN32_DLL
 libspectrum_tap_write( libspectrum_byte **buffer, size_t *length,
 		       libspectrum_tape *tape );
 
 /*** Routines for .tzx format files ***/
 
+/* DEPRECATED: use libspectrum_tape_read() instead */
+DEPRECATED
 libspectrum_error WIN32_DLL
 libspectrum_tzx_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
 		      const size_t length );
 
+/* DEPRECATED: use libspectrum_tape_write() instead */
+DEPRECATED
 libspectrum_error WIN32_DLL
 libspectrum_tzx_write( libspectrum_byte **buffer, size_t *length,
 		       libspectrum_tape *tape );
 
 /*** Routines for Warajevo .tap format files ***/
 
+/* DEPRECATED: use libspectrum_tape_read() instead */
+DEPRECATED
 libspectrum_error WIN32_DLL
 libspectrum_warajevo_read( libspectrum_tape *tape,
 			   const libspectrum_byte *buffer, size_t length );
@@ -913,6 +941,9 @@
 				libspectrum_tape *tape );
 
 libspectrum_tape_block WIN32_DLL *
+libspectrum_tape_iterator_current( libspectrum_tape_iterator iterator );
+
+libspectrum_tape_block WIN32_DLL *
 libspectrum_tape_iterator_next( libspectrum_tape_iterator *iterator );
 
 /*** Routines for handling the TZX generalised data block symbol table

Modified: trunk/README
===================================================================
--- trunk/README	2007-06-11 02:30:09 UTC (rev 381)
+++ trunk/README	2007-06-16 13:20:50 UTC (rev 382)
@@ -9,6 +9,7 @@
 The directory structure is expected to be:
 fuse/
     FuseImporter
+    audiofile
     fuse
     lib765
     bzip2
@@ -18,6 +19,9 @@
 Full build instructions:
 Uncompress the source package, and cd into the directory created. Then:
 
+cd audiofile
+xcodebuild -configuration Deployment
+cd ..
 cd bzip2
 xcodebuild -configuration Deployment
 cd ..


Property changes on: trunk/audiofile
___________________________________________________________________
Name: svn:ignore
   + build


Added: trunk/audiofile/Info.plist
===================================================================
--- trunk/audiofile/Info.plist	                        (rev 0)
+++ trunk/audiofile/Info.plist	2007-06-16 13:20:50 UTC (rev 382)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string></string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.2.6</string>
+</dict>
+</plist>

Copied: trunk/audiofile/audiofile (from rev 381, vendor/audiofile/audiofile-0.2.6)

Added: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj	                        (rev 0)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj	2007-06-16 13:20:50 UTC (rev 382)
@@ -0,0 +1,582 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		B623958E0C1CF586003B8E87 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003A29E0 /* aes.c */; };
+		B623958F0C1CF586003B8E87 /* af_vfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003F7FC0 /* af_vfs.c */; };
+		B62395900C1CF586003B8E87 /* aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003BA6D0 /* aiff.c */; };
+		B62395910C1CF586003B8E87 /* aiffwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000000388830 /* aiffwrite.c */; };
+		B62395920C1CF586003B8E87 /* aupv.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166118B0 /* aupv.c */; };
+		B62395930C1CF586003B8E87 /* avr.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016613DF0 /* avr.c */; };
+		B62395940C1CF586003B8E87 /* avrwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003B9C10 /* avrwrite.c */; };
+		B62395950C1CF586003B8E87 /* byteorder.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016602520 /* byteorder.c */; };
+		B62395960C1CF586003B8E87 /* compression.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003D4B80 /* compression.c */; };
+		B62395970C1CF586003B8E87 /* data.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000000310F20 /* data.c */; };
+		B62395980C1CF586003B8E87 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000000327F20 /* debug.c */; };
+		B62395990C1CF586003B8E87 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003D8170 /* error.c */; };
+		B623959A0C1CF586003B8E87 /* extended.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003DC520 /* extended.c */; };
+		B623959B0C1CF586003B8E87 /* format.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000000030C140 /* format.c */; };
+		B623959C0C1CF586003B8E87 /* g711.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166160D0 /* g711.c */; };
+		B623959D0C1CF586003B8E87 /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003A2A40 /* iff.c */; };
+		B623959E0C1CF586003B8E87 /* iffwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003A2A90 /* iffwrite.c */; };
+		B623959F0C1CF586003B8E87 /* instrument.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016617950 /* instrument.c */; };
+		B62395A00C1CF586003B8E87 /* ircam.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016616130 /* ircam.c */; };
+		B62395A10C1CF586003B8E87 /* ircamwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016616180 /* ircamwrite.c */; };
+		B62395A20C1CF586003B8E87 /* loop.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166161D0 /* loop.c */; };
+		B62395A30C1CF586003B8E87 /* marker.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166180B0 /* marker.c */; };
+		B62395A40C1CF586003B8E87 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166077B0 /* misc.c */; };
+		B62395A50C1CF586003B8E87 /* modules.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016607800 /* modules.c */; };
+		B62395A60C1CF586003B8E87 /* adpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001660BDA0 /* adpcm.c */; };
+		B62395A70C1CF586003B8E87 /* g711.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016620470 /* g711.c */; };
+		B62395A80C1CF586003B8E87 /* ima.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166179C0 /* ima.c */; };
+		B62395A90C1CF586003B8E87 /* msadpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166149D0 /* msadpcm.c */; };
+		B62395AA0C1CF586003B8E87 /* pcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001660CC10 /* pcm.c */; };
+		B62395AB0C1CF586003B8E87 /* rebuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003E46C0 /* rebuffer.c */; };
+		B62395AC0C1CF586003B8E87 /* next.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016620170 /* next.c */; };
+		B62395AD0C1CF586003B8E87 /* nextwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003A0D00 /* nextwrite.c */; };
+		B62395AE0C1CF586003B8E87 /* nist.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000166155C0 /* nist.c */; };
+		B62395AF0C1CF586003B8E87 /* nistwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016612050 /* nistwrite.c */; };
+		B62395B00C1CF586003B8E87 /* openclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001661E960 /* openclose.c */; };
+		B62395B10C1CF586003B8E87 /* pcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016616EE0 /* pcm.c */; };
+		B62395B20C1CF586003B8E87 /* query.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001661D530 /* query.c */; };
+		B62395B30C1CF586003B8E87 /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001661D2A0 /* raw.c */; };
+		B62395B40C1CF586003B8E87 /* setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001661E7D0 /* setup.c */; };
+		B62395B50C1CF586003B8E87 /* track.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001660BB40 /* track.c */; };
+		B62395B60C1CF586003B8E87 /* units.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001661E180 /* units.c */; };
+		B62395B70C1CF586003B8E87 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001661F380 /* util.c */; };
+		B62395B80C1CF586003B8E87 /* wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016616B60 /* wave.c */; };
+		B62395B90C1CF586003B8E87 /* wavewrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016616BD0 /* wavewrite.c */; };
+		B66F97940C1D6FA3003CB91F /* audiofile.h in Headers */ = {isa = PBXBuildFile; fileRef = 000000000000000016607850 /* audiofile.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B66F97960C1D6FAD003CB91F /* aupvlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 00000000000000001661ECE0 /* aupvlist.h */; settings = {ATTRIBUTES = (Public, ); }; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		00000000000000000030C140 /* format.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = format.c; sourceTree = "<group>"; };
+		000000000000000000310F20 /* data.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = data.c; sourceTree = "<group>"; };
+		000000000000000000327F20 /* debug.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = debug.c; sourceTree = "<group>"; };
+		000000000000000000388830 /* aiffwrite.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = aiffwrite.c; sourceTree = "<group>"; };
+		0000000000000000003A0D00 /* nextwrite.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = nextwrite.c; sourceTree = "<group>"; };
+		0000000000000000003A2720 /* af_vfs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = af_vfs.h; sourceTree = "<group>"; };
+		0000000000000000003A28E0 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
+		0000000000000000003A29E0 /* aes.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = aes.c; sourceTree = "<group>"; };
+		0000000000000000003A2A40 /* iff.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = iff.c; sourceTree = "<group>"; };
+		0000000000000000003A2A90 /* iffwrite.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = iffwrite.c; sourceTree = "<group>"; };
+		0000000000000000003B28E0 /* aiff.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = aiff.h; sourceTree = "<group>"; };
+		0000000000000000003B9C10 /* avrwrite.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = avrwrite.c; sourceTree = "<group>"; };
+		0000000000000000003BA6D0 /* aiff.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = aiff.c; sourceTree = "<group>"; };
+		0000000000000000003D4B80 /* compression.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = compression.c; sourceTree = "<group>"; };
+		0000000000000000003D8170 /* error.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = error.c; sourceTree = "<group>"; };
+		0000000000000000003DC520 /* extended.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = extended.c; sourceTree = "<group>"; };
+		0000000000000000003E46C0 /* rebuffer.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = rebuffer.c; sourceTree = "<group>"; };
+		0000000000000000003F7FC0 /* af_vfs.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = af_vfs.c; sourceTree = "<group>"; };
+		000000000000000016600D20 /* modules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = modules.h; sourceTree = "<group>"; };
+		000000000000000016600DE0 /* next.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = next.h; sourceTree = "<group>"; };
+		000000000000000016600F40 /* nist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nist.h; sourceTree = "<group>"; };
+		000000000000000016602520 /* byteorder.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = byteorder.c; sourceTree = "<group>"; };
+		000000000000000016604F90 /* avr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = avr.h; sourceTree = "<group>"; };
+		000000000000000016605480 /* aupvinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = aupvinternal.h; sourceTree = "<group>"; };
+		0000000000000000166077B0 /* misc.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = misc.c; sourceTree = "<group>"; };
+		000000000000000016607800 /* modules.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = modules.c; sourceTree = "<group>"; };
+		000000000000000016607850 /* audiofile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = audiofile.h; sourceTree = "<group>"; };
+		00000000000000001660BB40 /* track.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = track.c; sourceTree = "<group>"; };
+		00000000000000001660BDA0 /* adpcm.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = adpcm.c; sourceTree = "<group>"; };
+		00000000000000001660C9C0 /* pcm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pcm.h; sourceTree = "<group>"; };
+		00000000000000001660CA30 /* print.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = print.h; sourceTree = "<group>"; };
+		00000000000000001660CC10 /* pcm.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = pcm.c; sourceTree = "<group>"; };
+		00000000000000001660CE50 /* g711.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = g711.h; sourceTree = "<group>"; };
+		00000000000000001660CEC0 /* ima.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ima.h; sourceTree = "<group>"; };
+		00000000000000001660D460 /* compression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = compression.h; sourceTree = "<group>"; };
+		00000000000000001660DE40 /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = adpcm.h; sourceTree = "<group>"; };
+		00000000000000001660DF20 /* g711.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = g711.h; sourceTree = "<group>"; };
+		00000000000000001660DF90 /* iff.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = iff.h; sourceTree = "<group>"; };
+		000000000000000016610EC0 /* pcm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pcm.h; sourceTree = "<group>"; };
+		000000000000000016610FE0 /* rebuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rebuffer.h; sourceTree = "<group>"; };
+		0000000000000000166118B0 /* aupv.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = aupv.c; sourceTree = "<group>"; };
+		000000000000000016612050 /* nistwrite.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = nistwrite.c; sourceTree = "<group>"; };
+		000000000000000016613DF0 /* avr.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = avr.c; sourceTree = "<group>"; };
+		0000000000000000166145A0 /* byteorder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = byteorder.h; sourceTree = "<group>"; };
+		0000000000000000166149D0 /* msadpcm.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = msadpcm.c; sourceTree = "<group>"; };
+		000000000000000016615510 /* instrument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = instrument.h; sourceTree = "<group>"; };
+		0000000000000000166155C0 /* nist.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = nist.c; sourceTree = "<group>"; };
+		0000000000000000166160D0 /* g711.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = g711.c; sourceTree = "<group>"; };
+		000000000000000016616130 /* ircam.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = ircam.c; sourceTree = "<group>"; };
+		000000000000000016616180 /* ircamwrite.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = ircamwrite.c; sourceTree = "<group>"; };
+		0000000000000000166161D0 /* loop.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = loop.c; sourceTree = "<group>"; };
+		000000000000000016616B60 /* wave.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = wave.c; sourceTree = "<group>"; };
+		000000000000000016616BD0 /* wavewrite.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = wavewrite.c; sourceTree = "<group>"; };
+		000000000000000016616EE0 /* pcm.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = pcm.c; sourceTree = "<group>"; };
+		000000000000000016617950 /* instrument.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = instrument.c; sourceTree = "<group>"; };
+		0000000000000000166179C0 /* ima.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = ima.c; sourceTree = "<group>"; };
+		0000000000000000166180B0 /* marker.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = marker.c; sourceTree = "<group>"; };
+		000000000000000016619750 /* error.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
+		000000000000000016619AE0 /* extended.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = extended.h; sourceTree = "<group>"; };
+		00000000000000001661D2A0 /* raw.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = raw.c; sourceTree = "<group>"; };
+		00000000000000001661D530 /* query.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = query.c; sourceTree = "<group>"; };
+		00000000000000001661E180 /* units.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = units.c; sourceTree = "<group>"; };
+		00000000000000001661E700 /* afinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = afinternal.h; sourceTree = "<group>"; };
+		00000000000000001661E7D0 /* setup.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = setup.c; sourceTree = "<group>"; };
+		00000000000000001661E960 /* openclose.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = openclose.c; sourceTree = "<group>"; };
+		00000000000000001661ECE0 /* aupvlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = aupvlist.h; sourceTree = "<group>"; };
+		00000000000000001661F380 /* util.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = util.c; sourceTree = "<group>"; };
+		00000000000000001661F710 /* ircam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ircam.h; sourceTree = "<group>"; };
+		00000000000000001661F940 /* msadpcm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = msadpcm.h; sourceTree = "<group>"; };
+		00000000000000001661FFA0 /* marker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = marker.h; sourceTree = "<group>"; };
+		000000000000000016620170 /* next.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = next.c; sourceTree = "<group>"; };
+		000000000000000016620470 /* g711.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = g711.c; sourceTree = "<group>"; };
+		0000000000000000166207A0 /* raw.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = raw.h; sourceTree = "<group>"; };
+		000000000000000016620860 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; };
+		0000000000000000166208E0 /* track.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = track.h; sourceTree = "<group>"; };
+		000000000000000016620A20 /* units.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = units.h; sourceTree = "<group>"; };
+		000000000000000016620B50 /* util.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
+		000000000000000016620BD0 /* wave.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wave.h; sourceTree = "<group>"; };
+		B62395C00C1CF586003B8E87 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+		B62395C10C1CF586003B8E87 /* audiofile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = audiofile.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B62395C80C1CF5AC003B8E87 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		B62395BA0C1CF586003B8E87 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0000000000000000003C6E20 /* libaudiofile */ = {
+			isa = PBXGroup;
+			children = (
+				0000000000000000003A29E0 /* aes.c */,
+				0000000000000000003F7FC0 /* af_vfs.c */,
+				0000000000000000003A2720 /* af_vfs.h */,
+				00000000000000001661E700 /* afinternal.h */,
+				0000000000000000003BA6D0 /* aiff.c */,
+				0000000000000000003B28E0 /* aiff.h */,
+				000000000000000000388830 /* aiffwrite.c */,
+				000000000000000016607850 /* audiofile.h */,
+				0000000000000000166118B0 /* aupv.c */,
+				000000000000000016605480 /* aupvinternal.h */,
+				00000000000000001661ECE0 /* aupvlist.h */,
+				000000000000000016613DF0 /* avr.c */,
+				000000000000000016604F90 /* avr.h */,
+				0000000000000000003B9C10 /* avrwrite.c */,
+				000000000000000016602520 /* byteorder.c */,
+				0000000000000000166145A0 /* byteorder.h */,
+				B62395C80C1CF5AC003B8E87 /* config.h */,
+				0000000000000000003D4B80 /* compression.c */,
+				00000000000000001660D460 /* compression.h */,
+				000000000000000000310F20 /* data.c */,
+				000000000000000000327F20 /* debug.c */,
+				0000000000000000003A28E0 /* debug.h */,
+				0000000000000000003D8170 /* error.c */,
+				000000000000000016619750 /* error.h */,
+				0000000000000000003DC520 /* extended.c */,
+				000000000000000016619AE0 /* extended.h */,
+				00000000000000000030C140 /* format.c */,
+				0000000000000000166160D0 /* g711.c */,
+				00000000000000001660DF20 /* g711.h */,
+				0000000000000000003A2A40 /* iff.c */,
+				00000000000000001660DF90 /* iff.h */,
+				0000000000000000003A2A90 /* iffwrite.c */,
+				000000000000000016617950 /* instrument.c */,
+				000000000000000016615510 /* instrument.h */,
+				000000000000000016616130 /* ircam.c */,
+				00000000000000001661F710 /* ircam.h */,
+				000000000000000016616180 /* ircamwrite.c */,
+				0000000000000000166161D0 /* loop.c */,
+				0000000000000000166180B0 /* marker.c */,
+				00000000000000001661FFA0 /* marker.h */,
+				0000000000000000166077B0 /* misc.c */,
+				00000000000000001661F020 /* modules */,
+				000000000000000016607800 /* modules.c */,
+				000000000000000016600D20 /* modules.h */,
+				000000000000000016620170 /* next.c */,
+				000000000000000016600DE0 /* next.h */,
+				0000000000000000003A0D00 /* nextwrite.c */,
+				0000000000000000166155C0 /* nist.c */,
+				000000000000000016600F40 /* nist.h */,
+				000000000000000016612050 /* nistwrite.c */,
+				00000000000000001661E960 /* openclose.c */,
+				000000000000000016616EE0 /* pcm.c */,
+				00000000000000001660C9C0 /* pcm.h */,
+				00000000000000001660CA30 /* print.h */,
+				00000000000000001661D530 /* query.c */,
+				00000000000000001661D2A0 /* raw.c */,
+				0000000000000000166207A0 /* raw.h */,
+				00000000000000001661E7D0 /* setup.c */,
+				000000000000000016620860 /* setup.h */,
+				00000000000000001660BB40 /* track.c */,
+				0000000000000000166208E0 /* track.h */,
+				00000000000000001661E180 /* units.c */,
+				000000000000000016620A20 /* units.h */,
+				00000000000000001661F380 /* util.c */,
+				000000000000000016620B50 /* util.h */,
+				000000000000000016616B60 /* wave.c */,
+				000000000000000016620BD0 /* wave.h */,
+				000000000000000016616BD0 /* wavewrite.c */,
+			);
+			name = libaudiofile;
+			path = audiofile/libaudiofile;
+			sourceTree = "<group>";
+		};
+		0000000000000000166142F0 = {
+			isa = PBXGroup;
+			children = (
+				0000000000000000003C6E20 /* libaudiofile */,
+				00000000000000001661FFF0 /* Products */,
+				B62395C00C1CF586003B8E87 /* Info.plist */,
+			);
+			sourceTree = "<group>";
+		};
+		00000000000000001661F020 /* modules */ = {
+			isa = PBXGroup;
+			children = (
+				00000000000000001660BDA0 /* adpcm.c */,
+				00000000000000001660DE40 /* adpcm.h */,
+				000000000000000016620470 /* g711.c */,
+				00000000000000001660CE50 /* g711.h */,
+				0000000000000000166179C0 /* ima.c */,
+				00000000000000001660CEC0 /* ima.h */,
+				0000000000000000166149D0 /* msadpcm.c */,
+				00000000000000001661F940 /* msadpcm.h */,
+				00000000000000001660CC10 /* pcm.c */,
+				000000000000000016610EC0 /* pcm.h */,
+				0000000000000000003E46C0 /* rebuffer.c */,
+				000000000000000016610FE0 /* rebuffer.h */,
+			);
+			path = modules;
+			sourceTree = "<group>";
+		};
+		00000000000000001661FFF0 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B62395C10C1CF586003B8E87 /* audiofile.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		B623958B0C1CF586003B8E87 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B66F97940C1D6FA3003CB91F /* audiofile.h in Headers */,
+				B66F97960C1D6FAD003CB91F /* aupvlist.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		B623958A0C1CF586003B8E87 /* audiofile Framework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B62395BC0C1CF586003B8E87 /* Build configuration list for PBXNativeTarget "audiofile Framework" */;
+			buildPhases = (
+				B623958B0C1CF586003B8E87 /* Headers */,
+				B623958C0C1CF586003B8E87 /* Resources */,
+				B623958D0C1CF586003B8E87 /* Sources */,
+				B62395BA0C1CF586003B8E87 /* Frameworks */,
+				B62395BB0C1CF586003B8E87 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "audiofile Framework";
+			productInstallPath = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+			productName = audiofile;
+			productReference = B62395C10C1CF586003B8E87 /* audiofile.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		000000000000000016601A90 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = B62395470C1CF4F8003B8E87 /* Build configuration list for PBXProject "audiofile" */;
+			hasScannedForEncodings = 1;
+			mainGroup = 0000000000000000166142F0;
+			projectDirPath = "";
+			targets = (
+				B623958A0C1CF586003B8E87 /* audiofile Framework */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		B623958C0C1CF586003B8E87 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		B62395BB0C1CF586003B8E87 /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		B623958D0C1CF586003B8E87 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B623958E0C1CF586003B8E87 /* aes.c in Sources */,
+				B623958F0C1CF586003B8E87 /* af_vfs.c in Sources */,
+				B62395900C1CF586003B8E87 /* aiff.c in Sources */,
+				B62395910C1CF586003B8E87 /* aiffwrite.c in Sources */,
+				B62395920C1CF586003B8E87 /* aupv.c in Sources */,
+				B62395930C1CF586003B8E87 /* avr.c in Sources */,
+				B62395940C1CF586003B8E87 /* avrwrite.c in Sources */,
+				B62395950C1CF586003B8E87 /* byteorder.c in Sources */,
+				B62395960C1CF586003B8E87 /* compression.c in Sources */,
+				B62395970C1CF586003B8E87 /* data.c in Sources */,
+				B62395980C1CF586003B8E87 /* debug.c in Sources */,
+				B62395990C1CF586003B8E87 /* error.c in Sources */,
+				B623959A0C1CF586003B8E87 /* extended.c in Sources */,
+				B623959B0C1CF586003B8E87 /* format.c in Sources */,
+				B623959C0C1CF586003B8E87 /* g711.c in Sources */,
+				B623959D0C1CF586003B8E87 /* iff.c in Sources */,
+				B623959E0C1CF586003B8E87 /* iffwrite.c in Sources */,
+				B623959F0C1CF586003B8E87 /* instrument.c in Sources */,
+				B62395A00C1CF586003B8E87 /* ircam.c in Sources */,
+				B62395A10C1CF586003B8E87 /* ircamwrite.c in Sources */,
+				B62395A20C1CF586003B8E87 /* loop.c in Sources */,
+				B62395A30C1CF586003B8E87 /* marker.c in Sources */,
+				B62395A40C1CF586003B8E87 /* misc.c in Sources */,
+				B62395A50C1CF586003B8E87 /* modules.c in Sources */,
+				B62395A60C1CF586003B8E87 /* adpcm.c in Sources */,
+				B62395A70C1CF586003B8E87 /* g711.c in Sources */,
+				B62395A80C1CF586003B8E87 /* ima.c in Sources */,
+				B62395A90C1CF586003B8E87 /* msadpcm.c in Sources */,
+				B62395AA0C1CF586003B8E87 /* pcm.c in Sources */,
+				B62395AB0C1CF586003B8E87 /* rebuffer.c in Sources */,
+				B62395AC0C1CF586003B8E87 /* next.c in Sources */,
+				B62395AD0C1CF586003B8E87 /* nextwrite.c in Sources */,
+				B62395AE0C1CF586003B8E87 /* nist.c in Sources */,
+				B62395AF0C1CF586003B8E87 /* nistwrite.c in Sources */,
+				B62395B00C1CF586003B8E87 /* openclose.c in Sources */,
+				B62395B10C1CF586003B8E87 /* pcm.c in Sources */,
+				B62395B20C1CF586003B8E87 /* query.c in Sources */,
+				B62395B30C1CF586003B8E87 /* raw.c in Sources */,
+				B62395B40C1CF586003B8E87 /* setup.c in Sources */,
+				B62395B50C1CF586003B8E87 /* track.c in Sources */,
+				B62395B60C1CF586003B8E87 /* units.c in Sources */,
+				B62395B70C1CF586003B8E87 /* util.c in Sources */,
+				B62395B80C1CF586003B8E87 /* wave.c in Sources */,
+				B62395B90C1CF586003B8E87 /* wavewrite.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		B62395480C1CF4F8003B8E87 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					i386,
+					ppc,
+				);
+				FRAMEWORK_VERSION = 0.2.6;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
+				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
+				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+			};
+			name = Development;
+		};
+		B62395490C1CF4F8003B8E87 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					i386,
+					ppc,
+				);
+				FRAMEWORK_VERSION = 0.2.6;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
+				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
+				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+			};
+			name = Deployment;
+		};
+		B623954A0C1CF4F8003B8E87 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					i386,
+					ppc,
+				);
+				FRAMEWORK_VERSION = 0.2.6;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
+				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
+				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+			};
+			name = Default;
+		};
+		B62395BD0C1CF586003B8E87 /* Development */ = {
+			isa = XCBuildConfiguration;
+			...
 
[truncated message content]

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [381] vendor/audiofile/audiofile-0.2.6/

From: <fr...@us...> - 2007-06-11 02:30:07

Revision: 381
          http://svn.sourceforge.net/fuse-for-macosx/?rev=381&view=rev
Author:   fredm
Date:     2007-06-10 19:30:09 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Tag vendor/audiofile/current as vendor/audiofile/audiofile-0.2.6.

Added Paths:
-----------
    vendor/audiofile/audiofile-0.2.6/

Copied: vendor/audiofile/audiofile-0.2.6 (from rev 380, vendor/audiofile/current)


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: [380] vendor/audiofile/current

From: <fr...@us...> - 2007-06-11 02:29:52

Revision: 380
          http://svn.sourceforge.net/fuse-for-macosx/?rev=380&view=rev
Author:   fredm
Date:     2007-06-10 19:29:54 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Load . into vendor/audiofile/current.

Added Paths:
-----------
    vendor/audiofile/current/ACKNOWLEDGEMENTS
    vendor/audiofile/current/AUTHORS
    vendor/audiofile/current/COPYING
    vendor/audiofile/current/COPYING.GPL
    vendor/audiofile/current/ChangeLog
    vendor/audiofile/current/INSTALL
    vendor/audiofile/current/Makefile.am
    vendor/audiofile/current/Makefile.in
    vendor/audiofile/current/NEWS
    vendor/audiofile/current/NOTES
    vendor/audiofile/current/README
    vendor/audiofile/current/TODO
    vendor/audiofile/current/aclocal.m4
    vendor/audiofile/current/audiofile-config.in
    vendor/audiofile/current/audiofile.m4
    vendor/audiofile/current/audiofile.pc.in
    vendor/audiofile/current/audiofile.spec
    vendor/audiofile/current/audiofile.spec.in
    vendor/audiofile/current/config.guess
    vendor/audiofile/current/config.h.in
    vendor/audiofile/current/config.sub
    vendor/audiofile/current/configure
    vendor/audiofile/current/configure.in
    vendor/audiofile/current/depcomp
    vendor/audiofile/current/docs/
    vendor/audiofile/current/docs/Makefile.am
    vendor/audiofile/current/docs/Makefile.in
    vendor/audiofile/current/docs/afCloseFile
    vendor/audiofile/current/docs/afGetFrameSize
    vendor/audiofile/current/docs/afGetTrackBytes
    vendor/audiofile/current/docs/afIntro
    vendor/audiofile/current/docs/afNewFileSetup
    vendor/audiofile/current/docs/afOpenFile
    vendor/audiofile/current/docs/afQuery
    vendor/audiofile/current/docs/afReadFrames
    vendor/audiofile/current/docs/afReadMisc
    vendor/audiofile/current/docs/afSeekFrame
    vendor/audiofile/current/docs/afSetErrorHandler
    vendor/audiofile/current/docs/afSetVirtualByteOrder
    vendor/audiofile/current/docs/afWriteFrames
    vendor/audiofile/current/docs/sfconvert
    vendor/audiofile/current/docs/sfinfo
    vendor/audiofile/current/examples/
    vendor/audiofile/current/examples/Makefile.am
    vendor/audiofile/current/examples/Makefile.in
    vendor/audiofile/current/examples/adddcoffset.c
    vendor/audiofile/current/examples/irixread.c
    vendor/audiofile/current/examples/irixtestloop.c
    vendor/audiofile/current/examples/linuxtest.c
    vendor/audiofile/current/examples/osxplay.c
    vendor/audiofile/current/examples/power.c
    vendor/audiofile/current/examples/sgi.c
    vendor/audiofile/current/examples/sgi.h
    vendor/audiofile/current/install-sh
    vendor/audiofile/current/libaudiofile/
    vendor/audiofile/current/libaudiofile/Makefile.am
    vendor/audiofile/current/libaudiofile/Makefile.in
    vendor/audiofile/current/libaudiofile/aes.c
    vendor/audiofile/current/libaudiofile/af_vfs.c
    vendor/audiofile/current/libaudiofile/af_vfs.h
    vendor/audiofile/current/libaudiofile/afinternal.h
    vendor/audiofile/current/libaudiofile/aiff.c
    vendor/audiofile/current/libaudiofile/aiff.h
    vendor/audiofile/current/libaudiofile/aiffwrite.c
    vendor/audiofile/current/libaudiofile/audiofile.exports
    vendor/audiofile/current/libaudiofile/audiofile.h
    vendor/audiofile/current/libaudiofile/aupv.c
    vendor/audiofile/current/libaudiofile/aupvinternal.h
    vendor/audiofile/current/libaudiofile/aupvlist.h
    vendor/audiofile/current/libaudiofile/avr.c
    vendor/audiofile/current/libaudiofile/avr.h
    vendor/audiofile/current/libaudiofile/avrwrite.c
    vendor/audiofile/current/libaudiofile/byteorder.c
    vendor/audiofile/current/libaudiofile/byteorder.h
    vendor/audiofile/current/libaudiofile/compression.c
    vendor/audiofile/current/libaudiofile/compression.h
    vendor/audiofile/current/libaudiofile/data.c
    vendor/audiofile/current/libaudiofile/debug.c
    vendor/audiofile/current/libaudiofile/debug.h
    vendor/audiofile/current/libaudiofile/error.c
    vendor/audiofile/current/libaudiofile/error.h
    vendor/audiofile/current/libaudiofile/extended.c
    vendor/audiofile/current/libaudiofile/extended.h
    vendor/audiofile/current/libaudiofile/format.c
    vendor/audiofile/current/libaudiofile/g711.c
    vendor/audiofile/current/libaudiofile/g711.h
    vendor/audiofile/current/libaudiofile/iff.c
    vendor/audiofile/current/libaudiofile/iff.h
    vendor/audiofile/current/libaudiofile/iffwrite.c
    vendor/audiofile/current/libaudiofile/instrument.c
    vendor/audiofile/current/libaudiofile/instrument.h
    vendor/audiofile/current/libaudiofile/ircam.c
    vendor/audiofile/current/libaudiofile/ircam.h
    vendor/audiofile/current/libaudiofile/ircamwrite.c
    vendor/audiofile/current/libaudiofile/loop.c
    vendor/audiofile/current/libaudiofile/marker.c
    vendor/audiofile/current/libaudiofile/marker.h
    vendor/audiofile/current/libaudiofile/misc.c
    vendor/audiofile/current/libaudiofile/modules/
    vendor/audiofile/current/libaudiofile/modules/Makefile.am
    vendor/audiofile/current/libaudiofile/modules/Makefile.in
    vendor/audiofile/current/libaudiofile/modules/adpcm.c
    vendor/audiofile/current/libaudiofile/modules/adpcm.h
    vendor/audiofile/current/libaudiofile/modules/g711.c
    vendor/audiofile/current/libaudiofile/modules/g711.h
    vendor/audiofile/current/libaudiofile/modules/ima.c
    vendor/audiofile/current/libaudiofile/modules/ima.h
    vendor/audiofile/current/libaudiofile/modules/msadpcm.c
    vendor/audiofile/current/libaudiofile/modules/msadpcm.h
    vendor/audiofile/current/libaudiofile/modules/pcm.c
    vendor/audiofile/current/libaudiofile/modules/pcm.h
    vendor/audiofile/current/libaudiofile/modules/rebuffer.c
    vendor/audiofile/current/libaudiofile/modules/rebuffer.h
    vendor/audiofile/current/libaudiofile/modules/rebuffer.template
    vendor/audiofile/current/libaudiofile/modules.c
    vendor/audiofile/current/libaudiofile/modules.h
    vendor/audiofile/current/libaudiofile/next.c
    vendor/audiofile/current/libaudiofile/next.h
    vendor/audiofile/current/libaudiofile/nextwrite.c
    vendor/audiofile/current/libaudiofile/nist.c
    vendor/audiofile/current/libaudiofile/nist.h
    vendor/audiofile/current/libaudiofile/nistwrite.c
    vendor/audiofile/current/libaudiofile/openclose.c
    vendor/audiofile/current/libaudiofile/pcm.c
    vendor/audiofile/current/libaudiofile/pcm.h
    vendor/audiofile/current/libaudiofile/print.h
    vendor/audiofile/current/libaudiofile/query.c
    vendor/audiofile/current/libaudiofile/raw.c
    vendor/audiofile/current/libaudiofile/raw.h
    vendor/audiofile/current/libaudiofile/setup.c
    vendor/audiofile/current/libaudiofile/setup.h
    vendor/audiofile/current/libaudiofile/track.c
    vendor/audiofile/current/libaudiofile/track.h
    vendor/audiofile/current/libaudiofile/units.c
    vendor/audiofile/current/libaudiofile/units.h
    vendor/audiofile/current/libaudiofile/util.c
    vendor/audiofile/current/libaudiofile/util.h
    vendor/audiofile/current/libaudiofile/wave.c
    vendor/audiofile/current/libaudiofile/wave.h
    vendor/audiofile/current/libaudiofile/wavewrite.c
    vendor/audiofile/current/ltmain.sh
    vendor/audiofile/current/missing
    vendor/audiofile/current/mkinstalldirs
    vendor/audiofile/current/sfcommands/
    vendor/audiofile/current/sfcommands/Makefile.am
    vendor/audiofile/current/sfcommands/Makefile.in
    vendor/audiofile/current/sfcommands/README
    vendor/audiofile/current/sfcommands/printinfo.c
    vendor/audiofile/current/sfcommands/sfconvert.c
    vendor/audiofile/current/sfcommands/sfinfo.c
    vendor/audiofile/current/stamp-h.in
    vendor/audiofile/current/test/
    vendor/audiofile/current/test/Makefile.am
    vendor/audiofile/current/test/Makefile.in
    vendor/audiofile/current/test/error.c
    vendor/audiofile/current/test/floatto24.c
    vendor/audiofile/current/test/instparamtest.c
    vendor/audiofile/current/test/instparamwrite.c
    vendor/audiofile/current/test/loop.c
    vendor/audiofile/current/test/misc.sh
    vendor/audiofile/current/test/miscread.c
    vendor/audiofile/current/test/miscwrite.c
    vendor/audiofile/current/test/pipe.c
    vendor/audiofile/current/test/pipe.sh
    vendor/audiofile/current/test/printmarkers.c
    vendor/audiofile/current/test/query2.c
    vendor/audiofile/current/test/seek.c
    vendor/audiofile/current/test/sixteen-to-eight.c
    vendor/audiofile/current/test/testaupv.c
    vendor/audiofile/current/test/testchannelmatrix.c
    vendor/audiofile/current/test/testfloat.c
    vendor/audiofile/current/test/testmarkers.c
    vendor/audiofile/current/test/transparency.c
    vendor/audiofile/current/test/transparency.sh
    vendor/audiofile/current/test/twentyfour.c
    vendor/audiofile/current/test/twentyfour2.c
    vendor/audiofile/current/test/writeaiff.c
    vendor/audiofile/current/test/writealaw.c
    vendor/audiofile/current/test/writeavr.c
    vendor/audiofile/current/test/writeiff.c
    vendor/audiofile/current/test/writeircam.c
    vendor/audiofile/current/test/writenext.c
    vendor/audiofile/current/test/writenist.c
    vendor/audiofile/current/test/writeraw.c
    vendor/audiofile/current/test/writeulaw.c
    vendor/audiofile/current/test/writewave.c
    vendor/audiofile/current/win32/
    vendor/audiofile/current/win32/Makefile.am
    vendor/audiofile/current/win32/Makefile.in
    vendor/audiofile/current/win32/README.win32
    vendor/audiofile/current/win32/all.dsp
    vendor/audiofile/current/win32/all.dsw
    vendor/audiofile/current/win32/audiofile.def
    vendor/audiofile/current/win32/build_all.bat
    vendor/audiofile/current/win32/clean_all.bat
    vendor/audiofile/current/win32/clean_dist.bat
    vendor/audiofile/current/win32/config.h
    vendor/audiofile/current/win32/dynamiclib.dep
    vendor/audiofile/current/win32/dynamiclib.dsp
    vendor/audiofile/current/win32/dynamiclib.mak
    vendor/audiofile/current/win32/dynmodules.dep
    vendor/audiofile/current/win32/dynmodules.dsp
    vendor/audiofile/current/win32/dynmodules.mak
    vendor/audiofile/current/win32/lib.dsw
    vendor/audiofile/current/win32/modules.dep
    vendor/audiofile/current/win32/modules.dsp
    vendor/audiofile/current/win32/modules.mak
    vendor/audiofile/current/win32/prebuild.bat
    vendor/audiofile/current/win32/sfcommands.dsp
    vendor/audiofile/current/win32/sfconvert.dep
    vendor/audiofile/current/win32/sfconvert.dsp
    vendor/audiofile/current/win32/sfconvert.mak
    vendor/audiofile/current/win32/sfinfo.dep
    vendor/audiofile/current/win32/sfinfo.dsp
    vendor/audiofile/current/win32/sfinfo.mak
    vendor/audiofile/current/win32/staticlib.dep
    vendor/audiofile/current/win32/staticlib.dsp
    vendor/audiofile/current/win32/staticlib.mak

Added: vendor/audiofile/current/ACKNOWLEDGEMENTS
===================================================================
--- vendor/audiofile/current/ACKNOWLEDGEMENTS	                        (rev 0)
+++ vendor/audiofile/current/ACKNOWLEDGEMENTS	2007-06-11 02:29:54 UTC (rev 380)
@@ -0,0 +1,24 @@
+Thanks to all who've contributed patches for the Audio File Library,
+especially Michael Krause, Jean-Francois Panisset, Simon Kagedal, Eric
+Mitchell, Bruce Forsberg, Julien Boulnois, Axel Roebel, Mark Murnane,
+Chris Wolf, Davy Durham, and Fabrizio Gennari.
+
+Thanks to Douglas Scott of SGI for helping me understand the tricky
+parts of the Audio File Library API.  Thanks to Chris Pirazzi, Scott
+Porter, and SGI for creating the Audio File Library in the first
+place.
+
+Thanks to Axel Roebel for answering all my questions regarding the
+IRCAM file format.
+
+Thanks to Chris Wolf for porting the library to Windows.
+
+Thanks also to all who have reported bugs.
+
+Thanks to Linus and the Linux community for keeping it real.
+
+Thanks to Apple for the Audio Interchange File Format.
+
+Thanks to Apple and SGI for handling audio really well.
+
+No thanks to Microsoft.

Added: vendor/audiofile/current/AUTHORS
===================================================================
--- vendor/audiofile/current/AUTHORS	                        (rev 0)
+++ vendor/audiofile/current/AUTHORS	2007-06-11 02:29:54 UTC (rev 380)
@@ -0,0 +1,5 @@
+Audio File Library Authors
+
+Michael Pruett <mi...@68...>
+
+Chris Pirazzi, Scott Porter, and Doug Scott

Added: vendor/audiofile/current/COPYING
===================================================================
--- vendor/audiofile/current/COPYING	                        (rev 0)
+++ vendor/audiofile/current/COPYING	2007-06-11 02:29:54 UTC (rev 380)
@@ -0,0 +1,482 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the 
+    Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+    Boston, MA  02111-1307  USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

Added: vendor/audiofile/current/COPYING.GPL
===================================================================
--- vendor/audiofile/current/COPYING.GPL	                        (rev 0)
+++ vendor/audiofile/current/COPYING.GPL	2007-06-11 02:29:54 UTC (rev 380)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Added: vendor/audiofile/current/ChangeLog
===================================================================
--- vendor/audiofile/current/ChangeLog	                        (rev 0)
+++ vendor/audiofile/current/ChangeLog	2007-06-11 02:29:54 UTC (rev 380)
@@ -0,0 +1,952 @@
+2004-03-05  Michael Pruett <mi...@68...>
+
+	* libaudiofile/Makefile.am, libaudiofile/audiofile.exports:
+	Export only public entry points.
+
+	* Released version 0.2.6 of the Audio File Library.
+
+2004-02-19  Michael Pruett <mi...@68...>
+
+	* libaudiofile/audiofile.h: Update comments to reflect the fact
+	that AVR and IFF/8SVX file formats are now implemented.
+
+2004-02-18  Michael Pruett <mi...@68...>
+
+	* test/Makefile.am, test/writeavr.c. test/writeiff.c,
+	test/writenist.c: Add regression tests for AVR, IFF/8SVX, and
+	NIST SPHERE file formats.
+
+2004-02-14  Michael Pruett <mi...@68...>
+
+	* configure.in, examples/Makefile.am, examples/osxplay.c: Add
+	example program for Mac OS X demonstrating audio file playback
+	using the Audio File Library and Core Audio.
+
+2004-02-09  Michael Pruett <mi...@68...>
+
+	Fabrizio Gennari has contributed several Windows-related fixes:
+
+	* libaudiofile/openclose.c, win32/config.h: Open files with
+	binary translation mode under MinGW and Cygwin.
+	* win32/sfinfo.dsp: Link against non-debug version of libaudiofile
+	when building non-debug version of sfinfo.
+	* win32/*: Sychronize MSVC project files with latest source code.
+
+2004-01-27  Michael Pruett <mi...@68...>
+
+	* libaudiofile/afinternal.h, libaudiofile/openclose.c: Store
+	file name in AFfilehandle structure.
+
+	* libaudiofile/Makefile.am, libaudiofile/avr.c,
+	libaudiofile/avr.h, libaudiofile/avrwrite.c,
+	libaudiofile/units.c: Add support for reading and writing AVR
+	files.
+
+2004-01-22  Michael Pruett <mi...@68...>
+
+	* libaudiofile/util.[ch]: Add functions for reading and writing
+	16-bit and 32-bit integers with specified byte order.
+
+	* libaudiofile/Makefile.am, libaudiofile/iff.c,
+	libaudiofile/iff.h, libaudiofile/iffwrite.c,
+	libaudiofile/units.c: Add support for reading and writing
+	IFF/8SVX files.
+
+2004-01-15  Michael Pruett <mi...@68...>
+
+	* libaudiofile/Makefile.am, libaudiofile/nist.c,
+	libaudiofile/nist.h, libaudiofile/nistwrite.c: Add support for
+	reading and writing NIST SPHERE files.
+
+	* libaudiofile/audiofile.h: Add constants for new file
+	formats.
+
+	* libaudiofile/units.c, libaudiofile/units.h: Define units for
+	new file formats.
+
+2004-01-12  Michael Pruett <mi...@68...>
+
+	* libaudiofile/Makefile.am, libaudiofile/util.[ch],
+	libaudiofile/debug.[ch]: Move debugging routines into a
+	separate file.
+
+	* libaudiofile/modules.c: Include "debug.h" for debugging
+	routines.
+
+2004-01-06  Michael Pruett <mi...@68...>
+
+	* libaudiofile/afinternal.h, libaudiofile/aiff.h,
+	libaudiofile/aiffwrite.c: Eliminate duplicate definition of
+	AIFC_VERSION_1 constant.
+
+2003-12-21  Michael Pruett <mi...@68...>
+
+	* Released version 0.2.5 of the Audio File Library.
+
+2003-12-20  Michael Pruett <mi...@68...>
+
+	* test/seek.c: Delete temporary file before exiting.
+
+2003-12-17  Michael Pruett <mi...@68...>
+
+	* libaudiofile/aiff.c: When reading an AIFF-C file with an
+	unknown compression type, return an error.
+
+	* libaudiofile/aiff.c: Skip zero-length miscellaneous chunks.
+
+	* libaudiofile/aiff.c: Add support for reading AIFF-C files with
+	little-endian audio data.
+
+2003-12-17  Michael Pruett <mi...@68...>
+
+	Fix two bugs related to processing 24-bit audio data.
+
+	* libaudiofile/data.c: Fix calculation of bytes per virtual frame
+	in the case of 24-bit audio data.  Previously, requesting more
+	than _AF_ATOMIC_NVFRAMES...
 
[truncated message content]

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [379] vendor/audiofile/current/

From: <fr...@us...> - 2007-06-11 02:28:35

Revision: 379
          http://svn.sourceforge.net/fuse-for-macosx/?rev=379&view=rev
Author:   fredm
Date:     2007-06-10 19:28:37 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Create directories to load project into.
  
  * vendor/audiofile/current: New directory.

Added Paths:
-----------
    vendor/audiofile/current/


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: [378] vendor/audiofile/

From: <fr...@us...> - 2007-06-11 02:28:07

Revision: 378
          http://svn.sourceforge.net/fuse-for-macosx/?rev=378&view=rev
Author:   fredm
Date:     2007-06-10 19:28:09 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Add new directory for vendor tracking of audiofile.

Added Paths:
-----------
    vendor/audiofile/


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: [377] trunk/fuse

From: <fr...@us...> - 2007-06-11 01:28:56

Revision: 377
          http://svn.sourceforge.net/fuse-for-macosx/?rev=377&view=rev
Author:   fredm
Date:     2007-06-10 18:28:54 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Update some version numbers and update TODO

Modified Paths:
--------------
    trunk/fuse/TODO
    trunk/fuse/fusepb/English.lproj/InfoPlist.strings
    trunk/fuse/fusepb/Info-Fuse.plist

Modified: trunk/fuse/TODO
===================================================================
--- trunk/fuse/TODO	2007-06-10 15:44:08 UTC (rev 376)
+++ trunk/fuse/TODO	2007-06-11 01:28:54 UTC (rev 377)
@@ -26,20 +26,20 @@
 X Restore joystick processing (re-use SDL joystick input files from SDL)
 X Sort out remaining FuseController calls into emulator object/thread
 X Restore application level volume adjustment
-* Use double buffered texture (in cocoadisplay have screen 0 and 1 for use of
+X Use double buffered texture (in cocoadisplay have screen 0 and 1 for use of
   DisplayOpenGLView and flip between them on frame end), should also have a
   mutex taken while DisplayOpenGLView changes and cocoadisplay flips to
   prevent thread sync problems
+* Add .WAV loader using audiofile
 * Quit keyhandling when command key is pressed
 * Use sheets rather than modal dialogs (for Save As)
 * Put in latest hq[23]x filters (HQ2x_555 from ScummVM should do the trick)
 * Make border display optional
 * Figure out why minimise icon image is partially blanked when minimise starts
-* Allow Cmd-w to close as many operations as possible
+* Allow Cmd-w to close as many windows as possible
 * Make activity icons transparent
 * Seperate out sound buffer interleaving code to allow for the use of hardware etc.
   sound mixing
-* Add .WAV loader using audiofile
 * Shouldn't be able to load Interface II carts in Pentagon
 * Add volume option to standard fuse + a sound API method to set volume (or a
   parameter to sound_lowlevel_init)

Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist	2007-06-10 15:44:08 UTC (rev 376)
+++ trunk/fuse/fusepb/Info-Fuse.plist	2007-06-11 01:28:54 UTC (rev 377)
@@ -361,11 +361,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0.1</string>
+	<string>20070611</string>
 	<key>CFBundleSignature</key>
 	<string>FUSE</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.0.1</string>
+	<string>20070611</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>


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: [376] trunk

From: <fr...@us...> - 2007-06-10 15:44:13

Revision: 376
          http://svn.sourceforge.net/fuse-for-macosx/?rev=376&view=rev
Author:   fredm
Date:     2007-06-10 08:44:08 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Merge in changes from fusegl branch (remove SDL use, use Cocoa and OpenGL for
graphics, mouse, keyboard)

Modified Paths:
--------------
    trunk/FuseImporter/libspectrum.h
    trunk/README
    trunk/fuse/ChangeLog
    trunk/fuse/README
    trunk/fuse/TODO
    trunk/fuse/compat.h
    trunk/fuse/configure.in
    trunk/fuse/display.c
    trunk/fuse/event.c
    trunk/fuse/event.h
    trunk/fuse/fuse.cpp
    trunk/fuse/fuse.h
    trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
    trunk/fuse/fusepb/FuseMenus.h
    trunk/fuse/fusepb/FuseMenus.m
    trunk/fuse/fusepb/Info-Fuse.plist
    trunk/fuse/fusepb/config.h
    trunk/fuse/fusepb/controllers/DebuggerController.m
    trunk/fuse/fusepb/controllers/FuseController.h
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/fusepb/controllers/JoystickConfigurationController.m
    trunk/fuse/fusepb/controllers/LoadBinaryController.m
    trunk/fuse/fusepb/controllers/MemoryBrowserController.m
    trunk/fuse/fusepb/controllers/PokeFinderController.m
    trunk/fuse/fusepb/controllers/PreferencesController.h
    trunk/fuse/fusepb/controllers/PreferencesController.m
    trunk/fuse/fusepb/controllers/RollbackController.m
    trunk/fuse/fusepb/controllers/SaveBinaryController.m
    trunk/fuse/fusepb/controllers/TapeBrowserController.h
    trunk/fuse/fusepb/controllers/TapeBrowserController.m
    trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
    trunk/fuse/fusepb/thumbnail.h
    trunk/fuse/fusepb/thumbnail.m
    trunk/fuse/hacking/cvs-tags
    trunk/fuse/if1.c
    trunk/fuse/joystick.c
    trunk/fuse/lib/Makefile.am
    trunk/fuse/machine.c
    trunk/fuse/machines/pentagon.c
    trunk/fuse/machines/scorpion.c
    trunk/fuse/machines/spec128.c
    trunk/fuse/machines/spec16.c
    trunk/fuse/machines/spec48.c
    trunk/fuse/machines/spec_se.c
    trunk/fuse/menu.h
    trunk/fuse/periph.c
    trunk/fuse/printer.c
    trunk/fuse/rzx.c
    trunk/fuse/screenshot.c
    trunk/fuse/settings.dat
    trunk/fuse/settings.pl
    trunk/fuse/snapshot.c
    trunk/fuse/sound/aosound.c
    trunk/fuse/sound/coreaudiosound.c
    trunk/fuse/sound/sdlsound.c
    trunk/fuse/sound.c
    trunk/fuse/spectrum.c
    trunk/fuse/spectrum.h
    trunk/fuse/ui/fb/fbdisplay.c
    trunk/fuse/ui/ggi/ggidisplay.c
    trunk/fuse/ui/gtk/gtkdisplay.c
    trunk/fuse/ui/gtk/gtkui.c
    trunk/fuse/ui/sdl/sdldisplay.c
    trunk/fuse/ui/svga/svgadisplay.c
    trunk/fuse/ui/uidisplay.h
    trunk/fuse/ui/win32/win32display.c
    trunk/fuse/ui/xlib/xdisplay.c
    trunk/fuse/ui.c
    trunk/fuse/uidisplay.c
    trunk/fuse/ula.c
    trunk/fuse/ula.h
    trunk/fuse/utils.c
    trunk/fuse/widget/Makefile.am
    trunk/fuse/widget/filesel.c
    trunk/fuse/widget/menu.c
    trunk/libspectrum/libspectrum/ChangeLog
    trunk/libspectrum/libspectrum/Makefile.am
    trunk/libspectrum/libspectrum/configure.in
    trunk/libspectrum/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/libspectrum/internals.h
    trunk/libspectrum/libspectrum/libspectrum.h.in
    trunk/libspectrum/libspectrum/rzx.c
    trunk/libspectrum/libspectrum/tap.c
    trunk/libspectrum/libspectrum/tzx_read.c
    trunk/libspectrum/libspectrum/z80.c
    trunk/libspectrum/libspectrum.h

Added Paths:
-----------
    trunk/fuse/fusepb/content_arrays/HIDJoysticks.h
    trunk/fuse/fusepb/content_arrays/HIDJoysticks.m
    trunk/fuse/fusepb/main.h
    trunk/fuse/fusepb/main.mm
    trunk/fuse/fusepb/models/
    trunk/fuse/fusepb/models/Emulator.h
    trunk/fuse/fusepb/models/Emulator.m
    trunk/fuse/fusepb/nibs/MainMenu.nib/
    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/
    trunk/fuse/fusepb/views/DisplayOpenGLView.h
    trunk/fuse/fusepb/views/DisplayOpenGLView.m
    trunk/fuse/ui/cocoa/
    trunk/fuse/ui/cocoa/SDL_joystick/
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.c
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.h
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick_c.h
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.h
    trunk/fuse/ui/cocoa/cocoadisplay.h
    trunk/fuse/ui/cocoa/cocoadisplay.m
    trunk/fuse/ui/cocoa/cocoaerror.m
    trunk/fuse/ui/cocoa/cocoajoystick.c
    trunk/fuse/ui/cocoa/cocoascreenshot.h
    trunk/fuse/ui/cocoa/cocoascreenshot.m
    trunk/fuse/ui/cocoa/cocoastatusbar.m
    trunk/fuse/ui/cocoa/cocoaui.h
    trunk/fuse/ui/cocoa/cocoaui.m
    trunk/fuse/ui/cocoa/keysyms.m

Removed Paths:
-------------
    trunk/fuse/fusepb/SDLMain.h
    trunk/fuse/fusepb/SDLMain.mm
    trunk/fuse/fusepb/content_arrays/SDLJoysticks.h
    trunk/fuse/fusepb/content_arrays/SDLJoysticks.m
    trunk/fuse/fusepb/error.m
    trunk/fuse/fusepb/keysyms.c
    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/nibs/SDLMain.nib/
    trunk/fuse/fusepb/sdlscreenshot.h
    trunk/fuse/fusepb/sdlscreenshot.m
    trunk/fuse/fusepb/sdlui.h
    trunk/fuse/fusepb/views/DisplayOpenGLView.h
    trunk/fuse/fusepb/views/DisplayOpenGLView.m
    trunk/fuse/ui/cocoa/SDL_joystick/
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.c
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.h
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick_c.h
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c
    trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.h
    trunk/fuse/ui/cocoa/cocoadisplay.h
    trunk/fuse/ui/cocoa/cocoadisplay.m
    trunk/fuse/ui/cocoa/cocoaerror.m
    trunk/fuse/ui/cocoa/cocoajoystick.c
    trunk/fuse/ui/cocoa/cocoascreenshot.h
    trunk/fuse/ui/cocoa/cocoascreenshot.m
    trunk/fuse/ui/cocoa/cocoastatusbar.m
    trunk/fuse/ui/cocoa/cocoaui.h
    trunk/fuse/ui/cocoa/cocoaui.m
    trunk/fuse/ui/cocoa/keysyms.m

Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/FuseImporter/libspectrum.h	2007-06-10 15:44:08 UTC (rev 376)
@@ -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,v 1.141.2.2 2007/05/09 20:08:07 pak21 Exp $
+   $Id: libspectrum.h.in,v 1.141 2007/02/02 16:35:42 pak21 Exp $
 
    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/README
===================================================================
--- trunk/README	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/README	2007-06-10 15:44:08 UTC (rev 376)
@@ -1,8 +1,7 @@
 FUSE for Mac OS X Source Distribution
 
 This is the source distribution of the Mac OS X version of Fuse. Full source is
-included for fuse and libspectrum, you will also need to download SDL (at least
-version 1.2.5, from <http://www.libsdl.org>). 
+included for fuse and libspectrum.
 
 Your Mac is expected to be running OS X 10.4 with the Xcode development
 environment.
@@ -10,7 +9,6 @@
 The directory structure is expected to be:
 fuse/
     FuseImporter
-    SDL.framework
     fuse
     lib765
     bzip2
@@ -18,8 +16,7 @@
     libspectrum
 
 Full build instructions:
-Uncompress the source package, cd into the directory created, and put the
-SDL.framework in place. Then:
+Uncompress the source package, and cd into the directory created. Then:
 
 cd bzip2
 xcodebuild -configuration Deployment

Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/ChangeLog	2007-06-10 15:44:08 UTC (rev 376)
@@ -807,4 +807,4 @@
 
 	* Version 0.1.0 released.
 
-$Id: ChangeLog,v 1.46.2.2 2007/05/10 07:32:38 pak21 Exp $
+$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $

Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/README	2007-06-10 15:44:08 UTC (rev 376)
@@ -141,4 +141,4 @@
 Philip Kendall <phi...@sh...>
 11 May 2007
 
-$Id: README,v 1.40.2.3 2007/05/10 07:32:38 pak21 Exp $
+$Id: README,v 1.40 2007/02/02 16:21:50 pak21 Exp $

Modified: trunk/fuse/TODO
===================================================================
--- trunk/fuse/TODO	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/TODO	2007-06-10 15:44:08 UTC (rev 376)
@@ -1,3 +1,50 @@
 TODO
 
+X Move Fuse to have a loop that runs a single frame at a time (will be callback
+  in threaded Cocoa GL UI)
+X Switch to Cocoa run loop for Fuse
+X Add GL renderer
+X Add native keyboard processing (removes SDL keyboard input dependency from
+  Fuse)
+X Add native CoreAudio sound processing (removes SDL sound dependency from Fuse)
+X Fix menus, preferences etc.
+X Add native mouse processing (removes SDL mouse input dependency from Fuse)
+X Make it possible to constrain Speccy image to "correct" aspect ratio
+X Restore fullscreen support
+X Fix scalers
+X Add support for bilinear etc. OpenGL filters
+X Add option to snap window size to 1x, 2x, 3x
+X Grab mouse in fullscreen mode
+X Move emulation to it's own object
+X Move emulation object to it's own thread and call main thread methods with
+  performSelectorOnMainThread:withObject:waitUntilDone:, call emulation thread
+  methods with DO when emulation is not paused, this should avoid sound glitches
+  when menus are selected or window is minimised
+X Fix screen updating during fastloading
+X Make sure that fuse_end is called somewhere on exit
+X Restore activity icons
+X Restore joystick processing (re-use SDL joystick input files from SDL)
+X Sort out remaining FuseController calls into emulator object/thread
+X Restore application level volume adjustment
+* Use double buffered texture (in cocoadisplay have screen 0 and 1 for use of
+  DisplayOpenGLView and flip between them on frame end), should also have a
+  mutex taken while DisplayOpenGLView changes and cocoadisplay flips to
+  prevent thread sync problems
+* Quit keyhandling when command key is pressed
+* Use sheets rather than modal dialogs (for Save As)
+* Put in latest hq[23]x filters (HQ2x_555 from ScummVM should do the trick)
+* Make border display optional
+* Figure out why minimise icon image is partially blanked when minimise starts
+* Allow Cmd-w to close as many operations as possible
+* Make activity icons transparent
+* Seperate out sound buffer interleaving code to allow for the use of hardware etc.
+  sound mixing
+* Add .WAV loader using audiofile
+* Shouldn't be able to load Interface II carts in Pentagon
+* Add volume option to standard fuse + a sound API method to set volume (or a
+  parameter to sound_lowlevel_init)
+* Save ROM into szx when using a non-default one
+* Randomise FRAMES sys var after autoload snapshot loaded in order to try and
+  get less deterministic program behaviour after load is complete
+
 $Id: TODO,v 1.4 2004/03/02 13:38:08 pak21 Exp $

Modified: trunk/fuse/compat.h
===================================================================
--- trunk/fuse/compat.h	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/compat.h	2007-06-10 15:44:08 UTC (rev 376)
@@ -58,7 +58,7 @@
 #endif				/* #ifndef HAVE_GETOPT_LONG */
 
 #ifndef HAVE_MKSTEMP
-int mkstemp( char *template );
+int mkstemp( char *tmpl );
 #endif				/* #ifndef HAVE_MKSTEMP */
 
 #endif				/* #ifndef FUSE_COMPAT_H */

Modified: trunk/fuse/configure.in
===================================================================
--- trunk/fuse/configure.in	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/configure.in	2007-06-10 15:44:08 UTC (rev 376)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155.2.3 2007/05/10 07:32:38 pak21 Exp $
+dnl $Id: configure.in,v 1.155 2007/02/02 16:21:50 pak21 Exp $
 
 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

Modified: trunk/fuse/display.c
===================================================================
--- trunk/fuse/display.c	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/display.c	2007-06-10 15:44:08 UTC (rev 376)
@@ -2,7 +2,7 @@
    Copyright (c) 1999-2006 Philip Kendall, Thomas Harte, Witold Filipczyk
                            and Fredrick Meunier
 
-   $Id: display.c,v 1.59.2.1 2007/03/06 11:39:47 fredm Exp $
+   $Id: display.c,v 1.59 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -38,8 +38,6 @@
 #include "screenshot.h"
 #include "settings.h"
 #include "spectrum.h"
-#include "tape.h"
-#include "timer.h"
 #include "ui/ui.h"
 #include "ui/uidisplay.h"
 #include "scld.h"
@@ -143,8 +141,6 @@
 static int border_changes_last = 0;
 static struct border_change_t *border_changes = NULL;
 
-static timer_type last_frame_time;
-
 struct border_change_t *
 alloc_change(void)
 {
@@ -225,8 +221,6 @@
   display_last_border = scld_last_dec.name.hires ?
                             display_hires_border : display_lores_border;
 
-  error = timer_get_real_time( &last_frame_time ); if( error ) return error;
-
   return 0;
 }
 
@@ -662,8 +656,8 @@
   else *x = 0;
 }
 
-void
-display_update_critical( int x, int y )
+inline static void
+update_critical_internal( int x, int y )
 {
   int beam_x, beam_y;
 
@@ -690,6 +684,12 @@
     copy_critical_region( beam_x, beam_y );
 }
 
+void
+display_update_critical( int x, int y )
+{
+  update_critical_internal( x, y );
+}
+
 /* Mark the 8-pixel chunk at (x,y) as maybe dirty and update the critical
    region as appropriate */
 inline static void
@@ -700,7 +700,7 @@
   if(   y >  critical_region_y                             ||
       ( y == critical_region_y && x >= critical_region_x )    ) {
 
-    display_update_critical( x, y );
+    update_critical_internal( x, y );
   }
 
   display_maybe_dirty[y] |= ( (libspectrum_dword)1 << x );
@@ -728,16 +728,7 @@
   for( i = 0; i < 8; i++ ) display_dirty_chunk( x, y + i );
 }
 
-/* Get the attributes for the eight pixels starting at
-   ( (8*x) , y ) */
-static void
-display_get_attr( int x, int y,
-                  libspectrum_byte *ink, libspectrum_byte *paper )
-{
-  display_parse_attr( display_get_attr_byte( x, y ), ink, paper );
-}
-
-void
+inline void
 display_parse_attr( libspectrum_byte attr,
 		    libspectrum_byte *ink, libspectrum_byte *paper )
 {
@@ -750,7 +741,16 @@
   }
 }
 
+/* Get the attributes for the eight pixels starting at
+   ( (8*x) , y ) */
 static void
+display_get_attr( int x, int y,
+                  libspectrum_byte *ink, libspectrum_byte *paper )
+{
+  display_parse_attr( display_get_attr_byte( x, y ), ink, paper );
+}
+
+static void
 push_border_change( int colour )
 {
   int beam_x, beam_y;
@@ -952,32 +952,14 @@
 int
 display_frame( void )
 {
-  timer_type current_time;
-  float difference;
-  int error;
-
-  /* Copy all the critical region to display_image[] */
+  /* Copy all the critical region to the display */
   copy_critical_region( DISPLAY_WIDTH_COLS, DISPLAY_HEIGHT - 1 );
   critical_region_x = critical_region_y = 0;
 
-  error = timer_get_real_time( &current_time ); if( error ) return error;
-  difference = timer_get_time_difference( &current_time, &last_frame_time );
+  update_border();
+  update_dirty_rects();
+  update_ui_screen();
 
-  /* don't bother updating the screen more than 25 times a second if we are
-     fastloading a tape, or 50 times a second if we are running at more than 100% 
-     speed */
-  if( ( !( settings_current.fastload && tape_is_playing() ) &&
-        ( settings_current.emulation_speed == 100 || difference >= (1.0/50.0) ) ) ||
-      ( settings_current.fastload && tape_is_playing() &&
-      difference >= (1.0/25.0) ) ) {
-
-    update_border();
-    update_dirty_rects();
-    update_ui_screen();
-    last_frame_time = current_time;
-
-  }
-
   if( screenshot_movie_record == 1 ) {
 
     snprintf( screenshot_movie_name, SCREENSHOT_MOVIE_FILE_MAX,

Modified: trunk/fuse/event.c
===================================================================
--- trunk/fuse/event.c	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/event.c	2007-06-10 15:44:08 UTC (rev 376)
@@ -52,6 +52,12 @@
 /* When will the next event happen? */
 libspectrum_dword event_next_event;
 
+/* We are at the end of a frame */
+int event_frame_end;
+
+/* We've had a timer event */
+int event_timer;
+
 /* The actual list of events */
 static GSList* event_list;
 
@@ -79,6 +85,8 @@
   event_list=NULL;
   event_free=NULL;
   event_next_event=event_no_events;
+  event_frame_end=0;
+  event_timer=0;
   return 0;
 }
 
@@ -119,6 +127,53 @@
 		                  : a->type - b->type;
 }
 
+/* Do a frame end event */
+void
+event_do_frame_end(void)
+{
+  if( rzx_playback ) event_force_events();
+  rzx_frame();
+  psg_frame();
+  spectrum_frame();
+  z80_interrupt();
+  ui_joystick_poll();
+  timer_estimate_speed();
+  debugger_add_time_events();
+  ui_event();
+  ui_error_frame();
+  event_frame_end=0;
+}
+
+/* Do a single frame */
+void
+event_do_frame(void)
+{
+  while( !event_frame_end ) {
+    z80_do_opcodes();
+    event_do_events();
+  }
+  event_do_frame_end();
+}
+
+/* Run until target_tstates */
+void
+event_do_timer( libspectrum_dword target_tstates )
+{
+  if( event_add( target_tstates + tstates, EVENT_TYPE_TIMER ) ) {
+    /* Some sort of dire error */
+    return;
+  }
+  event_timer=0;
+  while( !event_timer ) {
+    z80_do_opcodes();
+    event_do_events();
+    if( event_frame_end ) {
+      event_do_frame_end();
+    }
+  }
+  event_timer=0;
+}
+
 /* Do all events which have passed */
 int event_do_events(void)
 {
@@ -141,20 +196,11 @@
     case EVENT_TYPE_EDGE: tape_next_edge( ptr->tstates ); break;
 
     case EVENT_TYPE_TIMER:
-      timer_frame( ptr->tstates );
+      event_timer = 1;
       break;
 
     case EVENT_TYPE_FRAME:
-      if( rzx_playback ) event_force_events();
-      rzx_frame();
-      psg_frame();
-      spectrum_frame();
-      z80_interrupt();
-      ui_joystick_poll();
-      timer_estimate_speed();
-      debugger_add_time_events();
-      ui_event();
-      ui_error_frame();
+      event_frame_end = 1;
       break;
 
     case EVENT_TYPE_INTERRUPT:

Modified: trunk/fuse/event.h
===================================================================
--- trunk/fuse/event.h	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/event.h	2007-06-10 15:44:08 UTC (rev 376)
@@ -59,6 +59,9 @@
 /* When will the next event happen? */
 extern libspectrum_dword event_next_event;
 
+/* We are at the end of a frame */
+extern int event_frame_end;
+
 /* Set up the event list */
 int event_init(void);
 
@@ -68,6 +71,15 @@
 /* Do all events which have passed */
 int event_do_events(void);
 
+/* Do a frame end event */
+void event_do_frame_end(void);
+
+/* Do a single frame */
+void event_do_frame(void);
+
+/* Run until the next timer event */
+void event_do_timer( libspectrum_dword target_tstates );
+
 /* Called at end of frame to reduce T-state count of all entries */
 int event_frame( libspectrum_dword tstates_per_frame );
 

Modified: trunk/fuse/fuse.cpp
===================================================================
--- trunk/fuse/fuse.cpp	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/fuse.cpp	2007-06-10 15:44:08 UTC (rev 376)
@@ -1,7 +1,7 @@
 /* fuse.c: The Free Unix Spectrum Emulator
    Copyright (c) 1999-2007 Philip Kendall
 
-   $Id: fuse.c,v 1.133.2.3 2007/04/11 09:39:32 pak21 Exp $
+   $Id: fuse.c,v 1.133 2007/02/02 16:21:51 pak21 Exp $
 
    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
@@ -82,7 +82,7 @@
 }
 
 /* What name were we called under? */
-char *fuse_progname;
+const char *fuse_progname;
 
 /* Which directory were we started in? */
 char fuse_directory[ PATH_MAX ];
@@ -119,8 +119,6 @@
 
 } start_files_t;
 
-static int fuse_init(int argc, char **argv);
-
 static int creator_init( void );
 static void fuse_show_copyright(void);
 static void fuse_show_version( void );
@@ -131,9 +129,7 @@
 				 start_files_t *start_files );
 static int do_start_files( start_files_t *start_files );
 
-static int fuse_end(void);
-
-int main(int argc, char **argv)
+int old_main(int argc, char **argv)
 {
   if(fuse_init(argc,argv)) {
     fprintf(stderr,"%s: error initialising -- giving up!\n", fuse_progname);
@@ -144,8 +140,7 @@
       settings_current.show_version ) return 0;
 
   while( !fuse_exiting ) {
-    z80_do_opcodes();
-    event_do_events();
+    event_do_frame();
   }
 
   fuse_end();
@@ -154,7 +149,7 @@
 
 }
 
-static int fuse_init(int argc, char **argv)
+int fuse_init(int argc, char **argv)
 {
   int error, first_arg;
   char *start_scaler;
@@ -726,7 +721,7 @@
 }
 
 /* Tidy-up function called at end of emulation */
-static int fuse_end(void)
+int fuse_end(void)
 {
   /* Must happen before memory is deallocated as we read the character
      set from memory for the text output */

Modified: trunk/fuse/fuse.h
===================================================================
--- trunk/fuse/fuse.h	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/fuse.h	2007-06-10 15:44:08 UTC (rev 376)
@@ -33,7 +33,7 @@
 
 #include "compat.h"
 
-extern char *fuse_progname;		/* argv[0] */
+extern const char *fuse_progname;	/* argv[0] */
 extern char fuse_directory[ PATH_MAX ];	/* The directory we started in */
 
 extern int fuse_exiting;		/* Shall we exit now? */
@@ -44,6 +44,11 @@
 
 void fuse_abort( void ) GCC_NORETURN;	/* Emergency shutdown */
 
+int fuse_init(int argc, char **argv);
+
+int fuse_end(void);                     /* Tidy-up function called at end of
+                                           emulation */
+
 extern libspectrum_creator *fuse_creator; /* Creator information for file
 					     formats which support this */
 

Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2007-06-10 15:44:08 UTC (rev 376)
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		B615BFE70B4261E50082D535 /* HIDJoysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B615BFE50B4261E50082D535 /* HIDJoysticks.h */; };
+		B615BFE80B4261E50082D535 /* HIDJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B615BFE60B4261E50082D535 /* HIDJoysticks.m */; };
 		B61F459309121DF100C8096C /* Fuse Help in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F905ED05CDA24300C2F10D /* Fuse Help */; };
 		B61F459409121DF100C8096C /* disk_plus3.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F2076596C700DE7E81 /* disk_plus3.szx */; };
 		B61F459509121DF100C8096C /* tape_16.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F4076596FD00DE7E81 /* tape_16.szx */; };
@@ -21,13 +23,9 @@
 		B61F459F09121DF100C8096C /* tape_scorpion.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C40A0765988200DE7E81 /* tape_scorpion.szx */; };
 		B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; };
 		B61F45A309121DF100C8096C /* 765.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C0750396490901C2A5B9 /* 765.framework */; };
-		B61F45A409121DF100C8096C /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F50F65A003B2355701A804BA /* SDL.framework */; };
 		B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; };
 		B61F45A709121DF100C8096C /* libbz2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
-		B61F45A909121DF100C8096C /* SDLMain.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985400389209A01A804BA /* SDLMain.h */; };
 		B61F45AA09121DF100C8096C /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F5598598038921C501A804BA /* config.h */; };
-		B61F45AB09121DF100C8096C /* sdldisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985A40389221501A804BA /* sdldisplay.h */; };
-		B61F45AC09121DF100C8096C /* sdlkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985A60389221501A804BA /* sdlkeyboard.h */; };
 		B61F45AD09121DF100C8096C /* ui.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AD0389222701A804BA /* ui.h */; };
 		B61F45AE09121DF100C8096C /* uidisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AE0389222701A804BA /* uidisplay.h */; };
 		B61F45AF09121DF100C8096C /* z80_macros.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985B10389224001A804BA /* z80_macros.h */; };
@@ -61,9 +59,7 @@
 		B61F45CB09121DF100C8096C /* debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = B68CB2C503DD920300A804BA /* debugger.h */; };
 		B61F45CC09121DF100C8096C /* DebuggerController.h in Headers */ = {isa = PBXBuildFile; fileRef = B632C6AE03E5368700A864FD /* DebuggerController.h */; };
 		B61F45CD09121DF100C8096C /* FuseMenus.h in Headers */ = {isa = PBXBuildFile; fileRef = B66EA7830401075300A864FD /* FuseMenus.h */; };
-		B61F45CE09121DF100C8096C /* sdlscreenshot.h in Headers */ = {isa = PBXBuildFile; fileRef = B68D5B20041E085000A864FD /* sdlscreenshot.h */; };
 		B61F45CF09121DF100C8096C /* scaler_internals.h in Headers */ = {isa = PBXBuildFile; fileRef = B60A6A3A042BEECE00D41533 /* scaler_internals.h */; };
-		B61F45D009121DF100C8096C /* sdljoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = B6030027043363C900A864FD /* sdljoystick.h */; };
 		B61F45D109121DF100C8096C /* dck.h in Headers */ = {isa = PBXBuildFile; fileRef = B65E4C610445DB7D00A864FD /* dck.h */; };
 		B61F45D209121DF100C8096C /* psg.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CA304D049CEC410037E9F2 /* psg.h */; };
 		B61F45D309121DF100C8096C /* compat.h in Headers */ = {isa = PBXBuildFile; fileRef = B6871C9D04AF7BEF00C24D83 /* compat.h */; };
@@ -74,7 +70,6 @@
 		B61F45D809121DF100C8096C /* pokefinder.h in Headers */ = {isa = PBXBuildFile; fileRef = B64586D3059BC04A00934482 /* pokefinder.h */; };
 		B61F45D909121DF100C8096C /* PokeFinderController.h in Headers */ = {isa = PBXBuildFile; fileRef = B62F3BCE059F5BF300A7009A /* PokeFinderController.h */; };
 		B61F45DA09121DF100C8096C /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = B6FD5C7A05A4F5B600A6C4FC /* utils.h */; };
-		B61F45DB09121DF100C8096C /* sdlui.h in Headers */ = {isa = PBXBuildFile; fileRef = B627DAA705ACDF4E00609956 /* sdlui.h */; };
 		B61F45DC09121DF100C8096C /* MemoryBrowserController.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D2989105B061CB00C2AA14 /* MemoryBrowserController.h */; };
 		B61F45DD09121DF100C8096C /* periph.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C57E0105ECA05B0056F1D0 /* periph.h */; };
 		B61F45DE09121DF100C8096C /* breakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = B66050ED0606AAF500247454 /* breakpoint.h */; };
@@ -83,8 +78,6 @@
 		B61F45E109121DF100C8096C /* machines.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AD8FEC06221FD500C70D75 /* machines.h */; };
 		B61F45E209121DF100C8096C /* simpleide.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AD90560622B59200C70D75 /* simpleide.h */; };
 		B61F45E309121DF100C8096C /* if2.h in Headers */ = {isa = PBXBuildFile; fileRef = B621A11F062E92FB00F63DBC /* if2.h */; };
-		B61F45E409121DF100C8096C /* hq2x.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C8696A06561155003000A6 /* hq2x.h */; };
-		B61F45E509121DF100C8096C /* hq3x.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C8696B06561155003000A6 /* hq3x.h */; };
 		B61F45E609121DF100C8096C /* intern.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C86978065611B3003000A6 /* intern.h */; };
 		B61F45E709121DF100C8096C /* zxatasp.h in Headers */ = {isa = PBXBuildFile; fileRef = B601847A065A586900B0BE59 /* zxatasp.h */; };
 		B61F45E809121DF100C8096C /* zxcf.h in Headers */ = {isa = PBXBuildFile; fileRef = B601847C065A586900B0BE59 /* zxcf.h */; };
@@ -101,7 +94,6 @@
 		B61F45F309121DF100C8096C /* MachineNameToIdTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B67F3CC307EE0A130045339F /* MachineNameToIdTransformer.h */; };
 		B61F45F409121DF100C8096C /* CAMachines.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CC82FF0800E408006EFFB9 /* CAMachines.h */; };
 		B61F45F509121DF100C8096C /* Joysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C740D90810BB0500AB170C /* Joysticks.h */; };
-		B61F45F609121DF100C8096C /* SDLJoysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C741110810C4A500AB170C /* SDLJoysticks.h */; };
 		B61F45F709121DF100C8096C /* VolumeSliderToPrefTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B66D6C9608115FC200FAE6F3 /* VolumeSliderToPrefTransformer.h */; };
 		B61F45F809121DF100C8096C /* ScalerNameToIdTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B67F3C1407ED1C9D0045339F /* ScalerNameToIdTransformer.h */; };
 		B61F45F909121DF100C8096C /* profile.h in Headers */ = {isa = PBXBuildFile; fileRef = B6E811F1084B5117008CF718 /* profile.h */; };
@@ -117,7 +109,7 @@
 		B61F460709121DF100C8096C /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6BA6F0207B1E04200E44C8D /* Preferences.nib */; };
 		B61F460809121DF100C8096C /* Rollback.nib in Resources */ = {isa = PBXBuildFile; fileRef = B600ADA3077237920030FD05 /* Rollback.nib */; };
 		B61F460909121DF100C8096C /* SaveBinary.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6F74F9A04B85B4F0059D51C /* SaveBinary.nib */; };
-		B61F460A09121DF100C8096C /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5598546038920E401A804BA /* SDLMain.nib */; };
+		B61F460A09121DF100C8096C /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5598546038920E401A804BA /* MainMenu.nib */; };
 		B61F460B09121DF100C8096C /* TapeBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = F59B5587039F8DB601A804BA /* TapeBrowser.nib */; };
 		B61F460C09121DF100C8096C /* 48.rom in Resources */ = {isa = PBXBuildFile; fileRef = F559854C0389212301A804BA /* 48.rom */; };
 		B61F460D09121DF100C8096C /* 128-0.rom in Resources */ = {isa = PBXBuildFile; fileRef = F559854D0389212301A804BA /* 128-0.rom */; };
@@ -184,7 +176,6 @@
 		B61F464D09121DF100C8096C /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = F55986350389237101A804BA /* timer.c */; };
 		B61F464E09121DF100C8096C /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = F559863B0389238101A804BA /* ui.c */; };
 		B61F464F09121DF100C8096C /* uidisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = F559863C0389238101A804BA /* uidisplay.c */; };
-		B61F465009121DF100C8096C /* error.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F8763503995372011FA3A4 /* error.m */; };
 		B61F465109121DF100C8096C /* FuseController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F876380399540D011FA3A4 /* FuseController.m */; };
 		B61F465209121DF100C8096C /* TapeBrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = F59B5590039FD8F901A804BA /* TapeBrowserController.m */; };
 		B61F465309121DF100C8096C /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = F536B56503A0C275011517A0 /* utils.c */; };
@@ -199,31 +190,22 @@
 		B61F465C09121DF100C8096C /* debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = B68CB2C403DD920300A804BA /* debugger.c */; };
 		B61F465D09121DF100C8096C /* disassemble.c in Sources */ = {isa = PBXBuildFile; fileRef = B68CB2C603DD920300A804BA /* disassemble.c */; };
 		B61F465E09121DF100C8096C /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = B68CB2CC03DD923C00A804BA /* memory.c */; };
-		B61F465F09121DF100C8096C /* sdlkeyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = B6586D8503E744C000A804BA /* sdlkeyboard.c */; };
 		B61F466009121DF100C8096C /* DebuggerController.m in Sources */ = {isa = PBXBuildFile; fileRef = B632C6AF03E5368700A864FD /* DebuggerController.m */; };
-		B61F466109121DF100C8096C /* sdldisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = B6F4396C03E9645500A864FD /* sdldisplay.c */; };
 		B61F466209121DF100C8096C /* FuseMenus.m in Sources */ = {isa = PBXBuildFile; fileRef = B66EA7840401075300A864FD /* FuseMenus.m */; };
 		B61F466309121DF100C8096C /* scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = B63ABD8D042F175200A864FD /* scaler.c */; };
 		B61F466409121DF100C8096C /* tc2068.c in Sources */ = {isa = PBXBuildFile; fileRef = B6FEA44F0444C3370013916D /* tc2068.c */; };
 		B61F466509121DF100C8096C /* dck.c in Sources */ = {isa = PBXBuildFile; fileRef = B65E4C600445DB7D00A864FD /* dck.c */; };
-		B61F466609121DF100C8096C /* keysyms.c in Sources */ = {isa = PBXBuildFile; fileRef = B61D4512048F8F5800FEA4F1 /* keysyms.c */; };
 		B61F466709121DF100C8096C /* psg.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CA304C049CEC410037E9F2 /* psg.c */; };
 		B61F466809121DF100C8096C /* LoadBinaryController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F74F9704B855D40059D51C /* LoadBinaryController.m */; };
 		B61F466909121DF100C8096C /* SaveBinaryController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F74F9D04B85B660059D51C /* SaveBinaryController.m */; };
-		B61F466A09121DF100C8096C /* sdljoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B6C691B504C20A09005EE041 /* sdljoystick.c */; };
 		B61F466B09121DF100C8096C /* joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B6C691B704C20A42005EE041 /* joystick.c */; };
 		B61F466C09121DF100C8096C /* expression.c in Sources */ = {isa = PBXBuildFile; fileRef = B604635E04C5F37B00C225C9 /* expression.c */; };
 		B61F466D09121DF100C8096C /* NumberFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A7F0EA04C9A11D001025EB /* NumberFormatter.m */; };
 		B61F466E09121DF100C8096C /* pokefinder.c in Sources */ = {isa = PBXBuildFile; fileRef = B64586D2059BC04A00934482 /* pokefinder.c */; };
 		B61F466F09121DF100C8096C /* machine.c in Sources */ = {isa = PBXBuildFile; fileRef = B60B11F7059BC7E70048B64B /* machine.c */; };
 		B61F467009121DF100C8096C /* PokeFinderController.m in Sources */ = {isa = PBXBuildFile; fileRef = B62F3BCF059F5BF300A7009A /* PokeFinderController.m */; };
-		B61F467109121DF100C8096C /* sdlui.c in Sources */ = {isa = PBXBuildFile; fileRef = B627DAA605ACDF4E00609956 /* sdlui.c */; };
 		B61F467209121DF100C8096C /* MemoryBrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D2989205B061CB00C2AA14 /* MemoryBrowserController.m */; };
 		B61F467309121DF100C8096C /* periph.c in Sources */ = {isa = PBXBuildFile; fileRef = B6C57E0005ECA05B0056F1D0 /* periph.c */; };
-		B61F467409121DF100C8096C /* SDLMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6C57E0605ECC4160056F1D0 /* SDLMain.mm */; };
-		B61F467509121DF100C8096C /* scalers16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6C57E3F05ECC9260056F1D0 /* scalers16.cpp */; };
-		B61F467609121DF100C8096C /* hq2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B65163AB05F4A11E001903BE /* hq2x.cpp */; };
-		B61F467709121DF100C8096C /* hq3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B61EF5B905FED7930081DF70 /* hq3x.cpp */; };
 		B61F467809121DF100C8096C /* fuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6CD0B9E06069F4A00847338 /* fuse.cpp */; };
 		B61F467909121DF100C8096C /* breakpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = B66050EC0606AAF500247454 /* breakpoint.c */; };
 		B61F467A09121DF100C8096C /* scorpion.c in Sources */ = {isa = PBXBuildFile; fileRef = B66050F80606AB0B00247454 /* scorpion.c */; };
@@ -240,7 +222,6 @@
 		B61F468509121DF100C8096C /* kempmouse.c in Sources */ = {isa = PBXBuildFile; fileRef = B68C17DC06C8C0DC004981AE /* kempmouse.c */; };
 		B61F468609121DF100C8096C /* if1.c in Sources */ = {isa = PBXBuildFile; fileRef = B6C8B723076D2B1A0007B7B5 /* if1.c */; };
 		B61F468709121DF100C8096C /* RollbackController.m in Sources */ = {isa = PBXBuildFile; fileRef = B63F994A077182B4004D6DFA /* RollbackController.m */; };
-		B61F468809121DF100C8096C /* sdlsound.c in Sources */ = {isa = PBXBuildFile; fileRef = B6F06092078FB36500CD5D95 /* sdlsound.c */; };
 		B61F468909121DF100C8096C /* ts2068.c in Sources */ = {isa = PBXBuildFile; fileRef = B6F060A5078FB55400CD5D95 /* ts2068.c */; };
 		B61F468A09121DF100C8096C /* sfifo.c in Sources */ = {isa = PBXBuildFile; fileRef = B6F06100078FC2C900CD5D95 /* sfifo.c */; };
 		B61F468B09121DF100C8096C /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = B650F73F07E7CD3F00E4F3AF /* PreferencesController.m */; };
@@ -249,17 +230,14 @@
 		B61F468E09121DF100C8096C /* MachineNameToIdTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = B67F3CC407EE0A130045339F /* MachineNameToIdTransformer.m */; };
 		B61F468F09121DF100C8096C /* CAMachines.m in Sources */ = {isa = PBXBuildFile; fileRef = B6CC83000800E408006EFFB9 /* CAMachines.m */; };
 		B61F469009121DF100C8096C /* Joysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C740DA0810BB0500AB170C /* Joysticks.m */; };
-		B61F469109121DF100C8096C /* SDLJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C741120810C4A500AB170C /* SDLJoysticks.m */; };
 		B61F469209121DF100C8096C /* VolumeSliderToPrefTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = B66D6C9708115FC200FAE6F3 /* VolumeSliderToPrefTransformer.m */; };
 		B61F469309121DF100C8096C /* profile.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E811F0084B5117008CF718 /* profile.c */; };
 		B61F469409121DF100C8096C /* ide.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E811F4084B5148008CF718 /* ide.c */; };
-		B61F469509121DF100C8096C /* sdlscreenshot.m in Sources */ = {isa = PBXBuildFile; fileRef = B619FC69090E649700344F94 /* sdlscreenshot.m */; };
 		B61F469A09121DF100C8096C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		B61F469B09121DF100C8096C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; };
 		B61F469C09121DF100C8096C /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
 		B61F469D09121DF100C8096C /* spectrum.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; };
 		B61F469E09121DF100C8096C /* 765.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F541C0750396490901C2A5B9 /* 765.framework */; };
-		B61F469F09121DF100C8096C /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F50F65A003B2355701A804BA /* SDL.framework */; };
 		B61F46A109121DF100C8096C /* gcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; };
 		B61F46A209121DF100C8096C /* libbz2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
 		B61F46A409121DF100C8096C /* FuseImporter.mdimporter in CopyFiles */ = {isa = PBXBuildFile; fileRef = B64FEA96084F8EC300879389 /* FuseImporter.mdimporter */; };
@@ -278,8 +256,37 @@
 		B650986E09366C8F003AF1BF /* rom.icns in Resources */ = {isa = PBXBuildFile; fileRef = B650986B09366C8F003AF1BF /* rom.icns */; };
 		B650986F09366C8F003AF1BF /* rzx.icns in Resources */ = {isa = PBXBuildFile; fileRef = B650986C09366C8F003AF1BF /* rzx.icns */; };
 		B650987109366CA2003AF1BF /* szx.icns in Resources */ = {isa = PBXBuildFile; fileRef = B650987009366CA2003AF1BF /* szx.icns */; };
+		B65352DB0B8CF6780083F942 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = B65352BD0B89B8AA0083F942 /* SDL_joystick.h */; };
+		B65352F20B8CF6CC0083F942 /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B65352BE0B89B8AA0083F942 /* SDL_sysjoystick.c */; };
+		B65352F30B8CF6CC0083F942 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = B65352BF0B89B8AA0083F942 /* SDL_sysjoystick.h */; };
+		B65353150B8FF3D20083F942 /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B65353140B8FF3D20083F942 /* SDL_joystick.c */; };
+		B653532B0B902CB20083F942 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B653532A0B902CB20083F942 /* IOKit.framework */; };
+		B67DC2190B63835100FA31B6 /* cocoastatusbar.m in Sources */ = {isa = PBXBuildFile; fileRef = B67DC2180B63835100FA31B6 /* cocoastatusbar.m */; };
 		B6825549091817F30014B5EE /* divide.c in Sources */ = {isa = PBXBuildFile; fileRef = B6825547091817F30014B5EE /* divide.c */; };
 		B682554A091817F30014B5EE /* divide.h in Headers */ = {isa = PBXBuildFile; fileRef = B6825548091817F30014B5EE /* divide.h */; };
+		B6A24E330B49C67D00AD5B9D /* scalers16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6A24E320B49C67D00AD5B9D /* scalers16.cpp */; };
+		B6A24E3B0B49C78700AD5B9D /* hq2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6A24E370B49C78700AD5B9D /* hq2x.cpp */; };
+		B6A24E3C0B49C78700AD5B9D /* hq2x.h in Headers */ = {isa = PBXBuildFile; fileRef = B6A24E380B49C78700AD5B9D /* hq2x.h */; };
+		B6A24E3D0B49C78700AD5B9D /* hq3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6A24E390B49C78700AD5B9D /* hq3x.cpp */; };
+		B6A24E3E0B49C78700AD5B9D /* hq3x.h in Headers */ = {isa = PBXBuildFile; fileRef = B6A24E3A0B49C78700AD5B9D /* hq3x.h */; };
+		B6A6F0960B3C108C000B88E9 /* coreaudiosound.c in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F0950B3C108C000B88E9 /* coreaudiosound.c */; };
+		B6A6F0DA0B3D141B000B88E9 /* cocoaui.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F0D90B3D141B000B88E9 /* cocoaui.m */; };
+		B6A6F0EE0B3D5F9E000B88E9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6A6F0ED0B3D5F9E000B88E9 /* CoreAudio.framework */; };
+		B6A6F0F30B3D602F000B88E9 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6A6F0F20B3D602F000B88E9 /* AudioUnit.framework */; };
+		B6A6F1060B3D60D0000B88E9 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F520C8BC038D022E01A804BA /* OpenGL.framework */; };
+		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 */; };
+		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 */; };
+		B6CE7F410B2830A300EB65B3 /* cocoadisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CE7F3B0B2830A300EB65B3 /* cocoadisplay.h */; };
+		B6CE7F420B2830A300EB65B3 /* cocoajoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F3C0B2830A300EB65B3 /* cocoajoystick.c */; };
+		B6CE7F440B2830A300EB65B3 /* cocoaui.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CE7F3E0B2830A300EB65B3 /* cocoaui.h */; };
+		B6CE7F520B283A0700EB65B3 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F510B283A0700EB65B3 /* main.mm */; };
+		B6CE7FCD0B28FBD600EB65B3 /* DisplayOpenGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CE7FCB0B28FBD600EB65B3 /* DisplayOpenGLView.h */; };
+		B6CE7FCE0B28FBD600EB65B3 /* DisplayOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7FCC0B28FBD600EB65B3 /* DisplayOpenGLView.m */; };
+		B6E0252C0B38AFE500E23A0F /* keysyms.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E0252B0B38AFE500E23A0F /* keysyms.m */; };
 		B6F047F60952A6D6006D8005 /* tape_se.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F20952A6BA006D8005 /* tape_se.szx */; };
 		B6F047F70952A6D6006D8005 /* tape_ts2068.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F30952A6BA006D8005 /* tape_ts2068.szx */; };
 		B6F047F80952A6E3006D8005 /* tape_plus3e.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F00952A69A006D8005 /* tape_plus3e.szx */; };
@@ -325,7 +332,6 @@
 			files = (
 				B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */,
 				B61F45A309121DF100C8096C /* 765.framework in CopyFiles */,
-				B61F45A409121DF100C8096C /* SDL.framework in CopyFiles */,
 				B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */,
 				B61F45A709121DF100C8096C /* libbz2.framework in CopyFiles */,
 			);
@@ -353,24 +359,20 @@
 		B601847A065A586900B0BE59 /* zxatasp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = zxatasp.h; path = ../zxatasp.h; sourceTree = SOURCE_ROOT; };
 		B601847B065A586900B0BE59 /* zxcf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = zxcf.c; path = ../zxcf.c; sourceTree = SOURCE_ROOT; };
 		B601847C065A586900B0BE59 /* zxcf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = zxcf.h; path = ../zxcf.h; sourceTree = SOURCE_ROOT; };
-		B6030027043363C900A864FD /* sdljoystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdljoystick.h; path = ../ui/sdl/sdljoystick.h; sourceTree = "<group>"; };
 		B604635E04C5F37B00C225C9 /* expression.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = expression.c; path = ../debugger/expression.c; sourceTree = SOURCE_ROOT; };
 		B60A6A3A042BEECE00D41533 /* scaler_internals.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = scaler_internals.h; path = ../ui/scaler/scaler_internals.h; sourceTree = SOURCE_ROOT; };
 		B60B11F7059BC7E70048B64B /* machine.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = machine.c; path = ../machine.c; sourceTree = SOURCE_ROOT; };
 		B611190206A1FA12006D2711 /* JoystickConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JoystickConfigurationController.h; path = controllers/JoystickConfigurationController.h; sourceTree = SOURCE_ROOT; };
 		B611190306A1FA12006D2711 /* JoystickConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = JoystickConfigurationController.m; path = controllers/JoystickConfigurationController.m; sourceTree = SOURCE_ROOT; };
 		B611196806A1FBB6006D2711 /* JoystickConfiguration.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = JoystickConfiguration.nib; path = nibs/JoystickConfiguration.nib; sourceTree = "<group>"; };
+		B615BFE50B4261E50082D535 /* HIDJoysticks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HIDJoysticks.h; path = content_arrays/HIDJoysticks.h; sourceTree = "<group>"; };
+		B615BFE60B4261E50082D535 /* HIDJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = HIDJoysticks.m; path = content_arrays/HIDJoysticks.m; sourceTree = "<group>"; };
 		B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; };
-		B619FC69090E649700344F94 /* sdlscreenshot.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = sdlscreenshot.m; sourceTree = SOURCE_ROOT; };
-		B61D4512048F8F5800FEA4F1 /* keysyms.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = keysyms.c; sourceTree = SOURCE_ROOT; };
-		B61EF5B905FED7930081DF70 /* hq3x.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hq3x.cpp; path = scaler/hq3x.cpp; sourceTree = SOURCE_ROOT; };
 		B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; };
 		B61F46AA09121DF200C8096C /* Fuse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fuse.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		B6202BD105BD43D800A1EA8F /* libbz2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbz2.framework; path = ../../bzip2/build/Deployment/libbz2.framework; sourceTree = SOURCE_ROOT; };
 		B621A11E062E92FB00F63DBC /* if2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = if2.c; path = ../if2.c; sourceTree = SOURCE_ROOT; };
 		B621A11F062E92FB00F63DBC /* if2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = if2.h; path = ../if2.h; sourceTree = SOURCE_ROOT; };
-		B627DAA605ACDF4E00609956 /* sdlui.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdlui.c; path = ../ui/sdl/sdlui.c; sourceTree = SOURCE_ROOT; };
-		B627DAA705ACDF4E00609956 /* sdlui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sdlui.h; sourceTree = SOURCE_ROOT; };
 		B62E1BC303E298B200A80002 /* Debugger.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Debugger.nib; path = nibs/Debugger.nib; sourceTree = SOURCE_ROOT; };
 		B62F3BB4059F5B5900A7009A /* PokeFinder.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PokeFinder.nib; path = nibs/PokeFinder.nib; sourceTree = "<group>"; };
 		B62F3BCE059F5BF300A7009A /* PokeFinderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PokeFinderController.h; path = controllers/PokeFinderController.h; sourceTree = "<group>"; };
@@ -420,8 +422,11 @@
 		B650C40A0765988200DE7E81 /* tape_scorpion.szx */ = {isa = PBXFileReference; lastKnownFileType = file; name = tape_scorpion.szx; path = ../lib/compressed/tape_scorpion.szx; sourceTree = SOURCE_ROOT; };
 		B650F73E07E7CD3F00E4F3AF /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PreferencesController.h; path = controllers/PreferencesController.h; sourceTree = SOURCE_ROOT; };
 		B650F73F07E7CD3F00E4F3AF /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PreferencesController.m; path = controllers/PreferencesController.m; sourceTree = SOURCE_ROOT; };
-		B65163AB05F4A11E001903BE /* hq2x.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hq2x.cpp; path = scaler/hq2x.cpp; sourceTree = SOURCE_ROOT; };
-		B6586D8503E744C000A804BA /* sdlkeyboard.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdlkeyboard.c; path = ../ui/sdl/sdlkeyboard.c; sourceTree = SOURCE_ROOT; };
+		B65352BD0B89B8AA0083F942 /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_joystick.h; sourceTree = "<group>"; };
+		B65352BE0B89B8AA0083F942 /* SDL_sysjoystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_sysjoystick.c; sourceTree = "<group>"; };
+		B65352BF0B89B8AA0083F942 /* SDL_sysjoystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_sysjoystick.h; sourceTree = "<group>"; };
+		B65353140B8FF3D20083F942 /* SDL_joystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_joystick.c; sourceTree = "<group>"; };
+		B653532A0B902CB20083F942 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		B65E4C600445DB7D00A864FD /* dck.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dck.c; path = ../dck.c; sourceTree = SOURCE_ROOT; };
 		B65E4C610445DB7D00A864FD /* dck.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dck.h; path = ../dck.h; sourceTree = SOURCE_ROOT; };
 		B66050EC0606AAF500247454 /* breakpoint.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = breakpoint.c; path = ../debugger/breakpoint.c; sourceTree = SOURCE_ROOT; };
@@ -439,6 +444,7 @@
 		B66EA7830401075300A864FD /* FuseMenus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FuseMenus.h; sourceTree = SOURCE_ROOT; };
 		B66EA7840401075300A864FD /* FuseMenus.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FuseMenus.m; sourceTree = SOURCE_ROOT; };
 		B678E4060608FB4300678A33 /* spec_se.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = spec_se.c; path = ../machines/spec_se.c; sourceTree = SOURCE_ROOT; };
+		B67DC2180B63835100FA31B6 /* cocoastatusbar.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = cocoastatusbar.m; sourceTree = "<group>"; };
 		B67F204203D4B629007BE3A0 /* trdos.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = trdos.c; sourceTree = "<group>"; };
 		B67F204303D4B629007BE3A0 /* trdos.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = trdos.h; sourceTree = "<group>"; };
 		B67F3C1407ED1C9D0045339F /* ScalerNameToIdTransformer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ScalerNameToIdTransformer.h; path = transformers/ScalerNameToIdTransformer.h; sourceTree = SOURCE_ROOT; };
@@ -462,7 +468,18 @@
 		B68CB2C503DD920300A804BA /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = debugger.h; path = ../debugger/debugger.h; sourceTree = "<group>"; };
 		B68CB2C603DD920300A804BA /* disassemble.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = disassemble.c; path = ../debugger/disassemble.c; sourceTree = "<group>"; };
 		B68CB2CC03DD923C00A804BA /* memory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = memory.c; sourceTree = "<group>"; };
-		B68D5B20041E085000A864FD /* sdlscreenshot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sdlscreenshot.h; sourceTree = SOURCE_ROOT; };
+		B6A24E320B49C67D00AD5B9D /* scalers16.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = scalers16.cpp; path = scaler/scalers16.cpp; sourceTree = SOURCE_ROOT; };
+		B6A24E370B49C78700AD5B9D /* hq2x.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hq2x.cpp; path = scaler/hq2x.cpp; sourceTree = SOURCE_ROOT; };
+		B6A24E380B49C78700AD5B9D /* hq2x.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hq2x.h; path = scaler/hq2x.h; sourceTree = SOURCE_ROOT; };
+		B6A24E390B49C78700AD5B9D /* hq3x.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hq3x.cpp; path = scaler/hq3x.cpp; sourceTree = SOURCE_ROOT; };
+		B6A24E3A0B49C78700AD5B9D /* hq3x.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hq3x.h; path = scaler/hq3x.h; sourceTree = SOURCE_ROOT; };
+		B6A6F0950B3C108C000B88E9 /* coreaudiosound.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = coreaudiosound.c; path = sound/coreaudiosound.c; sourceTree = "<group>"; };
+		B6A6F0D90B3D141B000B88E9 /* cocoaui.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = cocoaui.m; sourceTree = "<group>"; };
+		B6A6F0ED0B3D5F9E000B88E9 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
+		B6A6F0F20B3D602F000B88E9 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = "<absolute>"; };
+		B6A6F10D0B3D6360000B88E9 /* cocoaerror.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = cocoaerror.m; sourceTree = "<group>"; };
+		B6A6F11D0B3EA737000B88E9 /* cocoascreenshot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cocoascreenshot.h; sourceTree = "<group>"; };
+		B6A6F11E0B3EA737000B88E9 /* cocoascreenshot.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = cocoascreenshot.m; sourceTree = "<group>"; };
 		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; };
@@ -479,22 +496,18 @@
 		B6AE204307704CFD00990F65 /* if1-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "if1-1.rom"; path = "../roms/if1-1.rom"; sourceTree = SOURCE_ROOT; };
 		B6AE204407704CFD00990F65 /* if1-2.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "if1-2.rom"; path = "../roms/if1-2.rom"; sourceTree = SOURCE_ROOT; };
 		B6AF242A04156EE700F48F48 /* blank.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = blank.icns; path = resources/blank.icns; sourceTree = SOURCE_ROOT; };
+		B6B076B00B59FE9A00D4F95C /* Emulator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Emulator.h; sourceTree = "<group>"; };
+		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>"; };
 		B6BA1A8B04E4F3290017354F /* gcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = gcrypt.framework; path = ../../libgcrypt/build/Deployment/gcrypt.framework; sourceTree = SOURCE_ROOT; };
 		B6BA1A9404E4F88F0017354F /* uijoystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = uijoystick.h; path = ../ui/uijoystick.h; sourceTree = SOURCE_ROOT; };
 		B6BA6F0207B1E04200E44C8D /* Preferences.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Preferences.nib; path = nibs/Preferences.nib; 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; };
-		...
 
[truncated message content]

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

From: <fr...@us...> - 2007-06-10 13:58:19

Revision: 375
          http://svn.sourceforge.net/fuse-for-macosx/?rev=375&view=rev
Author:   fredm
Date:     2007-06-10 06:58:18 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
Merge up to trunk r369.

Modified Paths:
--------------
    branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
    branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m
    branches/fusegl/FuseImporter/libspectrum.h
    branches/fusegl/fuse/ChangeLog
    branches/fusegl/fuse/Makefile.am
    branches/fusegl/fuse/README
    branches/fusegl/fuse/autogen.sh
    branches/fusegl/fuse/ay.c
    branches/fusegl/fuse/ay.h
    branches/fusegl/fuse/compat/Makefile.am
    branches/fusegl/fuse/compat/dirname.c
    branches/fusegl/fuse/compat.h
    branches/fusegl/fuse/configure.in
    branches/fusegl/fuse/dck.c
    branches/fusegl/fuse/dck.h
    branches/fusegl/fuse/debugger/Makefile.am
    branches/fusegl/fuse/debugger/breakpoint.c
    branches/fusegl/fuse/debugger/breakpoint.h
    branches/fusegl/fuse/debugger/command.c
    branches/fusegl/fuse/debugger/commandl.l
    branches/fusegl/fuse/debugger/commandy.y
    branches/fusegl/fuse/debugger/debugger.c
    branches/fusegl/fuse/debugger/debugger.h
    branches/fusegl/fuse/debugger/debugger_internals.h
    branches/fusegl/fuse/debugger/disassemble.c
    branches/fusegl/fuse/debugger/expression.c
    branches/fusegl/fuse/display.c
    branches/fusegl/fuse/display.h
    branches/fusegl/fuse/divide.c
    branches/fusegl/fuse/divide.h
    branches/fusegl/fuse/event.c
    branches/fusegl/fuse/event.h
    branches/fusegl/fuse/fuse.cpp
    branches/fusegl/fuse/fuse.h
    branches/fusegl/fuse/fusepb/Credits.html
    branches/fusegl/fuse/fusepb/English.lproj/InfoPlist.strings
    branches/fusegl/fuse/fusepb/Info-Fuse.plist
    branches/fusegl/fuse/fusepb/nibs/Preferences.nib/info.nib
    branches/fusegl/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
    branches/fusegl/fuse/fusepb/resources/Fuse Help/html/about.html
    branches/fusegl/fuse/fusepb/resources/Fuse Help/html/changelog.html
    branches/fusegl/fuse/fusepb/resources/Fuse Help/html/filters.html
    branches/fusegl/fuse/fusepb/resources/Fuse Help/html/preferences.html
    branches/fusegl/fuse/fusepb/resources/Fuse Help/html/tocstart.html
    branches/fusegl/fuse/fusepb/settings_cocoa.h
    branches/fusegl/fuse/hacking/ChangeLog
    branches/fusegl/fuse/hacking/Makefile.am
    branches/fusegl/fuse/hacking/cvs-tags
    branches/fusegl/fuse/ide.c
    branches/fusegl/fuse/ide.h
    branches/fusegl/fuse/if1.c
    branches/fusegl/fuse/if1.h
    branches/fusegl/fuse/if2.c
    branches/fusegl/fuse/if2.h
    branches/fusegl/fuse/input.c
    branches/fusegl/fuse/input.h
    branches/fusegl/fuse/joystick.c
    branches/fusegl/fuse/joystick.h
    branches/fusegl/fuse/keyboard.c
    branches/fusegl/fuse/keyboard.h
    branches/fusegl/fuse/keysyms.dat
    branches/fusegl/fuse/keysyms.pl
    branches/fusegl/fuse/lib/Makefile.am
    branches/fusegl/fuse/loader.c
    branches/fusegl/fuse/loader.h
    branches/fusegl/fuse/machine.c
    branches/fusegl/fuse/machine.h
    branches/fusegl/fuse/machines/Makefile.am
    branches/fusegl/fuse/machines/machines.h
    branches/fusegl/fuse/machines/pentagon.c
    branches/fusegl/fuse/machines/scorpion.c
    branches/fusegl/fuse/machines/scorpion.h
    branches/fusegl/fuse/machines/spec128.c
    branches/fusegl/fuse/machines/spec128.h
    branches/fusegl/fuse/machines/spec16.c
    branches/fusegl/fuse/machines/spec48.c
    branches/fusegl/fuse/machines/spec48.h
    branches/fusegl/fuse/machines/spec_se.c
    branches/fusegl/fuse/machines/specplus2.c
    branches/fusegl/fuse/machines/specplus2a.c
    branches/fusegl/fuse/machines/specplus3.c
    branches/fusegl/fuse/machines/specplus3.h
    branches/fusegl/fuse/machines/specplus3e.c
    branches/fusegl/fuse/machines/tc2048.c
    branches/fusegl/fuse/machines/tc2068.c
    branches/fusegl/fuse/machines/tc2068.h
    branches/fusegl/fuse/machines/ts2068.c
    branches/fusegl/fuse/man/Makefile.am
    branches/fusegl/fuse/man/fuse.1
    branches/fusegl/fuse/memory.c
    branches/fusegl/fuse/memory.h
    branches/fusegl/fuse/menu.c
    branches/fusegl/fuse/menu.h
    branches/fusegl/fuse/menu_data.c
    branches/fusegl/fuse/menu_data.pl
    branches/fusegl/fuse/periph.c
    branches/fusegl/fuse/periph.h
    branches/fusegl/fuse/perl/Fuse/Dialog.pm
    branches/fusegl/fuse/perl/Fuse/Makefile.am
    branches/fusegl/fuse/perl/Fuse.pm
    branches/fusegl/fuse/perl/Makefile.am
    branches/fusegl/fuse/perl/cpp-perl.pl
    branches/fusegl/fuse/pokefinder/Makefile.am
    branches/fusegl/fuse/pokefinder/pokefinder.c
    branches/fusegl/fuse/pokefinder/pokefinder.h
    branches/fusegl/fuse/printer.c
    branches/fusegl/fuse/printer.h
    branches/fusegl/fuse/profile.c
    branches/fusegl/fuse/profile.h
    branches/fusegl/fuse/psg.c
    branches/fusegl/fuse/psg.h
    branches/fusegl/fuse/roms/Makefile.am
    branches/fusegl/fuse/rzx.c
    branches/fusegl/fuse/rzx.h
    branches/fusegl/fuse/scld.c
    branches/fusegl/fuse/screenshot.c
    branches/fusegl/fuse/screenshot.h
    branches/fusegl/fuse/settings-header.pl
    branches/fusegl/fuse/settings.dat
    branches/fusegl/fuse/settings.pl
    branches/fusegl/fuse/simpleide.c
    branches/fusegl/fuse/slt.c
    branches/fusegl/fuse/slt.h
    branches/fusegl/fuse/snapshot.c
    branches/fusegl/fuse/snapshot.h
    branches/fusegl/fuse/sound/Makefile.am
    branches/fusegl/fuse/sound/aosound.c
    branches/fusegl/fuse/sound/dxsound.c
    branches/fusegl/fuse/sound/lowlevel.h
    branches/fusegl/fuse/sound/sdlsound.c
    branches/fusegl/fuse/sound.c
    branches/fusegl/fuse/sound.h
    branches/fusegl/fuse/spectrum.c
    branches/fusegl/fuse/spectrum.h
    branches/fusegl/fuse/tape.c
    branches/fusegl/fuse/tape.h
    branches/fusegl/fuse/timer.c
    branches/fusegl/fuse/timer.h
    branches/fusegl/fuse/trdos.c
    branches/fusegl/fuse/trdos.h
    branches/fusegl/fuse/ui/Makefile.am
    branches/fusegl/fuse/ui/aalib/Makefile.am
    branches/fusegl/fuse/ui/aalib/aalibdisplay.c
    branches/fusegl/fuse/ui/aalib/aalibkeyboard.c
    branches/fusegl/fuse/ui/aalib/aalibkeyboard.h
    branches/fusegl/fuse/ui/aalib/aalibui.c
    branches/fusegl/fuse/ui/aalib/aalibui.h
    branches/fusegl/fuse/ui/aalib/error.c
    branches/fusegl/fuse/ui/cocoa/cocoadisplay.m
    branches/fusegl/fuse/ui/fb/Makefile.am
    branches/fusegl/fuse/ui/fb/fbdisplay.c
    branches/fusegl/fuse/ui/fb/fbdisplay.h
    branches/fusegl/fuse/ui/fb/fbjoystick.c
    branches/fusegl/fuse/ui/fb/fbkeyboard.c
    branches/fusegl/fuse/ui/fb/fbkeyboard.h
    branches/fusegl/fuse/ui/fb/fbui.c
    branches/fusegl/fuse/ui/ggi/Makefile.am
    branches/fusegl/fuse/ui/ggi/ggi_internals.h
    branches/fusegl/fuse/ui/ggi/ggidisplay.c
    branches/fusegl/fuse/ui/ggi/ggikeyboard.c
    branches/fusegl/fuse/ui/ggi/ggiui.c
    branches/fusegl/fuse/ui/gtk/Makefile.am
    branches/fusegl/fuse/ui/gtk/binary.c
    branches/fusegl/fuse/ui/gtk/browse.c
    branches/fusegl/fuse/ui/gtk/confirm.c
    branches/fusegl/fuse/ui/gtk/debugger.c
    branches/fusegl/fuse/ui/gtk/fileselector.c
    branches/fusegl/fuse/ui/gtk/gtkdisplay.c
    branches/fusegl/fuse/ui/gtk/gtkinternals.h
    branches/fusegl/fuse/ui/gtk/gtkjoystick.c
    branches/fusegl/fuse/ui/gtk/gtkkeyboard.c
    branches/fusegl/fuse/ui/gtk/gtkui.c
    branches/fusegl/fuse/ui/gtk/memory.c
    branches/fusegl/fuse/ui/gtk/options-header.pl
    branches/fusegl/fuse/ui/gtk/options.pl
    branches/fusegl/fuse/ui/gtk/picture.c
    branches/fusegl/fuse/ui/gtk/pixmaps.c
    branches/fusegl/fuse/ui/gtk/pokefinder.c
    branches/fusegl/fuse/ui/gtk/rollback.c
    branches/fusegl/fuse/ui/gtk/roms.c
    branches/fusegl/fuse/ui/gtk/statusbar.c
    branches/fusegl/fuse/ui/gtk/stock.c
    branches/fusegl/fuse/ui/options.dat
    branches/fusegl/fuse/ui/scaler/Makefile.am
    branches/fusegl/fuse/ui/scaler/scaler.c
    branches/fusegl/fuse/ui/scaler/scaler.h
    branches/fusegl/fuse/ui/scaler/scaler_internals.h
    branches/fusegl/fuse/ui/scaler/scalers.cpp
    branches/fusegl/fuse/ui/sdl/Makefile.am
    branches/fusegl/fuse/ui/sdl/sdldisplay.c
    branches/fusegl/fuse/ui/sdl/sdldisplay.h
    branches/fusegl/fuse/ui/sdl/sdljoystick.c
    branches/fusegl/fuse/ui/sdl/sdljoystick.h
    branches/fusegl/fuse/ui/sdl/sdlkeyboard.c
    branches/fusegl/fuse/ui/sdl/sdlkeyboard.h
    branches/fusegl/fuse/ui/sdl/sdlui.c
    branches/fusegl/fuse/ui/svga/Makefile.am
    branches/fusegl/fuse/ui/svga/svgadisplay.c
    branches/fusegl/fuse/ui/svga/svgadisplay.h
    branches/fusegl/fuse/ui/svga/svgajoystick.c
    branches/fusegl/fuse/ui/svga/svgakeyboard.c
    branches/fusegl/fuse/ui/svga/svgakeyboard.h
    branches/fusegl/fuse/ui/svga/svgaui.c
    branches/fusegl/fuse/ui/ui.h
    branches/fusegl/fuse/ui/uidisplay.h
    branches/fusegl/fuse/ui/uijoystick.c
    branches/fusegl/fuse/ui/uijoystick.h
    branches/fusegl/fuse/ui/win32/Makefile.am
    branches/fusegl/fuse/ui/win32/debugger.c
    branches/fusegl/fuse/ui/win32/debugger.h
    branches/fusegl/fuse/ui/win32/debugger.rc
    branches/fusegl/fuse/ui/win32/error.c
    branches/fusegl/fuse/ui/win32/keysyms.c
    branches/fusegl/fuse/ui/win32/menu_data.c
    branches/fusegl/fuse/ui/win32/menu_data.h
    branches/fusegl/fuse/ui/win32/menu_data.rc
    branches/fusegl/fuse/ui/win32/pokefinder.c
    branches/fusegl/fuse/ui/win32/pokefinder.h
    branches/fusegl/fuse/ui/win32/pokefinder.rc
    branches/fusegl/fuse/ui/win32/statusbar.c
    branches/fusegl/fuse/ui/win32/win32display.c
    branches/fusegl/fuse/ui/win32/win32display.h
    branches/fusegl/fuse/ui/win32/win32internals.h
    branches/fusegl/fuse/ui/win32/win32keyboard.c
    branches/fusegl/fuse/ui/win32/win32keyboard.h
    branches/fusegl/fuse/ui/win32/win32ui.c
    branches/fusegl/fuse/ui/win32/win32ui.rc
    branches/fusegl/fuse/ui/xlib/Makefile.am
    branches/fusegl/fuse/ui/xlib/xdisplay.c
    branches/fusegl/fuse/ui/xlib/xdisplay.h
    branches/fusegl/fuse/ui/xlib/xerror.c
    branches/fusegl/fuse/ui/xlib/xjoystick.c
    branches/fusegl/fuse/ui/xlib/xkeyboard.c
    branches/fusegl/fuse/ui/xlib/xkeyboard.h
    branches/fusegl/fuse/ui/xlib/xui.c
    branches/fusegl/fuse/ui/xlib/xui.h
    branches/fusegl/fuse/ui.c
    branches/fusegl/fuse/uidisplay.c
    branches/fusegl/fuse/ula.c
    branches/fusegl/fuse/ula.h
    branches/fusegl/fuse/utils.c
    branches/fusegl/fuse/utils.h
    branches/fusegl/fuse/widget/Makefile.am
    branches/fusegl/fuse/widget/browse.c
    branches/fusegl/fuse/widget/debugger.c
    branches/fusegl/fuse/widget/error.c
    branches/fusegl/fuse/widget/filesel.c
    branches/fusegl/fuse/widget/menu.c
    branches/fusegl/fuse/widget/options-header.pl
    branches/fusegl/fuse/widget/options.pl
    branches/fusegl/fuse/widget/picture.c
    branches/fusegl/fuse/widget/roms.c
    branches/fusegl/fuse/widget/select.c
    branches/fusegl/fuse/widget/text.c
    branches/fusegl/fuse/widget/widget.c
    branches/fusegl/fuse/widget/widget.h
    branches/fusegl/fuse/widget/widget_internals.h
    branches/fusegl/fuse/z80/Makefile.am
    branches/fusegl/fuse/z80/coretest.c
    branches/fusegl/fuse/z80/harness.pl
    branches/fusegl/fuse/z80/tests/Makefile.am
    branches/fusegl/fuse/z80/z80.c
    branches/fusegl/fuse/z80/z80.h
    branches/fusegl/fuse/z80/z80.pl
    branches/fusegl/fuse/z80/z80_macros.h
    branches/fusegl/fuse/z80/z80_ops.c
    branches/fusegl/fuse/zxatasp.c
    branches/fusegl/fuse/zxatasp.h
    branches/fusegl/fuse/zxcf.c
    branches/fusegl/fuse/zxcf.h
    branches/fusegl/libspectrum/libspectrum/ChangeLog
    branches/fusegl/libspectrum/libspectrum/Makefile.am
    branches/fusegl/libspectrum/libspectrum/README
    branches/fusegl/libspectrum/libspectrum/accessor.pl
    branches/fusegl/libspectrum/libspectrum/autogen.sh
    branches/fusegl/libspectrum/libspectrum/bzip2.c
    branches/fusegl/libspectrum/libspectrum/configure.in
    branches/fusegl/libspectrum/libspectrum/creator.c
    branches/fusegl/libspectrum/libspectrum/crypto.c
    branches/fusegl/libspectrum/libspectrum/dck.c
    branches/fusegl/libspectrum/libspectrum/dll.c
    branches/fusegl/libspectrum/libspectrum/doc/Makefile.am
    branches/fusegl/libspectrum/libspectrum/doc/cvs-tags
    branches/fusegl/libspectrum/libspectrum/doc/libspectrum.3
    branches/fusegl/libspectrum/libspectrum/doc/libspectrum.txt
    branches/fusegl/libspectrum/libspectrum/hacking/ChangeLog
    branches/fusegl/libspectrum/libspectrum/ide.c
    branches/fusegl/libspectrum/libspectrum/internals.h
    branches/fusegl/libspectrum/libspectrum/libspectrum.c
    branches/fusegl/libspectrum/libspectrum/libspectrum.h.in
    branches/fusegl/libspectrum/libspectrum/libspectrum.qpg.in
    branches/fusegl/libspectrum/libspectrum/make-perl.c
    branches/fusegl/libspectrum/libspectrum/microdrive.c
    branches/fusegl/libspectrum/libspectrum/myglib/Makefile.am
    branches/fusegl/libspectrum/libspectrum/myglib/ghash.c
    branches/fusegl/libspectrum/libspectrum/myglib/gslist.c
    branches/fusegl/libspectrum/libspectrum/plusd.c
    branches/fusegl/libspectrum/libspectrum/rzx.c
    branches/fusegl/libspectrum/libspectrum/sna.c
    branches/fusegl/libspectrum/libspectrum/snap_accessors.txt
    branches/fusegl/libspectrum/libspectrum/snapshot.c
    branches/fusegl/libspectrum/libspectrum/snp.c
    branches/fusegl/libspectrum/libspectrum/sp.c
    branches/fusegl/libspectrum/libspectrum/szx.c
    branches/fusegl/libspectrum/libspectrum/tap.c
    branches/fusegl/libspectrum/libspectrum/tape.c
    branches/fusegl/libspectrum/libspectrum/tape_accessors.pl
    branches/fusegl/libspectrum/libspectrum/tape_accessors.txt
    branches/fusegl/libspectrum/libspectrum/tape_block.c
    branches/fusegl/libspectrum/libspectrum/tape_block.h
    branches/fusegl/libspectrum/libspectrum/tape_set.pl
    branches/fusegl/libspectrum/libspectrum/timings.c
    branches/fusegl/libspectrum/libspectrum/tzx_read.c
    branches/fusegl/libspectrum/libspectrum/tzx_write.c
    branches/fusegl/libspectrum/libspectrum/warajevo_read.c
    branches/fusegl/libspectrum/libspectrum/z80.c
    branches/fusegl/libspectrum/libspectrum/zlib.c
    branches/fusegl/libspectrum/libspectrum/zxs.c
    branches/fusegl/libspectrum/libspectrum.h
    branches/fusegl/libspectrum/libspectrum.xcodeproj/project.pbxproj

Added Paths:
-----------
    branches/fusegl/fuse/fusepb/resources/Fuse Help/html/divide.html
    branches/fusegl/libspectrum/libspectrum/symbol_table.c

Modified: branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2007-06-10 13:58:18 UTC (rev 375)
@@ -11,6 +11,7 @@
 		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
 		B60E533A0827207800F2C004 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B60E53390827207800F2C004 /* main.m */; };
 		B60E533C082720EC00F2C004 /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = B60E533B082720EC00F2C004 /* GetMetadataForFile.m */; };
+		B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */ = {isa = PBXBuildFile; fileRef = B62C1CCF0B761515000BA4E0 /* symbol_table.c */; };
 		B639B7930A6BB2C100927E24 /* z80em.c in Sources */ = {isa = PBXBuildFile; fileRef = B639B7920A6BB2C100927E24 /* z80em.c */; };
 		B6687E140A607F1D005D0FDE /* libspectrum.h.in in Resources */ = {isa = PBXBuildFile; fileRef = B6687E130A607F1D005D0FDE /* libspectrum.h.in */; };
 		B69709730827C03F00904D8F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B69709720827C03F00904D8F /* Foundation.framework */; };
@@ -110,6 +111,7 @@
 		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		B60E53390827207800F2C004 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		B60E533B082720EC00F2C004 /* GetMetadataForFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GetMetadataForFile.m; sourceTree = "<group>"; };
+		B62C1CCF0B761515000BA4E0 /* symbol_table.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = symbol_table.c; path = ../../libspectrum/libspectrum/symbol_table.c; sourceTree = "<group>"; };
 		B639B7920A6BB2C100927E24 /* z80em.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = z80em.c; path = ../../libspectrum/libspectrum/z80em.c; sourceTree = "<group>"; };
 		B6687E130A607F1D005D0FDE /* libspectrum.h.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = libspectrum.h.in; path = ../../libspectrum/libspectrum/libspectrum.h.in; sourceTree = "<group>"; };
 		B69709720827C03F00904D8F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@@ -243,6 +245,7 @@
 				B6BF2A0B0A5FFD0100D16624 /* snapshot.c */,
 				B6BF2A0C0A5FFD0100D16624 /* snp.c */,
 				B6BF2A0D0A5FFD0100D16624 /* sp.c */,
+				B62C1CCF0B761515000BA4E0 /* symbol_table.c */,
 				B6BF2A0E0A5FFD0100D16624 /* szx.c */,
 				B6BF2A0F0A5FFD0100D16624 /* tap.c */,
 				B6BF2A100A5FFD0100D16624 /* tape.c */,
@@ -388,6 +391,7 @@
 				B6BF2A340A5FFD0100D16624 /* zlib.c in Sources */,
 				B6BF2A350A5FFD0100D16624 /* zxs.c in Sources */,
 				B639B7930A6BB2C100927E24 /* z80em.c in Sources */,
+				B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m
===================================================================
--- branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m	2007-06-10 13:58:18 UTC (rev 375)
@@ -363,6 +363,9 @@
       
     case LIBSPECTRUM_TAPE_BLOCK_RLE_PULSE:
       break;
+      
+    case LIBSPECTRUM_TAPE_BLOCK_GENERALISED_DATA:
+      break;
 
     default:
       NSLog(@"LibspectrumMetadataImporter: (Sorry -- can't handle that kind of block. Skipping it)\n");

Modified: branches/fusegl/FuseImporter/libspectrum.h
===================================================================
--- branches/fusegl/FuseImporter/libspectrum.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/FuseImporter/libspectrum.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* libspectrum.h: the library for dealing with ZX Spectrum emulator files
-   Copyright (c) 2001-2006 Philip Kendall, Darren Salt, Fredrick Meunier
+   Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
 
-   $Id: libspectrum.h.in,v 1.134 2006/08/12 13:09:23 pak21 Exp $
+   $Id: libspectrum.h.in,v 1.141 2007/02/02 16:35:42 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 
@@ -267,7 +266,7 @@
   LIBSPECTRUM_ID_HARDDISK_HDF,		/* .hdf hard disk image */
   LIBSPECTRUM_ID_CARTRIDGE_IF2,		/* .rom Interface II cartridge image */
 
-  /* Below here, present only in [FIXME] and later */
+  /* Below here, present only in 0.3.0 and later */
 
   LIBSPECTRUM_ID_MICRODRIVE_MDR,	/* .mdr microdrive cartridge */
   LIBSPECTRUM_ID_TAPE_CSW,		/* .csw tape image */
@@ -298,7 +297,7 @@
   LIBSPECTRUM_CLASS_HARDDISK,		/* A hard disk image */
   LIBSPECTRUM_CLASS_CARTRIDGE_IF2,	/* Interface II cartridges */
 
-  /* Below here, present only in [FIXME] and later */
+  /* Below here, present only in 0.3.0 and later */
 
   LIBSPECTRUM_CLASS_MICRODRIVE,		/* Microdrive cartridges */
 
@@ -688,6 +687,8 @@
   LIBSPECTRUM_TAPE_BLOCK_PURE_DATA,
   LIBSPECTRUM_TAPE_BLOCK_RAW_DATA,
 
+  LIBSPECTRUM_TAPE_BLOCK_GENERALISED_DATA = 0x19,
+
   LIBSPECTRUM_TAPE_BLOCK_PAUSE = 0x20,
   LIBSPECTRUM_TAPE_BLOCK_GROUP_START,
   LIBSPECTRUM_TAPE_BLOCK_GROUP_END,
@@ -715,6 +716,7 @@
 } libspectrum_tape_type;
 
 typedef struct libspectrum_tape_block libspectrum_tape_block;
+typedef struct libspectrum_tape_generalised_data_symbol_table libspectrum_tape_generalised_data_symbol_table;
 
 /* Something to step through all the blocks in a tape */
 typedef struct _GSList *libspectrum_tape_iterator;
@@ -723,6 +725,9 @@
 extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_BLOCK;  /* End of block */
 extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_STOP;	  /* Stop tape */
 extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_STOP48; /* Stop tape if in 48K mode */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_NO_EDGE; /* Edge isn't really an edge */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LEVEL_LOW; /* Set level low */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LEVEL_HIGH; /* Set level high */
 
 /* The states which a block can be in */
 typedef enum libspectrum_tape_state_type {
@@ -769,12 +774,16 @@
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_bit1_length( libspectrum_tape_block *block, libspectrum_dword bit1_length );
 size_t WIN32_DLL libspectrum_tape_block_bits_in_last_byte( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_bits_in_last_byte( libspectrum_tape_block *block, size_t bits_in_last_byte );
+size_t WIN32_DLL libspectrum_tape_block_bits_per_data_symbol( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_bits_per_data_symbol( libspectrum_tape_block *block, size_t bits_per_data_symbol );
 size_t WIN32_DLL libspectrum_tape_block_count( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_count( libspectrum_tape_block *block, size_t count );
 libspectrum_byte WIN32_DLL * libspectrum_tape_block_data( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_data( libspectrum_tape_block *block, libspectrum_byte* data );
 size_t WIN32_DLL libspectrum_tape_block_data_length( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_data_length( libspectrum_tape_block *block, size_t data_length );
+libspectrum_tape_generalised_data_symbol_table WIN32_DLL * libspectrum_tape_block_data_table( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_data_table( libspectrum_tape_block *block, libspectrum_tape_generalised_data_symbol_table* data_table );
 int WIN32_DLL libspectrum_tape_block_ids( libspectrum_tape_block *block, size_t idx );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_ids( libspectrum_tape_block *block, int *ids );
 int WIN32_DLL libspectrum_tape_block_offset( libspectrum_tape_block *block );
@@ -787,6 +796,12 @@
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_length( libspectrum_tape_block *block, libspectrum_dword pilot_length );
 size_t WIN32_DLL libspectrum_tape_block_pilot_pulses( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_pulses( libspectrum_tape_block *block, size_t pilot_pulses );
+libspectrum_word WIN32_DLL libspectrum_tape_block_pilot_repeats( libspectrum_tape_block *block, size_t idx );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_repeats( libspectrum_tape_block *block, libspectrum_word *pilot_repeats );
+libspectrum_byte WIN32_DLL libspectrum_tape_block_pilot_symbols( libspectrum_tape_block *block, size_t idx );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_symbols( libspectrum_tape_block *block, libspectrum_byte *pilot_symbols );
+libspectrum_tape_generalised_data_symbol_table WIN32_DLL * libspectrum_tape_block_pilot_table( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_table( libspectrum_tape_block *block, libspectrum_tape_generalised_data_symbol_table* pilot_table );
 libspectrum_dword WIN32_DLL libspectrum_tape_block_pulse_length( libspectrum_tape_block *block );
 libspectrum_error WIN32_DLL libspectrum_tape_block_set_pulse_length( libspectrum_tape_block *block, libspectrum_dword pulse_length );
 libspectrum_dword WIN32_DLL libspectrum_tape_block_pulse_lengths( libspectrum_tape_block *block, size_t idx );
@@ -891,6 +906,8 @@
 libspectrum_warajevo_read( libspectrum_tape *tape,
 			   const libspectrum_byte *buffer, size_t length );
 
+/*** Routines for iterating through a tape ***/
+
 libspectrum_tape_block WIN32_DLL *
 libspectrum_tape_iterator_init( libspectrum_tape_iterator *iterator,
 				libspectrum_tape *tape );
@@ -898,6 +915,29 @@
 libspectrum_tape_block WIN32_DLL *
 libspectrum_tape_iterator_next( libspectrum_tape_iterator *iterator );
 
+/*** Routines for handling the TZX generalised data block symbol table
+     structure ***/
+
+typedef enum libspectrum_tape_generalised_data_symbol_edge_type {
+
+  LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_EDGE = 0x00,
+  LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_NO_EDGE,
+  LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_LOW,
+  LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_HIGH,
+
+} libspectrum_tape_generalised_data_symbol_edge_type;
+
+typedef struct libspectrum_tape_generalised_data_symbol libspectrum_tape_generalised_data_symbol;
+
+libspectrum_dword libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_byte libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_word libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_tape_generalised_data_symbol* libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );	
+
+libspectrum_tape_generalised_data_symbol_edge_type libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
+libspectrum_word libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
+
+
 /*
  * Input recording routines
  */
@@ -972,19 +1012,7 @@
 
 libspectrum_error WIN32_DLL libspectrum_rzx_alloc( libspectrum_rzx **rzx );
 
-/*** Routines for Z80Em raw tape format files ***/
-
-libspectrum_error
-libspectrum_z80em_read( libspectrum_tape *tape,
-			const libspectrum_byte *buffer, size_t length );
-
-/*** Routines for CSW raw tape format files ***/
-
-libspectrum_error
-libspectrum_csw_read( libspectrum_tape *tape,
-		      const libspectrum_byte *buffer, size_t length );
-
-/* Something to step through all the blocks in a tape */
+/* Something to step through all the blocks in an input recording */
 typedef struct _GSList *libspectrum_rzx_iterator;
 
 /* The block types which can appear in RZX files */
@@ -1011,23 +1039,11 @@
 size_t WIN32_DLL
 libspectrum_rzx_iterator_get_frames( libspectrum_rzx_iterator it );
 
-/*** Routines for Z80Em and CSW raw tape files ***/
-
-libspectrum_error WIN32_DLL
-libspectrum_z80em_create( libspectrum_tape *tape,
-			  const libspectrum_byte *buffer,
-			  const size_t length );
-
-libspectrum_error WIN32_DLL
-libspectrum_csw_create( libspectrum_tape *tape,
-			const libspectrum_byte *buffer, const size_t length );
-
 /*
  * Microdrive image handling routines
  */
 
 typedef struct libspectrum_microdrive libspectrum_microdrive;
-typedef struct libspectrum_microdrive_block libspectrum_microdrive_block;
 
 #define LIBSPECTRUM_MICRODRIVE_BLOCK_MAX 254
 #define LIBSPECTRUM_MICRODRIVE_HEAD_LEN 15
@@ -1066,15 +1082,6 @@
 libspectrum_microdrive_set_cartridge_len( libspectrum_microdrive *microdrive,
 					  libspectrum_byte len );
 
-void WIN32_DLL
-libspectrum_microdrive_get_block( const libspectrum_microdrive *microdrive,
-				  libspectrum_byte which,
-				  libspectrum_microdrive_block *block );
-void WIN32_DLL
-libspectrum_microdrive_set_block( libspectrum_microdrive *microdrive,
-				  libspectrum_byte which,
-				  libspectrum_microdrive_block *block );
-
 /* .mdr format routines */
 
 int WIN32_DLL

Modified: branches/fusegl/fuse/ChangeLog
===================================================================
--- branches/fusegl/fuse/ChangeLog	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/ChangeLog	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,30 +1,56 @@
-2005-??-??  Philip Kendall  <pak...@sr...>
+2007-??-??  Philip Kendall  <phi...@sh...>
 
+	* Fuse 0.8.0 released
+
 	* New features:
+	  * Loader improvements: automatically run at full speed while
+	    a loader is in progress and automatically start/stop the tape
+	    when the start/end of a loader is detected (Philip Kendall).
 	  * RZX 'rollback' support (Philip Kendall).
+	  * DivIDE support (Matthew Westcott)
+	  * Interface I and microdrive emulation (Gergely Szasz).
 	  * TS2068 support (Fredrick Meunier).
-	  * Interface I and microdrive emulation (Gergely Szasz).
 	  * Kempston mouse emulation (Darren Salt).
+	  * TZX generalized data block (0x19) support (Philip Kendall).
+	  * Much improved widget UI, including allowing selection of
+	    filenames (Darren Salt, Gergely Szasz).
 	  * Allow SDL full screen mode to be used (Darren Salt).
 	  * Add the ability to save 'movies' as collections of screenshots
 	    (Gergely Szasz).
 	  * Widget pokefinder (Darren Salt).
 	  * Add a simple code profiler (Philip Kendall).
 	  * New libao sound driver (Gergely Szasz).
+	  * New CoreAudio sound driver (Fredrick Meunier).
+	  * New PALTV 1-3x and TV3x graphics scalers (Gergely Szasz).
 
 	* Emulation core improvements:
 	  * Improved screen rendering code (now character accurate rather
-	    than line accurate) (Philip Kendall).
+	    than line accurate) (Philip Kendall, Fredrick Meunier).
+	  * Corrections to write ordering and contention for EX (SP),HL,
+	    EX (SP),IX and EX (SP),IY (Philip Kendall; thanks, Mark
+	    Woodmass).
+	  * Corrections to contention for OTIR and OTDR (Philip Kendall;
+	    thanks, Mark Woodmass).
+	  * IR contention (Philip Kendall; thanks, Mark Woodmass).
+	  * Flag bits 3 and 5 are copied on all BIT instructions (Philip
+	    Kendall; thanks, Mark Woodmass).
 	  * Improved ULA emulation with respect to interrupt length
 	    (thanks, Jon Needle, Ramsoft and Mark Woodmass) (Philip
 	    Kendall).
+	  * Fix timings of shifted no operation opcodes (Philip Kendall).
+	  * An interrupt in IM 0 takes 13 tstates to acknowledge, not 12
+	    (Philip Kendall).
 	  * Improved speed control code (Fredrick Meunier).
 
 	* Miscellaneous:
-	  * Allow filenames to be selected from the widget UIs (Darren
-	    Salt).
 	  * Add a 'save, don't save, cancel' confirmation dialog before any
 	    changes to media are lost under the GTK+ UIs (Philip Kendall).
+	  * On the Pentagon, page in the TR-DOS ROM on NMI, allowing the
+	    snapshot function to work (Philip Kendall). On the Scorpion,
+	    page in ROM 2, allowing the monitor to work (thanks, Erik
+	    Kunze).
+	  * Default snapshot format is now .szx rather than .z80 (Fredrick
+	    Meunier)
 	  * Store current joystick information in snapshots (Fredrick
 	    Meunier).
 	  * Optional use of doublescan modes in the framebuffer and
@@ -35,11 +61,8 @@
 	  * Use stock button icons in the GTK+ 2.x UI (Darren Salt).
 	  * Save/restore the 'issue 2 keyboard' flag from snapshots
 	    (Philip Kendall).
-	  * Deactivate widget menu items when they are inappropriate
-	    (Darren Salt).
 	  * Correctly quote '-' characters in the man page (needed for
 	    UTF-8 environments) (Darren Salt, Stuart Brady).
-	  * Widget query confirmation dialog (Darren Salt).
 	  * Use separate menus for controlling +3 and TR-DOS disks (Philip
 	    Kendall).
 	  * Fix behaviour of ZXATASP and ZXCF on reset (Garry Lancaster).
@@ -50,9 +73,13 @@
 	    (Darren Salt).
 	  * Various minor improvements to the framebuffer UI (Darren
 	    Salt).
+	  * Various fixes to allow compilation with gcc 4.x (Philip
+	    Kendall).
 
-	* Various other minor bugfixes (Fredrick Meunier, Philip Kendall,
-	  Mark Round, Darren Salt, Paul van der Laan).
+	* Various other minor bugfixes (Philip Kendall, Fredrick Meunier,
+	  Jon Needle, Markus Oberhumer, Mark Round, Darren Salt, Gergely
+	  Szasz, Paul van der Laan and other people to whom I apologise
+	  for forgetting).
 
 2004-07-16  Philip Kendall  <pak...@sr...>
 
@@ -756,4 +783,4 @@
 
 	* Version 0.1.0 released.
 
-$Id: ChangeLog,v 1.42 2005/03/26 17:24:54 pak21 Exp $
+$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $

Modified: branches/fusegl/fuse/Makefile.am
===================================================================
--- branches/fusegl/fuse/Makefile.am	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/Makefile.am	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 1999-2004 Philip Kendall
 
-## $Id: Makefile.am,v 1.118 2006/07/30 19:00:40 pak21 Exp $
+## $Id: Makefile.am,v 1.120 2007/02/02 16:21:50 pak21 Exp $
 
 ## 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
@@ -19,8 +19,7 @@
 ##
 ## Author contact information:
 ##
-## E-mail: pak...@sr...
-## Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+## E-mail: phi...@sh...
 
 AUTOMAKE_OPTIONS = foreign
 

Modified: branches/fusegl/fuse/README
===================================================================
--- branches/fusegl/fuse/README	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/README	2007-06-10 13:58:18 UTC (rev 375)
@@ -136,7 +136,7 @@
 the Usenet group 'comp.sys.sinclair', but do read the FAQ
 ( http://www.worldofspectrum.org/faq/index.html ) first!
 
-Philip Kendall <pak...@sr...>
+Philip Kendall <phi...@sh...>
 16 July 2004
 
-$Id: README,v 1.39 2004/07/15 10:42:29 pak21 Exp $
+$Id: README,v 1.40 2007/02/02 16:21:50 pak21 Exp $

Modified: branches/fusegl/fuse/autogen.sh
===================================================================
--- branches/fusegl/fuse/autogen.sh	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/autogen.sh	2007-06-10 13:58:18 UTC (rev 375)
@@ -3,7 +3,7 @@
 # autogen.sh: autotools invocation
 # Copyright (c) 2004 Philip Kendall
 
-# $Id: autogen.sh,v 1.4 2005/12/24 16:18:18 pak21 Exp $
+# $Id: autogen.sh,v 1.5 2007/02/02 16:21:50 pak21 Exp $
 
 # 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
@@ -21,8 +21,7 @@
 
 # Author contact information:
 
-# E-mail: Philip Kendall <pak...@sr...>
-# Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+# E-mail: Philip Kendall <phi...@sh...>
 
 # Exit on errors
 set -e

Modified: branches/fusegl/fuse/ay.c
===================================================================
--- branches/fusegl/fuse/ay.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/ay.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* ay.c: AY-8-3912 routines
    Copyright (c) 1999-2004 Philip Kendall
 
-   $Id: ay.c,v 1.25 2004/06/15 09:48:40 pak21 Exp $
+   $Id: ay.c,v 1.26 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/ay.h
===================================================================
--- branches/fusegl/fuse/ay.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/ay.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* ay.h: AY-8-3912 routines
    Copyright (c) 1999-2004 Philip Kendall
 
-   $Id: ay.h,v 1.15 2004/06/15 09:48:40 pak21 Exp $
+   $Id: ay.h,v 1.16 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/compat/Makefile.am
===================================================================
--- branches/fusegl/fuse/compat/Makefile.am	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/compat/Makefile.am	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 2003 Philip Kendall
 
-## $Id: Makefile.am,v 1.5 2004/03/28 09:55:50 pak21 Exp $
+## $Id: Makefile.am,v 1.6 2007/02/02 16:21:53 pak21 Exp $
 
 ## 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
@@ -19,8 +19,7 @@
 ##
 ## Author contact information:
 ##
-## E-mail: pak...@sr...
-## Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+## E-mail: phi...@sh...
 
 AUTOMAKE_OPTIONS = foreign
 

Modified: branches/fusegl/fuse/compat/dirname.c
===================================================================
--- branches/fusegl/fuse/compat/dirname.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/compat/dirname.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -20,8 +20,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/compat.h
===================================================================
--- branches/fusegl/fuse/compat.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/compat.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* compat.h: various compatbility bits
    Copyright (c) 2003 Philip Kendall
 
-   $Id: compat.h,v 1.6 2004/04/11 10:13:22 pak21 Exp $
+   $Id: compat.h,v 1.7 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/configure.in
===================================================================
--- branches/fusegl/fuse/configure.in	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/configure.in	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.151 2005/03/06 05:30:27 fredm Exp $
+dnl $Id: configure.in,v 1.155 2007/02/02 16:21:50 pak21 Exp $
 
 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
@@ -17,8 +17,7 @@
 dnl
 dnl Author contact information:
 dnl
-dnl E-mail: pak...@sr...
-dnl Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+dnl E-mail: phi...@sh...
 
 AC_INIT(fuse.cpp)
 AM_CONFIG_HEADER(config.h)
@@ -406,8 +405,7 @@
   AC_SUBST(AO_LIBS)
 fi
 
-dnl Check if a version of libao which supplies ao_open_live is available
-  CoreAudio/AudioHardware.h
+dnl Check if CoreAudio is available
 AC_CHECK_HEADER(
   CoreAudio/AudioHardware.h,
   [AC_DEFINE([USE_COREAUDIO], 1, [Defined if we're going to be using CoreAudio]) COREAUDIO_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices'],

Modified: branches/fusegl/fuse/dck.c
===================================================================
--- branches/fusegl/fuse/dck.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/dck.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* dck.c: dock snapshot (Warajevo .DCK) handling routines
    Copyright (c) 2003-2004 Darren Salt, Fredrick Meunier, Philip Kendall
 
-   $Id: dck.c,v 1.21 2004/05/25 10:05:05 fredm Exp $
+   $Id: dck.c,v 1.22 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   Philip: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   Philip: phi...@sh...
 
    Darren: li...@yo...
    Fred: fr...@sp...

Modified: branches/fusegl/fuse/dck.h
===================================================================
--- branches/fusegl/fuse/dck.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/dck.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* dck.c: dock snapshot (Warajevo .DCK) handling routines
    Copyright (c) 2003 Darren Salt, Fredrick Meunier
 
-   $Id: dck.h,v 1.2 2004/05/25 10:05:06 fredm Exp $
+   $Id: dck.h,v 1.3 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   Philip: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   Philip: phi...@sh...
 
    Darren: li...@yo...
    Fred: fr...@sp...

Modified: branches/fusegl/fuse/debugger/Makefile.am
===================================================================
--- branches/fusegl/fuse/debugger/Makefile.am	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/Makefile.am	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 2001-2004 Philip Kendall
 
-## $Id: Makefile.am,v 1.12 2004/07/09 17:38:06 pak21 Exp $
+## $Id: Makefile.am,v 1.13 2007/02/02 16:21:53 pak21 Exp $
 
 ## 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
@@ -19,8 +19,7 @@
 ##
 ## Author contact information:
 ##
-## E-mail: pak...@sr...
-## Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+## E-mail: phi...@sh...
 
 AUTOMAKE_OPTIONS = foreign
 

Modified: branches/fusegl/fuse/debugger/breakpoint.c
===================================================================
--- branches/fusegl/fuse/debugger/breakpoint.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/breakpoint.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* breakpoint.c: a debugger breakpoint
    Copyright (c) 2002-2004 Philip Kendall
 
-   $Id: breakpoint.c,v 1.8 2006/12/15 20:50:47 pak21 Exp $
+   $Id: breakpoint.c,v 1.9 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/breakpoint.h
===================================================================
--- branches/fusegl/fuse/debugger/breakpoint.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/breakpoint.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* breakpoint.h: a debugger breakpoint
    Copyright (c) 2002-2004 Philip Kendall
 
-   $Id: breakpoint.h,v 1.4 2004/05/14 22:05:57 pak21 Exp $
+   $Id: breakpoint.h,v 1.5 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/command.c
===================================================================
--- branches/fusegl/fuse/debugger/command.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/command.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* command.c: Parse a debugger command
    Copyright (c) 2002 Philip Kendall
 
-   $Id: command.c,v 1.16 2003/12/02 14:56:32 pak21 Exp $
+   $Id: command.c,v 1.17 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/commandl.l
===================================================================
--- branches/fusegl/fuse/debugger/commandl.l	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/commandl.l	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* commandl.l: Debugger command lexical scanner
    Copyright (c) 2002 Philip Kendall
 
-   $Id: commandl.l,v 1.36 2004/06/16 14:46:34 pak21 Exp $
+   $Id: commandl.l,v 1.37 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/commandy.y
===================================================================
--- branches/fusegl/fuse/debugger/commandy.y	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/commandy.y	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* commandy.y: Parse a debugger command
    Copyright (c) 2002-2004 Philip Kendall
 
-   $Id: commandy.y,v 1.42 2004/06/16 14:46:34 pak21 Exp $
+   $Id: commandy.y,v 1.43 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/debugger.c
===================================================================
--- branches/fusegl/fuse/debugger/debugger.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/debugger.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* debugger.h: Fuse's monitor/debugger
    Copyright (c) 2002-2004 Philip Kendall
 
-   $Id: debugger.c,v 1.35 2004/12/29 13:11:16 pak21 Exp $
+   $Id: debugger.c,v 1.36 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/debugger.h
===================================================================
--- branches/fusegl/fuse/debugger/debugger.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/debugger.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* debugger.h: Fuse's monitor/debugger
    Copyright (c) 2002-2004 Philip Kendall
 
-   $Id: debugger.h,v 1.25 2004/02/26 20:03:09 pak21 Exp $
+   $Id: debugger.h,v 1.26 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/debugger_internals.h
===================================================================
--- branches/fusegl/fuse/debugger/debugger_internals.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/debugger_internals.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* debugger_internals.h: The internals of Fuse's monitor/debugger
    Copyright (c) 2002-2003 Philip Kendall
 
-   $Id: debugger_internals.h,v 1.25 2004/06/16 14:46:34 pak21 Exp $
+   $Id: debugger_internals.h,v 1.26 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/disassemble.c
===================================================================
--- branches/fusegl/fuse/debugger/disassemble.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/disassemble.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* disassemble.h: Fuse's disassembler
    Copyright (c) 2002-2003 Darren Salt, Philip Kendall
 
-   $Id: disassemble.c,v 1.10 2003/11/14 11:46:47 pak21 Exp $
+   $Id: disassemble.c,v 1.11 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -21,8 +21,7 @@
 
    Darren: li...@yo...
 
-   Philip: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   Philip: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/debugger/expression.c
===================================================================
--- branches/fusegl/fuse/debugger/expression.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/debugger/expression.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* expression.c: A numeric expression
    Copyright (c) 2003 Philip Kendall
 
-   $Id: expression.c,v 1.13 2004/06/16 14:05:38 pak21 Exp $
+   $Id: expression.c,v 1.14 2007/02/02 16:21:53 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/display.c
===================================================================
--- branches/fusegl/fuse/display.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/display.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -2,7 +2,7 @@
    Copyright (c) 1999-2006 Philip Kendall, Thomas Harte, Witold Filipczyk
                            and Fredrick Meunier
 
-   $Id: display.c,v 1.57 2006/09/17 00:56:18 fredm Exp $
+   $Id: display.c,v 1.59 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -20,8 +20,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/display.h
===================================================================
--- branches/fusegl/fuse/display.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/display.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* display.h: Routines for printing the Spectrum's screen
    Copyright (c) 1999-2006 Philip Kendall
 
-   $Id: display.h,v 1.26 2006/09/17 00:56:18 fredm Exp $
+   $Id: display.h,v 1.27 2007/02/02 16:21:50 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/divide.c
===================================================================
--- branches/fusegl/fuse/divide.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/divide.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* divide.c: DivIDE interface routines
    Copyright (c) 2005 Matthew Westcott
 
-   $Id: divide.c,v 1.2 2005/10/31 12:09:10 pak21 Exp $
+   $Id: divide.c,v 1.3 2007/02/02 16:21:51 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: Philip Kendall <pak...@sr...>
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: Philip Kendall <phi...@sh...>
 
 */
 

Modified: branches/fusegl/fuse/divide.h
===================================================================
--- branches/fusegl/fuse/divide.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/divide.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -17,8 +17,7 @@
 
    Author contact information:
 
-   E-mail: Philip Kendall <pak...@sr...>
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: Philip Kendall <phi...@sh...>
 
 */
 

Modified: branches/fusegl/fuse/event.c
===================================================================
--- branches/fusegl/fuse/event.c	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/event.c	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* event.c: Routines needed for dealing with the event list
    Copyright (c) 2000-2004 Philip Kendall
 
-   $Id: event.c,v 1.56 2006/09/03 14:12:22 fredm Exp $
+   $Id: event.c,v 1.57 2007/02/02 16:21:51 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/event.h
===================================================================
--- branches/fusegl/fuse/event.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/event.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* event.h: Routines needed for dealing with the event list
    Copyright (c) 2000-2004 Philip Kendall
 
-   $Id: event.h,v 1.24 2006/08/06 10:41:52 pak21 Exp $
+   $Id: event.h,v 1.25 2007/02/02 16:21:51 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/fuse.cpp
===================================================================
--- branches/fusegl/fuse/fuse.cpp	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/fuse.cpp	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* fuse.c: The Free Unix Spectrum Emulator
    Copyright (c) 1999-2005 Philip Kendall
 
-   $Id: fuse.c,v 1.130 2006/07/28 15:06:14 fredm Exp $
+   $Id: fuse.c,v 1.133 2007/02/02 16:21:51 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 
@@ -365,7 +364,7 @@
   printf( "\n" );
   fuse_show_version();
   printf(
-   "Copyright (c) 1999-2005 Philip Kendall <pak...@sr...>\n"
+   "Copyright (c) 1999-2005 Philip Kendall <phi...@sh...>\n"
    "and others; see the file 'AUTHORS' for more details.\n"
    "\n"
    "This program is distributed in the hope that it will be useful,\n"
@@ -709,6 +708,7 @@
   simpleide_end();
   zxatasp_end();
   zxcf_end();
+  if1_end();
   divide_end();
 
   timer_end();

Modified: branches/fusegl/fuse/fuse.h
===================================================================
--- branches/fusegl/fuse/fuse.h	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/fuse.h	2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
 /* fuse.h: Variables exported from the main file
    Copyright (c) 2000-2003 Philip Kendall
 
-   $Id: fuse.h,v 1.18 2006/07/15 17:33:58 pak21 Exp $
+   $Id: fuse.h,v 1.20 2007/02/02 16:21:51 pak21 Exp $
 
    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
@@ -19,8 +19,7 @@
 
    Author contact information:
 
-   E-mail: pak...@sr...
-   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+   E-mail: phi...@sh...
 
 */
 

Modified: branches/fusegl/fuse/fusepb/Credits.html
===================================================================
--- branches/fusegl/fuse/fusepb/Credits.html	2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/fusepb/Credits.html	2007-06-10 13:58:18 UTC (rev 375)
@@ -7,24 +7,15 @@
 </head>
 <body>
 <p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US">Fuse
-has its own home page, which you can find at:<br>
-<a href="http://fuse-emulator.sourceforge.net/">http://fuse-emulator.sourceforge.net/</a><br>
-and contains much of the information listed here.<br>
-<br>
-News of new versions of Fuse (and other important Fuse-related
-announcements) are distributed via the fuse-emulator-announce mailing
-list on <a href="http://www.sourceforge.net/">SourceForge</a>; see<br>
-<a
- href="http://lists.sourceforge.net/lists/listinfo/fuse-emulator-announce">http://lists.sourceforge.net/lists/listinfo/fuse-emulator-announce</a><br>
-for details on how to subscribe and the like.<br>
-<br>
-If you've got any bug reports, suggestions or the like for Fuse, or
+for Mac OS X has a home page at:</span></p>
+<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US"><a
+ href="http://fuse-for-macosx.sourceforge.net/">http://fuse-for-macosx.sourceforge.net/</a><br>
+</span><br>
+<span style="font-family: Helvetica;" lang="EN-US">If you've got any
+bug reports, suggestions or the like for Fuse, or
 just want to get involved in the development, this is coordinated via
-the fuse-emulator-devel mailing list,<br>
-<a
- href="http://lists.sourceforge.net/lists/listinfo/fuse-emulator-devel">http://lists.sourceforge.net/lists/listinfo/fuse-emulator-devel</a><br>
-and the Fuse project page on SourceForge,<br>
-<a hre...
 
[truncated message content]

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [374] vendor/fuse-emulator/fuse-r2957/

From: <fr...@us...> - 2007-06-10 01:40:43

Revision: 374
          http://svn.sourceforge.net/fuse-for-macosx/?rev=374&view=rev
Author:   fredm
Date:     2007-06-09 18:40:41 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Tag vendor/fuse-emulator/current as vendor/fuse-emulator/fuse-r2957.

Added Paths:
-----------
    vendor/fuse-emulator/fuse-r2957/

Copied: vendor/fuse-emulator/fuse-r2957 (from rev 373, vendor/fuse-emulator/current)


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: [373] vendor/fuse-emulator/current

From: <fr...@us...> - 2007-06-10 01:36:44

Revision: 373
          http://svn.sourceforge.net/fuse-for-macosx/?rev=373&view=rev
Author:   fredm
Date:     2007-06-09 18:36:39 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Load . into vendor/fuse-emulator/current.

Added Paths:
-----------
    vendor/fuse-emulator/current/fuse/
    vendor/fuse-emulator/current/fuse/AUTHORS
    vendor/fuse-emulator/current/fuse/COPYING
    vendor/fuse-emulator/current/fuse/ChangeLog
    vendor/fuse-emulator/current/fuse/Makefile.am
    vendor/fuse-emulator/current/fuse/README
    vendor/fuse-emulator/current/fuse/THANKS
    vendor/fuse-emulator/current/fuse/TODO
    vendor/fuse-emulator/current/fuse/acinclude.m4
    vendor/fuse-emulator/current/fuse/autogen.sh
    vendor/fuse-emulator/current/fuse/ay.c
    vendor/fuse-emulator/current/fuse/ay.h
    vendor/fuse-emulator/current/fuse/compat/
    vendor/fuse-emulator/current/fuse/compat/Makefile.am
    vendor/fuse-emulator/current/fuse/compat/dirname.c
    vendor/fuse-emulator/current/fuse/compat/getopt.c
    vendor/fuse-emulator/current/fuse/compat/getopt.h
    vendor/fuse-emulator/current/fuse/compat/getopt1.c
    vendor/fuse-emulator/current/fuse/compat/mkstemp.c
    vendor/fuse-emulator/current/fuse/compat.h
    vendor/fuse-emulator/current/fuse/configure.in
    vendor/fuse-emulator/current/fuse/dck.c
    vendor/fuse-emulator/current/fuse/dck.h
    vendor/fuse-emulator/current/fuse/debugger/
    vendor/fuse-emulator/current/fuse/debugger/Makefile.am
    vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
    vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
    vendor/fuse-emulator/current/fuse/debugger/command.c
    vendor/fuse-emulator/current/fuse/debugger/commandl.l
    vendor/fuse-emulator/current/fuse/debugger/commandy.y
    vendor/fuse-emulator/current/fuse/debugger/debugger.c
    vendor/fuse-emulator/current/fuse/debugger/debugger.h
    vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
    vendor/fuse-emulator/current/fuse/debugger/disassemble.c
    vendor/fuse-emulator/current/fuse/debugger/expression.c
    vendor/fuse-emulator/current/fuse/display.c
    vendor/fuse-emulator/current/fuse/display.h
    vendor/fuse-emulator/current/fuse/divide.c
    vendor/fuse-emulator/current/fuse/divide.h
    vendor/fuse-emulator/current/fuse/event.c
    vendor/fuse-emulator/current/fuse/event.h
    vendor/fuse-emulator/current/fuse/fuse.c
    vendor/fuse-emulator/current/fuse/fuse.h
    vendor/fuse-emulator/current/fuse/hacking/
    vendor/fuse-emulator/current/fuse/hacking/ChangeLog
    vendor/fuse-emulator/current/fuse/hacking/Makefile.am
    vendor/fuse-emulator/current/fuse/hacking/coding_style.txt
    vendor/fuse-emulator/current/fuse/hacking/cvs-tags
    vendor/fuse-emulator/current/fuse/hacking/implementation_notes.txt
    vendor/fuse-emulator/current/fuse/hacking/input.txt
    vendor/fuse-emulator/current/fuse/hacking/sound.txt
    vendor/fuse-emulator/current/fuse/hacking/tc2048_tech_notes.txt
    vendor/fuse-emulator/current/fuse/hacking/timer.txt
    vendor/fuse-emulator/current/fuse/hacking/ui.txt
    vendor/fuse-emulator/current/fuse/hacking/win32_todo.txt
    vendor/fuse-emulator/current/fuse/ide.c
    vendor/fuse-emulator/current/fuse/ide.h
    vendor/fuse-emulator/current/fuse/if1.c
    vendor/fuse-emulator/current/fuse/if1.h
    vendor/fuse-emulator/current/fuse/if2.c
    vendor/fuse-emulator/current/fuse/if2.h
    vendor/fuse-emulator/current/fuse/input.c
    vendor/fuse-emulator/current/fuse/input.h
    vendor/fuse-emulator/current/fuse/joystick.c
    vendor/fuse-emulator/current/fuse/joystick.h
    vendor/fuse-emulator/current/fuse/kempmouse.c
    vendor/fuse-emulator/current/fuse/kempmouse.h
    vendor/fuse-emulator/current/fuse/keyboard.c
    vendor/fuse-emulator/current/fuse/keyboard.h
    vendor/fuse-emulator/current/fuse/keysyms.dat
    vendor/fuse-emulator/current/fuse/keysyms.pl
    vendor/fuse-emulator/current/fuse/lib/
    vendor/fuse-emulator/current/fuse/lib/Makefile.am
    vendor/fuse-emulator/current/fuse/lib/cassette.bmp
    vendor/fuse-emulator/current/fuse/lib/compressed/
    vendor/fuse-emulator/current/fuse/lib/compressed/disk_plus3.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_128.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_16.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_2048.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_2068.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_48.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_pentagon.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus2.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus2a.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus3.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus3e.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_scorpion.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_se.szx
    vendor/fuse-emulator/current/fuse/lib/compressed/tape_ts2068.szx
    vendor/fuse-emulator/current/fuse/lib/keyboard.scr
    vendor/fuse-emulator/current/fuse/lib/microdrive.bmp
    vendor/fuse-emulator/current/fuse/lib/plus3disk.bmp
    vendor/fuse-emulator/current/fuse/lib/uncompressed/
    vendor/fuse-emulator/current/fuse/lib/uncompressed/disk_plus3.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_128.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_16.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_2048.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_2068.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_48.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_pentagon.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus2.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus2a.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus3.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus3e.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_scorpion.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_se.szx
    vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_ts2068.szx
    vendor/fuse-emulator/current/fuse/loader.c
    vendor/fuse-emulator/current/fuse/loader.h
    vendor/fuse-emulator/current/fuse/machine.c
    vendor/fuse-emulator/current/fuse/machine.h
    vendor/fuse-emulator/current/fuse/machines/
    vendor/fuse-emulator/current/fuse/machines/Makefile.am
    vendor/fuse-emulator/current/fuse/machines/machines.h
    vendor/fuse-emulator/current/fuse/machines/pentagon.c
    vendor/fuse-emulator/current/fuse/machines/scorpion.c
    vendor/fuse-emulator/current/fuse/machines/scorpion.h
    vendor/fuse-emulator/current/fuse/machines/spec128.c
    vendor/fuse-emulator/current/fuse/machines/spec128.h
    vendor/fuse-emulator/current/fuse/machines/spec16.c
    vendor/fuse-emulator/current/fuse/machines/spec48.c
    vendor/fuse-emulator/current/fuse/machines/spec48.h
    vendor/fuse-emulator/current/fuse/machines/spec_se.c
    vendor/fuse-emulator/current/fuse/machines/specplus2.c
    vendor/fuse-emulator/current/fuse/machines/specplus2a.c
    vendor/fuse-emulator/current/fuse/machines/specplus3.c
    vendor/fuse-emulator/current/fuse/machines/specplus3.h
    vendor/fuse-emulator/current/fuse/machines/specplus3e.c
    vendor/fuse-emulator/current/fuse/machines/tc2048.c
    vendor/fuse-emulator/current/fuse/machines/tc2068.c
    vendor/fuse-emulator/current/fuse/machines/tc2068.h
    vendor/fuse-emulator/current/fuse/machines/ts2068.c
    vendor/fuse-emulator/current/fuse/man/
    vendor/fuse-emulator/current/fuse/man/Makefile.am
    vendor/fuse-emulator/current/fuse/man/fuse.1
    vendor/fuse-emulator/current/fuse/memory.c
    vendor/fuse-emulator/current/fuse/memory.h
    vendor/fuse-emulator/current/fuse/menu.c
    vendor/fuse-emulator/current/fuse/menu.h
    vendor/fuse-emulator/current/fuse/menu_data.dat
    vendor/fuse-emulator/current/fuse/menu_data.pl
    vendor/fuse-emulator/current/fuse/periph.c
    vendor/fuse-emulator/current/fuse/periph.h
    vendor/fuse-emulator/current/fuse/perl/
    vendor/fuse-emulator/current/fuse/perl/Fuse/
    vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
    vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
    vendor/fuse-emulator/current/fuse/perl/Fuse.pm
    vendor/fuse-emulator/current/fuse/perl/Makefile.am
    vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
    vendor/fuse-emulator/current/fuse/pokefinder/
    vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
    vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
    vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
    vendor/fuse-emulator/current/fuse/printer.c
    vendor/fuse-emulator/current/fuse/printer.h
    vendor/fuse-emulator/current/fuse/profile.c
    vendor/fuse-emulator/current/fuse/profile.h
    vendor/fuse-emulator/current/fuse/psg.c
    vendor/fuse-emulator/current/fuse/psg.h
    vendor/fuse-emulator/current/fuse/roms/
    vendor/fuse-emulator/current/fuse/roms/128-0.rom
    vendor/fuse-emulator/current/fuse/roms/128-1.rom
    vendor/fuse-emulator/current/fuse/roms/128p-0.rom
    vendor/fuse-emulator/current/fuse/roms/128p-1.rom
    vendor/fuse-emulator/current/fuse/roms/256s-0.rom
    vendor/fuse-emulator/current/fuse/roms/256s-1.rom
    vendor/fuse-emulator/current/fuse/roms/256s-2.rom
    vendor/fuse-emulator/current/fuse/roms/256s-3.rom
    vendor/fuse-emulator/current/fuse/roms/48.rom
    vendor/fuse-emulator/current/fuse/roms/Makefile.am
    vendor/fuse-emulator/current/fuse/roms/if1-1.rom
    vendor/fuse-emulator/current/fuse/roms/if1-2.rom
    vendor/fuse-emulator/current/fuse/roms/plus2-0.rom
    vendor/fuse-emulator/current/fuse/roms/plus2-1.rom
    vendor/fuse-emulator/current/fuse/roms/plus3-0.rom
    vendor/fuse-emulator/current/fuse/roms/plus3-1.rom
    vendor/fuse-emulator/current/fuse/roms/plus3-2.rom
    vendor/fuse-emulator/current/fuse/roms/plus3-3.rom
    vendor/fuse-emulator/current/fuse/roms/plus3e-0.rom
    vendor/fuse-emulator/current/fuse/roms/plus3e-1.rom
    vendor/fuse-emulator/current/fuse/roms/plus3e-2.rom
    vendor/fuse-emulator/current/fuse/roms/plus3e-3.rom
    vendor/fuse-emulator/current/fuse/roms/se-0.rom
    vendor/fuse-emulator/current/fuse/roms/se-1.rom
    vendor/fuse-emulator/current/fuse/roms/tc2048.rom
    vendor/fuse-emulator/current/fuse/roms/tc2068-0.rom
    vendor/fuse-emulator/current/fuse/roms/tc2068-1.rom
    vendor/fuse-emulator/current/fuse/roms/trdos.rom
    vendor/fuse-emulator/current/fuse/rzx.c
    vendor/fuse-emulator/current/fuse/rzx.h
    vendor/fuse-emulator/current/fuse/scld.c
    vendor/fuse-emulator/current/fuse/scld.h
    vendor/fuse-emulator/current/fuse/screenshot.c
    vendor/fuse-emulator/current/fuse/screenshot.h
    vendor/fuse-emulator/current/fuse/settings-header.pl
    vendor/fuse-emulator/current/fuse/settings.dat
    vendor/fuse-emulator/current/fuse/settings.pl
    vendor/fuse-emulator/current/fuse/simpleide.c
    vendor/fuse-emulator/current/fuse/simpleide.h
    vendor/fuse-emulator/current/fuse/slt.c
    vendor/fuse-emulator/current/fuse/slt.h
    vendor/fuse-emulator/current/fuse/snapshot.c
    vendor/fuse-emulator/current/fuse/snapshot.h
    vendor/fuse-emulator/current/fuse/sound/
    vendor/fuse-emulator/current/fuse/sound/Makefile.am
    vendor/fuse-emulator/current/fuse/sound/alsasound.c
    vendor/fuse-emulator/current/fuse/sound/aosound.c
    vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
    vendor/fuse-emulator/current/fuse/sound/dxsound.c
    vendor/fuse-emulator/current/fuse/sound/hpsound.c
    vendor/fuse-emulator/current/fuse/sound/lowlevel.h
    vendor/fuse-emulator/current/fuse/sound/nullsound.c
    vendor/fuse-emulator/current/fuse/sound/osssound.c
    vendor/fuse-emulator/current/fuse/sound/sdlsound.c
    vendor/fuse-emulator/current/fuse/sound/sfifo.c
    vendor/fuse-emulator/current/fuse/sound/sfifo.h
    vendor/fuse-emulator/current/fuse/sound/sunsound.c
    vendor/fuse-emulator/current/fuse/sound.c
    vendor/fuse-emulator/current/fuse/sound.h
    vendor/fuse-emulator/current/fuse/spectrum.c
    vendor/fuse-emulator/current/fuse/spectrum.h
    vendor/fuse-emulator/current/fuse/tape.c
    vendor/fuse-emulator/current/fuse/tape.h
    vendor/fuse-emulator/current/fuse/timer.c
    vendor/fuse-emulator/current/fuse/timer.h
    vendor/fuse-emulator/current/fuse/trdos.c
    vendor/fuse-emulator/current/fuse/trdos.h
    vendor/fuse-emulator/current/fuse/ui/
    vendor/fuse-emulator/current/fuse/ui/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/fb/
    vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
    vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.h
    vendor/fuse-emulator/current/fuse/ui/fb/fbjoystick.c
    vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.c
    vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.h
    vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
    vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.h
    vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
    vendor/fuse-emulator/current/fuse/ui/ggi/
    vendor/fuse-emulator/current/fuse/ui/ggi/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/ggi/ggi_internals.h
    vendor/fuse-emulator/current/fuse/ui/ggi/ggidisplay.c
    vendor/fuse-emulator/current/fuse/ui/ggi/ggikeyboard.c
    vendor/fuse-emulator/current/fuse/ui/ggi/ggiui.c
    vendor/fuse-emulator/current/fuse/ui/gtk/
    vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
    vendor/fuse-emulator/current/fuse/ui/gtk/browse.c
    vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
    vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
    vendor/fuse-emulator/current/fuse/ui/gtk/fileselector.c
    vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
    vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
    vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
    vendor/fuse-emulator/current/fuse/ui/gtk/gtkkeyboard.c
    vendor/fuse-emulator/current/fuse/ui/gtk/gtkmouse.c
    vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
    vendor/fuse-emulator/current/fuse/ui/gtk/memory.c
    vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl
    vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
    vendor/fuse-emulator/current/fuse/ui/gtk/picture.c
    vendor/fuse-emulator/current/fuse/ui/gtk/pixmaps.c
    vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
    vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
    vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
    vendor/fuse-emulator/current/fuse/ui/gtk/statusbar.c
    vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
    vendor/fuse-emulator/current/fuse/ui/options.dat
    vendor/fuse-emulator/current/fuse/ui/scaler/
    vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
    vendor/fuse-emulator/current/fuse/ui/scaler/scaler.h
    vendor/fuse-emulator/current/fuse/ui/scaler/scaler_internals.h
    vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
    vendor/fuse-emulator/current/fuse/ui/sdl/
    vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
    vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.h
    vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
    vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.h
    vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.c
    vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.h
    vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
    vendor/fuse-emulator/current/fuse/ui/svga/
    vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
    vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.h
    vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.c
    vendor/fuse-emulator/current/fuse/ui/svga/svgakeyboard.c
    vendor/fuse-emulator/current/fuse/ui/svga/svgakeyboard.h
    vendor/fuse-emulator/current/fuse/ui/svga/svgaui.c
    vendor/fuse-emulator/current/fuse/ui/ui.h
    vendor/fuse-emulator/current/fuse/ui/uidisplay.h
    vendor/fuse-emulator/current/fuse/ui/uijoystick.c
    vendor/fuse-emulator/current/fuse/ui/uijoystick.h
    vendor/fuse-emulator/current/fuse/ui/win32/
    vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
    vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
    vendor/fuse-emulator/current/fuse/ui/win32/debugger.rc
    vendor/fuse-emulator/current/fuse/ui/win32/del_o.bat
    vendor/fuse-emulator/current/fuse/ui/win32/error.c
    vendor/fuse-emulator/current/fuse/ui/win32/icons/
    vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/win32/icons/disk_active.bmp
    vendor/fuse-emulator/current/fuse/ui/win32/icons/disk_inactive.bmp
    vendor/fuse-emulator/current/fuse/ui/win32/icons/pause_active.bmp
    vendor/fuse-emulator/current/fuse/ui/win32/icons/pause_inactive.bmp
    vendor/fuse-emulator/current/fuse/ui/win32/icons/tape_active.bmp
    vendor/fuse-emulator/current/fuse/ui/win32/icons/tape_inactive.bmp
    vendor/fuse-emulator/current/fuse/ui/win32/icons/tape_marker.bmp
    vendor/fuse-emulator/current/fuse/ui/win32/menu_data.c
    vendor/fuse-emulator/current/fuse/ui/win32/menu_data.h
    vendor/fuse-emulator/current/fuse/ui/win32/menu_data.rc
    vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
    vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.h
    vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.rc
    vendor/fuse-emulator/current/fuse/ui/win32/statusbar.c
    vendor/fuse-emulator/current/fuse/ui/win32/win32display.c
    vendor/fuse-emulator/current/fuse/ui/win32/win32display.h
    vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
    vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
    vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.h
    vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
    vendor/fuse-emulator/current/fuse/ui/win32/win32ui.rc
    vendor/fuse-emulator/current/fuse/ui/xlib/
    vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
    vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
    vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.h
    vendor/fuse-emulator/current/fuse/ui/xlib/xerror.c
    vendor/fuse-emulator/current/fuse/ui/xlib/xjoystick.c
    vendor/fuse-emulator/current/fuse/ui/xlib/xkeyboard.c
    vendor/fuse-emulator/current/fuse/ui/xlib/xkeyboard.h
    vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
    vendor/fuse-emulator/current/fuse/ui/xlib/xui.h
    vendor/fuse-emulator/current/fuse/ui.c
    vendor/fuse-emulator/current/fuse/uidisplay.c
    vendor/fuse-emulator/current/fuse/ula.c
    vendor/fuse-emulator/current/fuse/ula.h
    vendor/fuse-emulator/current/fuse/utils.c
    vendor/fuse-emulator/current/fuse/utils.h
    vendor/fuse-emulator/current/fuse/widget/
    vendor/fuse-emulator/current/fuse/widget/Makefile.am
    vendor/fuse-emulator/current/fuse/widget/browse.c
    vendor/fuse-emulator/current/fuse/widget/debugger.c
    vendor/fuse-emulator/current/fuse/widget/error.c
    vendor/fuse-emulator/current/fuse/widget/filesel.c
    vendor/fuse-emulator/current/fuse/widget/fuse.font.sbf
    vendor/fuse-emulator/current/fuse/widget/memory.c
    vendor/fuse-emulator/current/fuse/widget/menu.c
    vendor/fuse-emulator/current/fuse/widget/mkfusefont.pl
    vendor/fuse-emulator/current/fuse/widget/options-header.pl
    vendor/fuse-emulator/current/fuse/widget/options.pl
    vendor/fuse-emulator/current/fuse/widget/picture.c
    vendor/fuse-emulator/current/fuse/widget/pokefinder.c
    vendor/fuse-emulator/current/fuse/widget/query.c
    vendor/fuse-emulator/current/fuse/widget/roms.c
    vendor/fuse-emulator/current/fuse/widget/select.c
    vendor/fuse-emulator/current/fuse/widget/text.c
    vendor/fuse-emulator/current/fuse/widget/widget.c
    vendor/fuse-emulator/current/fuse/widget/widget.h
    vendor/fuse-emulator/current/fuse/widget/widget_internals.h
    vendor/fuse-emulator/current/fuse/windres.rc
    vendor/fuse-emulator/current/fuse/z80/
    vendor/fuse-emulator/current/fuse/z80/Makefile.am
    vendor/fuse-emulator/current/fuse/z80/coretest.c
    vendor/fuse-emulator/current/fuse/z80/harness.pl
    vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat
    vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat
    vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat
    vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat
    vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat
    vendor/fuse-emulator/current/fuse/z80/tests/
    vendor/fuse-emulator/current/fuse/z80/tests/00.in
    vendor/fuse-emulator/current/fuse/z80/tests/00.out
    vendor/fuse-emulator/current/fuse/z80/tests/01.in
    vendor/fuse-emulator/current/fuse/z80/tests/01.out
    vendor/fuse-emulator/current/fuse/z80/tests/02.in
    vendor/fuse-emulator/current/fuse/z80/tests/02.out
    vendor/fuse-emulator/current/fuse/z80/tests/03.in
    vendor/fuse-emulator/current/fuse/z80/tests/03.out
    vendor/fuse-emulator/current/fuse/z80/tests/04.in
    vendor/fuse-emulator/current/fuse/z80/tests/04.out
    vendor/fuse-emulator/current/fuse/z80/tests/05.in
    vendor/fuse-emulator/current/fuse/z80/tests/05.out
    vendor/fuse-emulator/current/fuse/z80/tests/06.in
    vendor/fuse-emulator/current/fuse/z80/tests/06.out
    vendor/fuse-emulator/current/fuse/z80/tests/07.in
    vendor/fuse-emulator/current/fuse/z80/tests/07.out
    vendor/fuse-emulator/current/fuse/z80/tests/08.in
    vendor/fuse-emulator/current/fuse/z80/tests/08.out
    vendor/fuse-emulator/current/fuse/z80/tests/09.in
    vendor/fuse-emulator/current/fuse/z80/tests/09.out
    vendor/fuse-emulator/current/fuse/z80/tests/0a.in
    vendor/fuse-emulator/current/fuse/z80/tests/0a.out
    vendor/fuse-emulator/current/fuse/z80/tests/0b.in
    vendor/fuse-emulator/current/fuse/z80/tests/0b.out
    vendor/fuse-emulator/current/fuse/z80/tests/0c.in
    vendor/fuse-emulator/current/fuse/z80/tests/0c.out
    vendor/fuse-emulator/current/fuse/z80/tests/0d.in
    vendor/fuse-emulator/current/fuse/z80/tests/0d.out
    vendor/fuse-emulator/current/fuse/z80/tests/0e.in
    vendor/fuse-emulator/current/fuse/z80/tests/0e.out
    vendor/fuse-emulator/current/fuse/z80/tests/0f.in
    vendor/fuse-emulator/current/fuse/z80/tests/0f.out
    vendor/fuse-emulator/current/fuse/z80/tests/10.in
    vendor/fuse-emulator/current/fuse/z80/tests/10.out
    vendor/fuse-emulator/current/fuse/z80/tests/11.in
    vendor/fuse-emulator/current/fuse/z80/tests/11.out
    vendor/fuse-emulator/current/fuse/z80/tests/12.in
    vendor/fuse-emulator/current/fuse/z80/tests/12.out
    vendor/fuse-emulator/current/fuse/z80/tests/13.in
    vendor/fuse-emulator/current/fuse/z80/tests/13.out
    vendor/fuse-emulator/current/fuse/z80/tests/14.in
    vendor/fuse-emulator/current/fuse/z80/tests/14.out
    vendor/fuse-emulator/current/fuse/z80/tests/15.in
    vendor/fuse-emulator/current/fuse/z80/tests/15.out
    vendor/fuse-emulator/current/fuse/z80/tests/16.in
    vendor/fuse-emulator/current/fuse/z80/tests/16.out
    vendor/fuse-emulator/current/fuse/z80/tests/17.in
    vendor/fuse-emulator/current/fuse/z80/tests/17.out
    vendor/fuse-emulator/current/fuse/z80/tests/18.in
    vendor/fuse-emulator/current/fuse/z80/tests/18.out
    vendor/fuse-emulator/current/fuse/z80/tests/19.in
    vendor/fuse-emulator/current/fuse/z80/tests/19.out
    vendor/fuse-emulator/current/fuse/z80/tests/1a.in
    vendor/fuse-emulator/current/fuse/z80/tests/1a.out
    vendor/fuse-emulator/current/fuse/z80/tests/1b.in
    vendor/fuse-emulator/current/fuse/z80/tests/1b.out
    vendor/fuse-emulator/current/fuse/z80/tests/1c.in
    vendor/fuse-emulator/current/fuse/z80/tests/1c.out
    vendor/fuse-emulator/current/fuse/z80/tests/1d.in
    vendor/fuse-emulator/current/fuse/z80/tests/1d.out
    vendor/fuse-emulator/current/fuse/z80/tests/1e.in
    vendor/fuse-emulator/current/fuse/z80/tests/1e.out
    vendor/fuse-emulator/current/fuse/z80/tests/1f.in
    vendor/fuse-emulator/current/fuse/z80/tests/1f.out
    vendor/fuse-emulator/current/fuse/z80/tests/20_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/20_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/20_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/20_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/21.in
    vendor/fuse-emulator/current/fuse/z80/tests/21.out
    vendor/fuse-emulator/current/fuse/z80/tests/22.in
    vendor/fuse-emulator/current/fuse/z80/tests/22.out
    vendor/fuse-emulator/current/fuse/z80/tests/23.in
    vendor/fuse-emulator/current/fuse/z80/tests/23.out
    vendor/fuse-emulator/current/fuse/z80/tests/24.in
    vendor/fuse-emulator/current/fuse/z80/tests/24.out
    vendor/fuse-emulator/current/fuse/z80/tests/25.in
    vendor/fuse-emulator/current/fuse/z80/tests/25.out
    vendor/fuse-emulator/current/fuse/z80/tests/26.in
    vendor/fuse-emulator/current/fuse/z80/tests/26.out
    vendor/fuse-emulator/current/fuse/z80/tests/27.in
    vendor/fuse-emulator/current/fuse/z80/tests/27.out
    vendor/fuse-emulator/current/fuse/z80/tests/27_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/27_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/28_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/28_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/28_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/28_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/29.in
    vendor/fuse-emulator/current/fuse/z80/tests/29.out
    vendor/fuse-emulator/current/fuse/z80/tests/2a.in
    vendor/fuse-emulator/current/fuse/z80/tests/2a.out
    vendor/fuse-emulator/current/fuse/z80/tests/2b.in
    vendor/fuse-emulator/current/fuse/z80/tests/2b.out
    vendor/fuse-emulator/current/fuse/z80/tests/2c.in
    vendor/fuse-emulator/current/fuse/z80/tests/2c.out
    vendor/fuse-emulator/current/fuse/z80/tests/2d.in
    vendor/fuse-emulator/current/fuse/z80/tests/2d.out
    vendor/fuse-emulator/current/fuse/z80/tests/2e.in
    vendor/fuse-emulator/current/fuse/z80/tests/2e.out
    vendor/fuse-emulator/current/fuse/z80/tests/2f.in
    vendor/fuse-emulator/current/fuse/z80/tests/2f.out
    vendor/fuse-emulator/current/fuse/z80/tests/30_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/30_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/30_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/30_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/31.in
    vendor/fuse-emulator/current/fuse/z80/tests/31.out
    vendor/fuse-emulator/current/fuse/z80/tests/32.in
    vendor/fuse-emulator/current/fuse/z80/tests/32.out
    vendor/fuse-emulator/current/fuse/z80/tests/33.in
    vendor/fuse-emulator/current/fuse/z80/tests/33.out
    vendor/fuse-emulator/current/fuse/z80/tests/34.in
    vendor/fuse-emulator/current/fuse/z80/tests/34.out
    vendor/fuse-emulator/current/fuse/z80/tests/35.in
    vendor/fuse-emulator/current/fuse/z80/tests/35.out
    vendor/fuse-emulator/current/fuse/z80/tests/36.in
    vendor/fuse-emulator/current/fuse/z80/tests/36.out
    vendor/fuse-emulator/current/fuse/z80/tests/37.in
    vendor/fuse-emulator/current/fuse/z80/tests/37.out
    vendor/fuse-emulator/current/fuse/z80/tests/37_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/37_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/37_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/37_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/37_3.in
    vendor/fuse-emulator/current/fuse/z80/tests/37_3.out
    vendor/fuse-emulator/current/fuse/z80/tests/38_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/38_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/38_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/38_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/39.in
    vendor/fuse-emulator/current/fuse/z80/tests/39.out
    vendor/fuse-emulator/current/fuse/z80/tests/3a.in
    vendor/fuse-emulator/current/fuse/z80/tests/3a.out
    vendor/fuse-emulator/current/fuse/z80/tests/3b.in
    vendor/fuse-emulator/current/fuse/z80/tests/3b.out
    vendor/fuse-emulator/current/fuse/z80/tests/3c.in
    vendor/fuse-emulator/current/fuse/z80/tests/3c.out
    vendor/fuse-emulator/current/fuse/z80/tests/3d.in
    vendor/fuse-emulator/current/fuse/z80/tests/3d.out
    vendor/fuse-emulator/current/fuse/z80/tests/3e.in
    vendor/fuse-emulator/current/fuse/z80/tests/3e.out
    vendor/fuse-emulator/current/fuse/z80/tests/3f.in
    vendor/fuse-emulator/current/fuse/z80/tests/3f.out
    vendor/fuse-emulator/current/fuse/z80/tests/40.in
    vendor/fuse-emulator/current/fuse/z80/tests/40.out
    vendor/fuse-emulator/current/fuse/z80/tests/41.in
    vendor/fuse-emulator/current/fuse/z80/tests/41.out
    vendor/fuse-emulator/current/fuse/z80/tests/42.in
    vendor/fuse-emulator/current/fuse/z80/tests/42.out
    vendor/fuse-emulator/current/fuse/z80/tests/43.in
    vendor/fuse-emulator/current/fuse/z80/tests/43.out
    vendor/fuse-emulator/current/fuse/z80/tests/44.in
    vendor/fuse-emulator/current/fuse/z80/tests/44.out
    vendor/fuse-emulator/current/fuse/z80/tests/45.in
    vendor/fuse-emulator/current/fuse/z80/tests/45.out
    vendor/fuse-emulator/current/fuse/z80/tests/46.in
    vendor/fuse-emulator/current/fuse/z80/tests/46.out
    vendor/fuse-emulator/current/fuse/z80/tests/47.in
    vendor/fuse-emulator/current/fuse/z80/tests/47.out
    vendor/fuse-emulator/current/fuse/z80/tests/48.in
    vendor/fuse-emulator/current/fuse/z80/tests/48.out
    vendor/fuse-emulator/current/fuse/z80/tests/49.in
    vendor/fuse-emulator/current/fuse/z80/tests/49.out
    vendor/fuse-emulator/current/fuse/z80/tests/4a.in
    vendor/fuse-emulator/current/fuse/z80/tests/4a.out
    vendor/fuse-emulator/current/fuse/z80/tests/4b.in
    vendor/fuse-emulator/current/fuse/z80/tests/4b.out
    vendor/fuse-emulator/current/fuse/z80/tests/4c.in
    vendor/fuse-emulator/current/fuse/z80/tests/4c.out
    vendor/fuse-emulator/current/fuse/z80/tests/4d.in
    vendor/fuse-emulator/current/fuse/z80/tests/4d.out
    vendor/fuse-emulator/current/fuse/z80/tests/4e.in
    vendor/fuse-emulator/current/fuse/z80/tests/4e.out
    vendor/fuse-emulator/current/fuse/z80/tests/4f.in
    vendor/fuse-emulator/current/fuse/z80/tests/4f.out
    vendor/fuse-emulator/current/fuse/z80/tests/50.in
    vendor/fuse-emulator/current/fuse/z80/tests/50.out
    vendor/fuse-emulator/current/fuse/z80/tests/51.in
    vendor/fuse-emulator/current/fuse/z80/tests/51.out
    vendor/fuse-emulator/current/fuse/z80/tests/52.in
    vendor/fuse-emulator/current/fuse/z80/tests/52.out
    vendor/fuse-emulator/current/fuse/z80/tests/53.in
    vendor/fuse-emulator/current/fuse/z80/tests/53.out
    vendor/fuse-emulator/current/fuse/z80/tests/54.in
    vendor/fuse-emulator/current/fuse/z80/tests/54.out
    vendor/fuse-emulator/current/fuse/z80/tests/55.in
    vendor/fuse-emulator/current/fuse/z80/tests/55.out
    vendor/fuse-emulator/current/fuse/z80/tests/56.in
    vendor/fuse-emulator/current/fuse/z80/tests/56.out
    vendor/fuse-emulator/current/fuse/z80/tests/57.in
    vendor/fuse-emulator/current/fuse/z80/tests/57.out
    vendor/fuse-emulator/current/fuse/z80/tests/58.in
    vendor/fuse-emulator/current/fuse/z80/tests/58.out
    vendor/fuse-emulator/current/fuse/z80/tests/59.in
    vendor/fuse-emulator/current/fuse/z80/tests/59.out
    vendor/fuse-emulator/current/fuse/z80/tests/5a.in
    vendor/fuse-emulator/current/fuse/z80/tests/5a.out
    vendor/fuse-emulator/current/fuse/z80/tests/5b.in
    vendor/fuse-emulator/current/fuse/z80/tests/5b.out
    vendor/fuse-emulator/current/fuse/z80/tests/5c.in
    vendor/fuse-emulator/current/fuse/z80/tests/5c.out
    vendor/fuse-emulator/current/fuse/z80/tests/5d.in
    vendor/fuse-emulator/current/fuse/z80/tests/5d.out
    vendor/fuse-emulator/current/fuse/z80/tests/5e.in
    vendor/fuse-emulator/current/fuse/z80/tests/5e.out
    vendor/fuse-emulator/current/fuse/z80/tests/5f.in
    vendor/fuse-emulator/current/fuse/z80/tests/5f.out
    vendor/fuse-emulator/current/fuse/z80/tests/60.in
    vendor/fuse-emulator/current/fuse/z80/tests/60.out
    vendor/fuse-emulator/current/fuse/z80/tests/61.in
    vendor/fuse-emulator/current/fuse/z80/tests/61.out
    vendor/fuse-emulator/current/fuse/z80/tests/62.in
    vendor/fuse-emulator/current/fuse/z80/tests/62.out
    vendor/fuse-emulator/current/fuse/z80/tests/63.in
    vendor/fuse-emulator/current/fuse/z80/tests/63.out
    vendor/fuse-emulator/current/fuse/z80/tests/64.in
    vendor/fuse-emulator/current/fuse/z80/tests/64.out
    vendor/fuse-emulator/current/fuse/z80/tests/65.in
    vendor/fuse-emulator/current/fuse/z80/tests/65.out
    vendor/fuse-emulator/current/fuse/z80/tests/66.in
    vendor/fuse-emulator/current/fuse/z80/tests/66.out
    vendor/fuse-emulator/current/fuse/z80/tests/67.in
    vendor/fuse-emulator/current/fuse/z80/tests/67.out
    vendor/fuse-emulator/current/fuse/z80/tests/68.in
    vendor/fuse-emulator/current/fuse/z80/tests/68.out
    vendor/fuse-emulator/current/fuse/z80/tests/69.in
    vendor/fuse-emulator/current/fuse/z80/tests/69.out
    vendor/fuse-emulator/current/fuse/z80/tests/6a.in
    vendor/fuse-emulator/current/fuse/z80/tests/6a.out
    vendor/fuse-emulator/current/fuse/z80/tests/6b.in
    vendor/fuse-emulator/current/fuse/z80/tests/6b.out
    vendor/fuse-emulator/current/fuse/z80/tests/6c.in
    vendor/fuse-emulator/current/fuse/z80/tests/6c.out
    vendor/fuse-emulator/current/fuse/z80/tests/6d.in
    vendor/fuse-emulator/current/fuse/z80/tests/6d.out
    vendor/fuse-emulator/current/fuse/z80/tests/6e.in
    vendor/fuse-emulator/current/fuse/z80/tests/6e.out
    vendor/fuse-emulator/current/fuse/z80/tests/6f.in
    vendor/fuse-emulator/current/fuse/z80/tests/6f.out
    vendor/fuse-emulator/current/fuse/z80/tests/70.in
    vendor/fuse-emulator/current/fuse/z80/tests/70.out
    vendor/fuse-emulator/current/fuse/z80/tests/71.in
    vendor/fuse-emulator/current/fuse/z80/tests/71.out
    vendor/fuse-emulator/current/fuse/z80/tests/72.in
    vendor/fuse-emulator/current/fuse/z80/tests/72.out
    vendor/fuse-emulator/current/fuse/z80/tests/73.in
    vendor/fuse-emulator/current/fuse/z80/tests/73.out
    vendor/fuse-emulator/current/fuse/z80/tests/74.in
    vendor/fuse-emulator/current/fuse/z80/tests/74.out
    vendor/fuse-emulator/current/fuse/z80/tests/75.in
    vendor/fuse-emulator/current/fuse/z80/tests/75.out
    vendor/fuse-emulator/current/fuse/z80/tests/76.in
    vendor/fuse-emulator/current/fuse/z80/tests/76.out
    vendor/fuse-emulator/current/fuse/z80/tests/77.in
    vendor/fuse-emulator/current/fuse/z80/tests/77.out
    vendor/fuse-emulator/current/fuse/z80/tests/78.in
    vendor/fuse-emulator/current/fuse/z80/tests/78.out
    vendor/fuse-emulator/current/fuse/z80/tests/79.in
    vendor/fuse-emulator/current/fuse/z80/tests/79.out
    vendor/fuse-emulator/current/fuse/z80/tests/7a.in
    vendor/fuse-emulator/current/fuse/z80/tests/7a.out
    vendor/fuse-emulator/current/fuse/z80/tests/7b.in
    vendor/fuse-emulator/current/fuse/z80/tests/7b.out
    vendor/fuse-emulator/current/fuse/z80/tests/7c.in
    vendor/fuse-emulator/current/fuse/z80/tests/7c.out
    vendor/fuse-emulator/current/fuse/z80/tests/7d.in
    vendor/fuse-emulator/current/fuse/z80/tests/7d.out
    vendor/fuse-emulator/current/fuse/z80/tests/7e.in
    vendor/fuse-emulator/current/fuse/z80/tests/7e.out
    vendor/fuse-emulator/current/fuse/z80/tests/7f.in
    vendor/fuse-emulator/current/fuse/z80/tests/7f.out
    vendor/fuse-emulator/current/fuse/z80/tests/80.in
    vendor/fuse-emulator/current/fuse/z80/tests/80.out
    vendor/fuse-emulator/current/fuse/z80/tests/81.in
    vendor/fuse-emulator/current/fuse/z80/tests/81.out
    vendor/fuse-emulator/current/fuse/z80/tests/82.in
    vendor/fuse-emulator/current/fuse/z80/tests/82.out
    vendor/fuse-emulator/current/fuse/z80/tests/83.in
    vendor/fuse-emulator/current/fuse/z80/tests/83.out
    vendor/fuse-emulator/current/fuse/z80/tests/84.in
    vendor/fuse-emulator/current/fuse/z80/tests/84.out
    vendor/fuse-emulator/current/fuse/z80/tests/85.in
    vendor/fuse-emulator/current/fuse/z80/tests/85.out
    vendor/fuse-emulator/current/fuse/z80/tests/86.in
    vendor/fuse-emulator/current/fuse/z80/tests/86.out
    vendor/fuse-emulator/current/fuse/z80/tests/87.in
    vendor/fuse-emulator/current/fuse/z80/tests/87.out
    vendor/fuse-emulator/current/fuse/z80/tests/88.in
    vendor/fuse-emulator/current/fuse/z80/tests/88.out
    vendor/fuse-emulator/current/fuse/z80/tests/89.in
    vendor/fuse-emulator/current/fuse/z80/tests/89.out
    vendor/fuse-emulator/current/fuse/z80/tests/8a.in
    vendor/fuse-emulator/current/fuse/z80/tests/8a.out
    vendor/fuse-emulator/current/fuse/z80/tests/8b.in
    vendor/fuse-emulator/current/fuse/z80/tests/8b.out
    vendor/fuse-emulator/current/fuse/z80/tests/8c.in
    vendor/fuse-emulator/current/fuse/z80/tests/8c.out
    vendor/fuse-emulator/current/fuse/z80/tests/8d.in
    vendor/fuse-emulator/current/fuse/z80/tests/8d.out
    vendor/fuse-emulator/current/fuse/z80/tests/8e.in
    vendor/fuse-emulator/current/fuse/z80/tests/8e.out
    vendor/fuse-emulator/current/fuse/z80/tests/8f.in
    vendor/fuse-emulator/current/fuse/z80/tests/8f.out
    vendor/fuse-emulator/current/fuse/z80/tests/90.in
    vendor/fuse-emulator/current/fuse/z80/tests/90.out
    vendor/fuse-emulator/current/fuse/z80/tests/91.in
    vendor/fuse-emulator/current/fuse/z80/tests/91.out
    vendor/fuse-emulator/current/fuse/z80/tests/92.in
    vendor/fuse-emulator/current/fuse/z80/tests/92.out
    vendor/fuse-emulator/current/fuse/z80/tests/93.in
    vendor/fuse-emulator/current/fuse/z80/tests/93.out
    vendor/fuse-emulator/current/fuse/z80/tests/94.in
    vendor/fuse-emulator/current/fuse/z80/tests/94.out
    vendor/fuse-emulator/current/fuse/z80/tests/95.in
    vendor/fuse-emulator/current/fuse/z80/tests/95.out
    vendor/fuse-emulator/current/fuse/z80/tests/96.in
    vendor/fuse-emulator/current/fuse/z80/tests/96.out
    vendor/fuse-emulator/current/fuse/z80/tests/97.in
    vendor/fuse-emulator/current/fuse/z80/tests/97.out
    vendor/fuse-emulator/current/fuse/z80/tests/98.in
    vendor/fuse-emulator/current/fuse/z80/tests/98.out
    vendor/fuse-emulator/current/fuse/z80/tests/99.in
    vendor/fuse-emulator/current/fuse/z80/tests/99.out
    vendor/fuse-emulator/current/fuse/z80/tests/9a.in
    vendor/fuse-emulator/current/fuse/z80/tests/9a.out
    vendor/fuse-emulator/current/fuse/z80/tests/9b.in
    vendor/fuse-emulator/current/fuse/z80/tests/9b.out
    vendor/fuse-emulator/current/fuse/z80/tests/9c.in
    vendor/fuse-emulator/current/fuse/z80/tests/9c.out
    vendor/fuse-emulator/current/fuse/z80/tests/9d.in
    vendor/fuse-emulator/current/fuse/z80/tests/9d.out
    vendor/fuse-emulator/current/fuse/z80/tests/9e.in
    vendor/fuse-emulator/current/fuse/z80/tests/9e.out
    vendor/fuse-emulator/current/fuse/z80/tests/9f.in
    vendor/fuse-emulator/current/fuse/z80/tests/9f.out
    vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
    vendor/fuse-emulator/current/fuse/z80/tests/README
    vendor/fuse-emulator/current/fuse/z80/tests/a0.in
    vendor/fuse-emulator/current/fuse/z80/tests/a0.out
    vendor/fuse-emulator/current/fuse/z80/tests/a1.in
    vendor/fuse-emulator/current/fuse/z80/tests/a1.out
    vendor/fuse-emulator/current/fuse/z80/tests/a2.in
    vendor/fuse-emulator/current/fuse/z80/tests/a2.out
    vendor/fuse-emulator/current/fuse/z80/tests/a3.in
    vendor/fuse-emulator/current/fuse/z80/tests/a3.out
    vendor/fuse-emulator/current/fuse/z80/tests/a4.in
    vendor/fuse-emulator/current/fuse/z80/tests/a4.out
    vendor/fuse-emulator/current/fuse/z80/tests/a5.in
    vendor/fuse-emulator/current/fuse/z80/tests/a5.out
    vendor/fuse-emulator/current/fuse/z80/tests/a6.in
    vendor/fuse-emulator/current/fuse/z80/tests/a6.out
    vendor/fuse-emulator/current/fuse/z80/tests/a7.in
    vendor/fuse-emulator/current/fuse/z80/tests/a7.out
    vendor/fuse-emulator/current/fuse/z80/tests/a8.in
    vendor/fuse-emulator/current/fuse/z80/tests/a8.out
    vendor/fuse-emulator/current/fuse/z80/tests/a9.in
    vendor/fuse-emulator/current/fuse/z80/tests/a9.out
    vendor/fuse-emulator/current/fuse/z80/tests/aa.in
    vendor/fuse-emulator/current/fuse/z80/tests/aa.out
    vendor/fuse-emulator/current/fuse/z80/tests/ab.in
    vendor/fuse-emulator/current/fuse/z80/tests/ab.out
    vendor/fuse-emulator/current/fuse/z80/tests/ac.in
    vendor/fuse-emulator/current/fuse/z80/tests/ac.out
    vendor/fuse-emulator/current/fuse/z80/tests/ad.in
    vendor/fuse-emulator/current/fuse/z80/tests/ad.out
    vendor/fuse-emulator/current/fuse/z80/tests/ae.in
    vendor/fuse-emulator/current/fuse/z80/tests/ae.out
    vendor/fuse-emulator/current/fuse/z80/tests/af.in
    vendor/fuse-emulator/current/fuse/z80/tests/af.out
    vendor/fuse-emulator/current/fuse/z80/tests/b0.in
    vendor/fuse-emulator/current/fuse/z80/tests/b0.out
    vendor/fuse-emulator/current/fuse/z80/tests/b1.in
    vendor/fuse-emulator/current/fuse/z80/tests/b1.out
    vendor/fuse-emulator/current/fuse/z80/tests/b2.in
    vendor/fuse-emulator/current/fuse/z80/tests/b2.out
    vendor/fuse-emulator/current/fuse/z80/tests/b3.in
    vendor/fuse-emulator/current/fuse/z80/tests/b3.out
    vendor/fuse-emulator/current/fuse/z80/tests/b4.in
    vendor/fuse-emulator/current/fuse/z80/tests/b4.out
    vendor/fuse-emulator/current/fuse/z80/tests/b5.in
    vendor/fuse-emulator/current/fuse/z80/tests/b5.out
    vendor/fuse-emulator/current/fuse/z80/tests/b6.in
    vendor/fuse-emulator/current/fuse/z80/tests/b6.out
    vendor/fuse-emulator/current/fuse/z80/tests/b7.in
    vendor/fuse-emulator/current/fuse/z80/tests/b7.out
    vendor/fuse-emulator/current/fuse/z80/tests/b8.in
    vendor/fuse-emulator/current/fuse/z80/tests/b8.out
    vendor/fuse-emulator/current/fuse/z80/tests/b9.in
    vendor/fuse-emulator/current/fuse/z80/tests/b9.out
    vendor/fuse-emulator/current/fuse/z80/tests/ba.in
    vendor/fuse-emulator/current/fuse/z80/tests/ba.out
    vendor/fuse-emulator/current/fuse/z80/tests/bb.in
    vendor/fuse-emulator/current/fuse/z80/tests/bb.out
    vendor/fuse-emulator/current/fuse/z80/tests/bc.in
    vendor/fuse-emulator/current/fuse/z80/tests/bc.out
    vendor/fuse-emulator/current/fuse/z80/tests/bd.in
    vendor/fuse-emulator/current/fuse/z80/tests/bd.out
    vendor/fuse-emulator/current/fuse/z80/tests/be.in
    vendor/fuse-emulator/current/fuse/z80/tests/be.out
    vendor/fuse-emulator/current/fuse/z80/tests/bf.in
    vendor/fuse-emulator/current/fuse/z80/tests/bf.out
    vendor/fuse-emulator/current/fuse/z80/tests/c0_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/c0_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/c0_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/c0_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/c1.in
    vendor/fuse-emulator/current/fuse/z80/tests/c1.out
    vendor/fuse-emulator/current/fuse/z80/tests/c2_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/c2_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/c2_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/c2_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/c3.in
    vendor/fuse-emulator/current/fuse/z80/tests/c3.out
    vendor/fuse-emulator/current/fuse/z80/tests/c4_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/c4_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/c4_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/c4_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/c5.in
    vendor/fuse-emulator/current/fuse/z80/tests/c5.out
    vendor/fuse-emulator/current/fuse/z80/tests/c6.in
    vendor/fuse-emulator/current/fuse/z80/tests/c6.out
    vendor/fuse-emulator/current/fuse/z80/tests/c7.in
    vendor/fuse-emulator/current/fuse/z80/tests/c7.out
    vendor/fuse-emulator/current/fuse/z80/tests/c8_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/c8_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/c8_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/c8_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/c9.in
    vendor/fuse-emulator/current/fuse/z80/tests/c9.out
    vendor/fuse-emulator/current/fuse/z80/tests/ca_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/ca_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/ca_2.in
    vendor/fuse-emulator/current/fuse/z80/tests/ca_2.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb00.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb00.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb01.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb01.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb02.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb02.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb03.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb03.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb04.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb04.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb05.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb05.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb06.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb06.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb07.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb07.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb08.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb08.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb09.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb09.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb0a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb0a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb0b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb0b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb0c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb0c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb0d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb0d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb0e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb0e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb0f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb0f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb10.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb10.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb11.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb11.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb12.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb12.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb13.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb13.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb14.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb14.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb15.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb15.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb16.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb16.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb17.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb17.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb18.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb18.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb19.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb19.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb1a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb1a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb1b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb1b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb1c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb1c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb1d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb1d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb1e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb1e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb1f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb1f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb20.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb20.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb21.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb21.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb22.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb22.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb23.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb23.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb24.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb24.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb25.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb25.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb26.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb26.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb27.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb27.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb28.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb28.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb29.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb29.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb2a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb2a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb2b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb2b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb2c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb2c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb2d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb2d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb2e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb2e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb2f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb2f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb30.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb30.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb31.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb31.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb32.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb32.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb33.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb33.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb34.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb34.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb35.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb35.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb36.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb36.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb37.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb37.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb38.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb38.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb39.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb39.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb3a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb3a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb3b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb3b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb3c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb3c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb3d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb3d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb3e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb3e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb3f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb3f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb40.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb40.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb41.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb41.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb42.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb42.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb43.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb43.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb44.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb44.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb45.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb45.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb46.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb46.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb47.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb47.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb47_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb47_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb48.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb48.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb49.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb49.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb4a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb4a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb4b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb4b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb4c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb4c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb4d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb4d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb4e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb4e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb4f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb4f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb4f_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb4f_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb50.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb50.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb51.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb51.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb52.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb52.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb53.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb53.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb54.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb54.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb55.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb55.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb56.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb56.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb57.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb57.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb57_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb57_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb58.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb58.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb59.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb59.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb5a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb5a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb5b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb5b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb5c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb5c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb5d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb5d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb5e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb5e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb5f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb5f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb5f_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb5f_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb60.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb60.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb61.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb61.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb62.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb62.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb63.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb63.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb64.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb64.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb65.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb65.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb66.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb66.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb67.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb67.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb67_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb67_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb68.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb68.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb69.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb69.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb6a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb6a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb6b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb6b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb6c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb6c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb6d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb6d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb6e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb6e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb6f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb6f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb6f_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb6f_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb70.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb70.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb71.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb71.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb72.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb72.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb73.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb73.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb74.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb74.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb75.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb75.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb76.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb76.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb77.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb77.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb77_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb77_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb78.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb78.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb79.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb79.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb7a.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb7a.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb7b.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb7b.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb7c.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb7c.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb7d.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb7d.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb7e.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb7e.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb7f.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb7f.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb7f_1.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb7f_1.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb80.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb80.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb81.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb81.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb82.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb82.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb83.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb83.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb84.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb84.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb85.in
    vendor/fuse-emulator/current/fuse/z80/tests/cb85.out
    vendor/fuse-emulator/current/fuse/z80/tests/cb86.in
    vendor/fuse-e...
 
[truncated message content]

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [372] vendor/fuse-emulator/current/

From: <fr...@us...> - 2007-06-10 01:22:06

Revision: 372
          http://svn.sourceforge.net/fuse-for-macosx/?rev=372&view=rev
Author:   fredm
Date:     2007-06-09 18:22:05 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Create directories to load project into.
  
  * vendor/fuse-emulator/current: New directory.

Added Paths:
-----------
    vendor/fuse-emulator/current/


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: [371] vendor/fuse-emulator/

From: <fr...@us...> - 2007-06-10 01:21:19

Revision: 371
          http://svn.sourceforge.net/fuse-for-macosx/?rev=371&view=rev
Author:   fredm
Date:     2007-06-09 18:21:18 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Create new directory for importing the fuse sources from the new svn repo.

Added Paths:
-----------
    vendor/fuse-emulator/


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: [370] trunk

From: <fr...@us...> - 2007-06-10 00:25:56

Revision: 370
          http://svn.sourceforge.net/fuse-for-macosx/?rev=370&view=rev
Author:   fredm
Date:     2007-06-09 17:25:57 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Merge up to r366 from Release-0_8_0 branch.

Modified Paths:
--------------
    trunk/FuseImporter/libspectrum.h
    trunk/bzip2/English.lproj/InfoPlist.strings
    trunk/bzip2/Info.plist
    trunk/bzip2/bzip2/CHANGES
    trunk/bzip2/bzip2/LICENSE
    trunk/bzip2/bzip2/Makefile
    trunk/bzip2/bzip2/Makefile-libbz2_so
    trunk/bzip2/bzip2/README
    trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS
    trunk/bzip2/bzip2/README.XML.STUFF
    trunk/bzip2/bzip2/blocksort.c
    trunk/bzip2/bzip2/bz-fo.xsl
    trunk/bzip2/bzip2/bzdiff
    trunk/bzip2/bzip2/bzgrep
    trunk/bzip2/bzip2/bzip2.1
    trunk/bzip2/bzip2/bzip2.1.preformatted
    trunk/bzip2/bzip2/bzip2.c
    trunk/bzip2/bzip2/bzip2.txt
    trunk/bzip2/bzip2/bzip2recover.c
    trunk/bzip2/bzip2/bzlib.c
    trunk/bzip2/bzip2/bzlib.h
    trunk/bzip2/bzip2/bzlib_private.h
    trunk/bzip2/bzip2/compress.c
    trunk/bzip2/bzip2/crctable.c
    trunk/bzip2/bzip2/decompress.c
    trunk/bzip2/bzip2/dlltest.c
    trunk/bzip2/bzip2/entities.xml
    trunk/bzip2/bzip2/format.pl
    trunk/bzip2/bzip2/huffman.c
    trunk/bzip2/bzip2/manual.html
    trunk/bzip2/bzip2/manual.pdf
    trunk/bzip2/bzip2/manual.ps
    trunk/bzip2/bzip2/manual.xml
    trunk/bzip2/bzip2/mk251.c
    trunk/bzip2/bzip2/randtable.c
    trunk/bzip2/bzip2/spewG.c
    trunk/bzip2/bzip2/unzcrash.c
    trunk/bzip2/bzip2/words0
    trunk/bzip2/bzip2/words2
    trunk/bzip2/bzip2/words3
    trunk/bzip2/bzip2/xmlproc.sh
    trunk/fuse/ChangeLog
    trunk/fuse/README
    trunk/fuse/acinclude.m4
    trunk/fuse/compat/mkstemp.c
    trunk/fuse/configure.in
    trunk/fuse/display.c
    trunk/fuse/fuse.cpp
    trunk/fuse/fusepb/English.lproj/InfoPlist.strings
    trunk/fuse/fusepb/Info-Fuse.plist
    trunk/fuse/fusepb/SDLMain.mm
    trunk/fuse/fusepb/config.h
    trunk/fuse/fusepb/controllers/DebuggerController.m
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/fusepb/controllers/RollbackController.m
    trunk/fuse/fusepb/nibs/Debugger.nib/info.nib
    trunk/fuse/fusepb/nibs/Debugger.nib/keyedobjects.nib
    trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
    trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
    trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
    trunk/fuse/fusepb/resources/Fuse Help/html/divide.html
    trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/hacking/cvs-tags
    trunk/fuse/hacking/ui.txt
    trunk/fuse/if1.c
    trunk/fuse/joystick.c
    trunk/fuse/lib/Makefile.am
    trunk/fuse/machines/pentagon.c
    trunk/fuse/machines/scorpion.c
    trunk/fuse/machines/spec128.c
    trunk/fuse/machines/spec16.c
    trunk/fuse/machines/spec48.c
    trunk/fuse/machines/spec_se.c
    trunk/fuse/man/fuse.1
    trunk/fuse/periph.c
    trunk/fuse/printer.c
    trunk/fuse/rzx.c
    trunk/fuse/rzx.h
    trunk/fuse/screenshot.c
    trunk/fuse/settings.dat
    trunk/fuse/snapshot.c
    trunk/fuse/sound/aosound.c
    trunk/fuse/sound/coreaudiosound.c
    trunk/fuse/sound/sdlsound.c
    trunk/fuse/sound.c
    trunk/fuse/spectrum.c
    trunk/fuse/spectrum.h
    trunk/fuse/ui/fb/fbdisplay.c
    trunk/fuse/ui/ggi/ggidisplay.c
    trunk/fuse/ui/gtk/gtkdisplay.c
    trunk/fuse/ui/gtk/gtkui.c
    trunk/fuse/ui/scaler/scaler.c
    trunk/fuse/ui/scaler/scalers.cpp
    trunk/fuse/ui/sdl/sdldisplay.c
    trunk/fuse/ui/svga/svgadisplay.c
    trunk/fuse/ui/uidisplay.h
    trunk/fuse/ui/win32/win32display.c
    trunk/fuse/ui/xlib/xdisplay.c
    trunk/fuse/ui.c
    trunk/fuse/uidisplay.c
    trunk/fuse/ula.c
    trunk/fuse/ula.h
    trunk/fuse/utils.c
    trunk/fuse/widget/Makefile.am
    trunk/fuse/widget/filesel.c
    trunk/fuse/widget/menu.c
    trunk/fuse/widget/pokefinder.c
    trunk/libspectrum/Info.plist
    trunk/libspectrum/libspectrum/ChangeLog
    trunk/libspectrum/libspectrum/Makefile.am
    trunk/libspectrum/libspectrum/README
    trunk/libspectrum/libspectrum/acinclude.m4
    trunk/libspectrum/libspectrum/configure.in
    trunk/libspectrum/libspectrum/doc/cvs-tags
    trunk/libspectrum/libspectrum/doc/libspectrum.3
    trunk/libspectrum/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/libspectrum/hacking/ChangeLog
    trunk/libspectrum/libspectrum/internals.h
    trunk/libspectrum/libspectrum/libspectrum.h.in
    trunk/libspectrum/libspectrum/rzx.c
    trunk/libspectrum/libspectrum/tap.c
    trunk/libspectrum/libspectrum/tzx_read.c
    trunk/libspectrum/libspectrum/z80.c
    trunk/libspectrum/libspectrum.h
    trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj

Added Paths:
-----------
    trunk/fuse/fusepb/resources/Fuse Help/html/spotlight.html
    trunk/libspectrum/libspectrum/hacking/.cvsignore
    trunk/libspectrum/libspectrum/hacking/Makefile.am

Removed Paths:
-------------
    trunk/bzip2/bzip2/Y2K_INFO

Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/FuseImporter/libspectrum.h	2007-06-10 00:25:57 UTC (rev 370)
@@ -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,v 1.141 2007/02/02 16:35:42 pak21 Exp $
+   $Id: libspectrum.h.in,v 1.141.2.2 2007/05/09 20:08:07 pak21 Exp $
 
    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
@@ -929,13 +929,13 @@
 
 typedef struct libspectrum_tape_generalised_data_symbol libspectrum_tape_generalised_data_symbol;
 
-libspectrum_dword libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
-libspectrum_byte libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
-libspectrum_word libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
-libspectrum_tape_generalised_data_symbol* libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );	
+libspectrum_dword WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_byte WIN32_DLL libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_word WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_tape_generalised_data_symbol* WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );	
 
-libspectrum_tape_generalised_data_symbol_edge_type libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
-libspectrum_word libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
+libspectrum_tape_generalised_data_symbol_edge_type WIN32_DLL libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
+libspectrum_word WIN32_DLL libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
 
 
 /*
@@ -967,7 +967,7 @@
 libspectrum_rzx_start_playback( libspectrum_rzx *rzx, int which,
 				libspectrum_snap **snap );
 libspectrum_error WIN32_DLL
-libspectrum_rzx_playback_frame( libspectrum_rzx *rzx, int *finished );
+libspectrum_rzx_playback_frame( libspectrum_rzx *rzx, int *finished, libspectrum_snap **snap );
 libspectrum_error WIN32_DLL
 libspectrum_rzx_playback( libspectrum_rzx *rzx, libspectrum_byte *byte );
 

Modified: trunk/bzip2/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: trunk/bzip2/Info.plist
===================================================================
--- trunk/bzip2/Info.plist	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/Info.plist	2007-06-10 00:25:57 UTC (rev 370)
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Modified: trunk/bzip2/bzip2/CHANGES
===================================================================
--- trunk/bzip2/bzip2/CHANGES	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/CHANGES	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,5 +1,18 @@
+ ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
 
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
 
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------
+
+
 0.9.0
 ~~~~~
 First version.
@@ -261,7 +274,7 @@
   decompressor to crash, loop or access memory which does not
   belong to it.  If you are using bzip2 or the library to 
   decompress bitstreams from untrusted sources, an upgrade
-  to 1.0.3 is recommended.
+  to 1.0.3 is recommended.  This fixes CAN-2005-1260.
 
 * The documentation has been converted to XML, from which html
   and pdf can be derived.
@@ -273,3 +286,29 @@
 
 * The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
   This has been fixed.
+
+
+1.0.4 (20 Dec 06)
+~~~~~~~~~~~~~~~~~
+Fixes some minor bugs since the last version, 1.0.3.
+
+* Fix file permissions race problem (CAN-2005-0953).
+
+* Avoid possible segfault in BZ2_bzclose.  From Coverity's NetBSD
+  scan.
+
+* 'const'/prototype cleanups in the C code.
+
+* Change default install location to /usr/local, and handle multiple
+  'make install's without error.
+
+* Sanitise file names more carefully in bzgrep.  Fixes CAN-2005-0758
+  to the extent that applies to bzgrep.
+
+* Use 'mktemp' rather than 'tempfile' in bzdiff.
+
+* Tighten up a couple of assertions in blocksort.c following automated
+  analysis.
+
+* Fix minor doc/comment bugs.
+

Modified: trunk/bzip2/bzip2/LICENSE
===================================================================
--- trunk/bzip2/bzip2/LICENSE	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/LICENSE	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,6 +1,8 @@
 
+--------------------------------------------------------------------------
+
 This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2005 Julian R Seward.  All
+documentation, are copyright (C) 1996-2006 Julian R Seward.  All
 rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -35,6 +37,7 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Julian Seward, Cambridge, UK.
-js...@ac...
-bzip2/libbzip2 version 1.0.3 of 15 February 2005
+js...@bz...
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
 
+--------------------------------------------------------------------------

Modified: trunk/bzip2/bzip2/Makefile
===================================================================
--- trunk/bzip2/bzip2/Makefile	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/Makefile	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,3 +1,16 @@
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
 
 SHELL=/bin/sh
 
@@ -8,10 +21,10 @@
 LDFLAGS=
 
 BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
 
 # Where you want it installed when you do 'make install'
-PREFIX=/usr
+PREFIX=/usr/local
 
 
 OBJS= blocksort.o  \
@@ -77,14 +90,14 @@
 	cp -f libbz2.a $(PREFIX)/lib
 	chmod a+r $(PREFIX)/lib/libbz2.a
 	cp -f bzgrep $(PREFIX)/bin/bzgrep
-	ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
-	ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
 	chmod a+x $(PREFIX)/bin/bzgrep
 	cp -f bzmore $(PREFIX)/bin/bzmore
-	ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
 	chmod a+x $(PREFIX)/bin/bzmore
 	cp -f bzdiff $(PREFIX)/bin/bzdiff
-	ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
 	chmod a+x $(PREFIX)/bin/bzdiff
 	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
 	chmod a+r $(PREFIX)/man/man1/bzgrep.1
@@ -124,10 +137,10 @@
 distclean: clean
 	rm -f manual.ps manual.html manual.pdf
 
-DISTNAME=bzip2-1.0.3
+DISTNAME=bzip2-1.0.4
 dist: check manual
 	rm -f $(DISTNAME)
-	ln -sf . $(DISTNAME)
+	ln -s -f . $(DISTNAME)
 	tar cvf $(DISTNAME).tar \
 	   $(DISTNAME)/blocksort.c \
 	   $(DISTNAME)/huffman.c \
@@ -167,7 +180,6 @@
 	   $(DISTNAME)/libbz2.dsp \
 	   $(DISTNAME)/dlltest.dsp \
 	   $(DISTNAME)/makefile.msc \
-	   $(DISTNAME)/Y2K_INFO \
 	   $(DISTNAME)/unzcrash.c \
 	   $(DISTNAME)/spewG.c \
 	   $(DISTNAME)/mk251.c \

Modified: trunk/bzip2/bzip2/Makefile-libbz2_so
===================================================================
--- trunk/bzip2/bzip2/Makefile-libbz2_so	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/Makefile-libbz2_so	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,15 +1,30 @@
 
 # This Makefile builds a shared version of the library, 
-# libbz2.so.1.0.3, with soname libbz2.so.1.0,
+# libbz2.so.1.0.4, with soname libbz2.so.1.0,
 # at least on x86-Linux (RedHat 7.2), 
 # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).  
-# Please see the README file for some 
-# important info about building the library like this.
+# Please see the README file for some important info 
+# about building the library like this.
 
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
+
+
 SHELL=/bin/sh
 CC=gcc
 BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O -g
+CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
 
 OBJS= blocksort.o  \
       huffman.o    \
@@ -20,13 +35,13 @@
       bzlib.o
 
 all: $(OBJS)
-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
+	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
 	rm -f libbz2.so.1.0
-	ln -s libbz2.so.1.0.3 libbz2.so.1.0
+	ln -s libbz2.so.1.0.4 libbz2.so.1.0
 
 clean: 
-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared
+	rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
 
 blocksort.o: blocksort.c
 	$(CC) $(CFLAGS) -c blocksort.c

Modified: trunk/bzip2/bzip2/README
===================================================================
--- trunk/bzip2/bzip2/README	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/README	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,35 +1,50 @@
 
-This is the README for bzip2, a block-sorting file compressor, version
-1.0.3.  This version is fully compatible with the previous public
-releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2.
+This is the README for bzip2/libzip2.
+This version is fully compatible with the previous public releases.
 
-bzip2-1.0.3 is distributed under a BSD-style license.  For details,
-see the file LICENSE.
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
 
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
 Complete documentation is available in Postscript form (manual.ps),
 PDF (manual.pdf) or html (manual.html).  A plain-text version of the
-manual page is available as bzip2.txt.  A statement about Y2K issues
-is now included in the file Y2K_INFO.
+manual page is available as bzip2.txt.
 
 
 HOW TO BUILD -- UNIX
 
-Type `make'.  This builds the library libbz2.a and then the
-programs bzip2 and bzip2recover.  Six self-tests are run.
-If the self-tests complete ok, carry on to installation:
+Type 'make'.  This builds the library libbz2.a and then the programs
+bzip2 and bzip2recover.  Six self-tests are run.  If the self-tests
+complete ok, carry on to installation:
 
-To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type
+To install in /usr/local/bin, /usr/local/lib, /usr/local/man and
+/usr/local/include, type
+
    make install
-To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type 
+
+To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+
    make install PREFIX=/xxx/yyy
+
 If you are (justifiably) paranoid and want to see what 'make install'
 is going to do, you can first do
+
    make -n install                      or
    make -n install PREFIX=/xxx/yyy      respectively.
-The -n instructs make to show the commands it would execute, but
-not actually execute them.
 
+The -n instructs make to show the commands it would execute, but not
+actually execute them.
 
+
 HOW TO BUILD -- UNIX, shared library libbz2.so.
 
 Do 'make -f Makefile-libbz2_so'.  This Makefile seems to work for
@@ -49,23 +64,25 @@
 bzCompress to BZ2_bzCompress, to avoid namespace pollution.
 Unfortunately this means that the libbz2.so created by
 Makefile-libbz2_so will not work with any program which used an older
-version of the library.  Sorry.  I do encourage library clients to
-make the effort to upgrade to use version 1.0, since it is both faster
-and more robust than previous versions.
+version of the library.  I do encourage library clients to make the
+effort to upgrade to use version 1.0, since it is both faster and more
+robust than previous versions.
 
 
 HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
 
 It's difficult for me to support compilation on all these platforms.
 My approach is to collect binaries for these platforms, and put them
-on the master web page (http://sources.redhat.com/bzip2).  Look there.
-However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile
+on the master web site (http://www.bzip.org).  Look there.  However
+(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
 unmodified with MS Visual C.  If you have difficulties building, you
 might want to read README.COMPILATION.PROBLEMS.
 
 At least using MS Visual C++ 6, you can build from the unmodified
 sources by issuing, in a command shell: 
+
    nmake -f makefile.msc
+
 (you may need to first run the MSVC-provided script VCVARS32.BAT
  so as to set up paths to the MSVC tools correctly).
 
@@ -86,18 +103,19 @@
 
 WARNING:
 
-   This program (attempts to) compress data by performing several
-   non-trivial transformations on it.  Unless you are 100% familiar
-   with *all* the algorithms contained herein, and with the
-   consequences of modifying them, you should NOT meddle with the
-   compression or decompression machinery.  Incorrect changes can and
-   very likely *will* lead to disastrous loss of data.
+   This program and library (attempts to) compress data by 
+   performing several non-trivial transformations on it.  
+   Unless you are 100% familiar with *all* the algorithms 
+   contained herein, and with the consequences of modifying them, 
+   you should NOT meddle with the compression or decompression 
+   machinery.  Incorrect changes can and very likely *will* 
+   lead to disastrous loss of data.
 
 
 DISCLAIMER:
 
    I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
-   USE OF THIS PROGRAM, HOWSOEVER CAUSED.
+   USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED.
 
    Every compression of a file implies an assumption that the
    compressed file can be decompressed to reproduce the original.
@@ -110,19 +128,18 @@
    PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
    SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
 
-   That is not to say this program is inherently unreliable.  Indeed,
-   I very much hope the opposite is true.  bzip2 has been carefully
-   constructed and extensively tested.
+   That is not to say this program is inherently unreliable.  
+   Indeed, I very much hope the opposite is true.  bzip2/libbzip2 
+   has been carefully constructed and extensively tested.
 
 
 PATENTS:
 
-   To the best of my knowledge, bzip2 does not use any patented
-   algorithms.  However, I do not have the resources to carry out
-   a patent search.  Therefore I cannot give any guarantee of the
-   above statement.
+   To the best of my knowledge, bzip2/libbzip2 does not use any 
+   patented algorithms.  However, I do not have the resources 
+   to carry out a patent search.  Therefore I cannot give any 
+   guarantee of the above statement.
 
-End of legalities.
 
 
 WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ?
@@ -156,21 +173,23 @@
 
    See the CHANGES file.
 
+WHAT'S NEW IN 1.0.4 ?
 
+   See the CHANGES file.
+
+
 I hope you find bzip2 useful.  Feel free to contact me at
    js...@bz...
 if you have any suggestions or queries.  Many people mailed me with
 comments, suggestions and patches after the releases of bzip-0.15,
-bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
-1.0.2, and the changes in bzip2 are largely a result of this feedback.
-I thank you for your comments.
+bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
+feedback.  I thank you for your comments.
 
-At least for the time being, bzip2's "home" is (or can be reached via)
-http://www.bzip.org
+bzip2's "home" is http://www.bzip.org/
 
 Julian Seward
 js...@bz...
-
 Cambridge, UK.
 
 18     July 1996 (version 0.15)
@@ -183,3 +202,4 @@
  5      May 2000 (bzip2, version 1.0pre8)
 30 December 2001 (bzip2, version 1.0.2pre1)
 15 February 2005 (bzip2, version 1.0.3)
+20 December 2006 (bzip2, version 1.0.4)

Modified: trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS
===================================================================
--- trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,32 +1,47 @@
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
 
-bzip2-1.0.3 should compile without problems on the vast majority of
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+README file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
+bzip2-1.0.4 should compile without problems on the vast majority of
 platforms.  Using the supplied Makefile, I've built and tested it
-myself for x86-linux and x86_64-linux.  With makefile.msc, Visual C++
+myself for x86-linux and amd64-linux.  With makefile.msc, Visual C++
 6.0 and nmake, you can build a native Win32 version too.  Large file
-support seems to work correctly on at least alpha-tru64unix and
-x86-cygwin32 (on Windows 2000).
+support seems to work correctly on at least on amd64-linux.
 
 When I say "large file" I mean a file of size 2,147,483,648 (2^31)
 bytes or above.  Many older OSs can't handle files above this size,
 but many newer ones can.  Large files are pretty huge -- most files
 you'll encounter are not Large Files.
 
-Earlier versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide
-variety of platforms without difficulty, and I hope this version will
-continue in that tradition.  However, in order to support large files,
-I've had to include the define -D_FILE_OFFSET_BITS=64 in the Makefile.
-This can cause problems.
+Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety
+of platforms without difficulty, and I hope this version will continue
+in that tradition.  However, in order to support large files, I've had
+to include the define -D_FILE_OFFSET_BITS=64 in the Makefile.  This
+can cause problems.
 
 The technique of adding -D_FILE_OFFSET_BITS=64 to get large file
 support is, as far as I know, the Recommended Way to get correct large
 file support.  For more details, see the Large File Support
 Specification, published by the Large File Summit, at
+
    http://ftp.sas.com/standards/large.file
 
 As a general comment, if you get compilation errors which you think
 are related to large file support, try removing the above define from
 the Makefile, ie, delete the line
+
    BIGFILES=-D_FILE_OFFSET_BITS=64 
+
 from the Makefile, and do 'make clean ; make'.  This will give you a
 version of bzip2 without large file support, which, for most
 applications, is probably not a problem.  
@@ -37,3 +52,7 @@
 large file support, if you are feeling paranoid.  Be aware though that
 any compilation problems which affect bzip2 will also affect spewG.c,
 alas.
+
+AIX: I have reports that for large file support, you need to specify
+-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64.  I have not tested
+this myself.

Modified: trunk/bzip2/bzip2/README.XML.STUFF
===================================================================
--- trunk/bzip2/bzip2/README.XML.STUFF	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/README.XML.STUFF	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,3 +1,17 @@
+  ----------------------------------------------------------------
+  This file is part of bzip2/libbzip2, a program and library for
+  lossless, block-sorting data compression.
+
+  bzip2/libbzip2 version 1.0.4 of 20 December 2006
+  Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+  Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+  README file.
+
+  This program is released under the terms of the license contained
+  in the file LICENSE.
+  ----------------------------------------------------------------
+
 The script xmlproc.sh takes an xml file as input,
 and processes it to create .pdf, .html or .ps output.
 It uses format.pl, a perl script to format <pre> blocks nicely,
@@ -9,16 +23,16 @@
 
 Usage:
 
-  xmlproc.sh -v manual.xml
+  ./xmlproc.sh -v manual.xml
   Validates an xml file to ensure no dtd-compliance errors
 
-  xmlproc.sh -html manual.xml
+  ./xmlproc.sh -html manual.xml
   Output: manual.html
 
-  xmlproc.sh -pdf manual.xml
+  ./xmlproc.sh -pdf manual.xml
   Output: manual.pdf
 
-  xmlproc.sh -ps manual.xml
+  ./xmlproc.sh -ps manual.xml
   Output: manual.ps
 
 

Deleted: trunk/bzip2/bzip2/Y2K_INFO
===================================================================
--- trunk/bzip2/bzip2/Y2K_INFO	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/Y2K_INFO	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,34 +0,0 @@
-
-Y2K status of bzip2 and libbzip2, versions 0.1, 0.9.0 and 0.9.5
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Informally speaking:
-   bzip2 is a compression program built on top of libbzip2, 
-   a library which does the real work of compression and 
-   decompression.  As far as I am aware, libbzip2 does not have 
-   any date-related code at all.
-
-   bzip2 itself copies dates from source to destination files 
-   when compressing or decompressing, using the 'stat' and 'utime' 
-   UNIX system calls.  It doesn't examine, manipulate or store the 
-   dates in any way.  So as far as I can see, there shouldn't be any 
-   problem with bzip2 providing 'stat' and 'utime' work correctly 
-   on your system.
-
-   On non-unix platforms (those for which BZ_UNIX in bzip2.c is
-   not set to 1), bzip2 doesn't even do the date copying.
-
-   Overall, informally speaking, I don't think bzip2 or libbzip2 
-   have a Y2K problem.
-
-Formally speaking:
-   I am not prepared to offer you any assurance whatsoever 
-   regarding Y2K issues in my software.  You alone assume the 
-   entire risk of using the software.  The disclaimer of liability 
-   in the LICENSE file in the bzip2 source distribution continues 
-   to apply on this issue as with every other issue pertaining 
-   to the software.
-
-Julian Seward
-Cambridge, UK
-25 August 1999

Modified: trunk/bzip2/bzip2/blocksort.c
===================================================================
--- trunk/bzip2/bzip2/blocksort.c	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/blocksort.c	2007-06-10 00:25:57 UTC (rev 370)
@@ -4,68 +4,21 @@
 /*---                                           blocksort.c ---*/
 /*-------------------------------------------------------------*/
 
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+   This file is part of bzip2/libbzip2, a program and library for
+   lossless, block-sorting data compression.
 
-  Copyright (C) 1996-2005 Julian R Seward.  All rights reserved.
+   bzip2/libbzip2 version 1.0.4 of 20 December 2006
+   Copyright (C) 1996-2006 Julian Seward <js...@bz...>
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   README file.
 
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
+   This program is released under the terms of the license contained
+   in the file LICENSE.
+   ------------------------------------------------------------------ */
 
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
 
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  js...@bz...
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
-
-  To get some idea how the block sorting algorithms in this file 
-  work, read my paper 
-     On the Performance of BWT Sorting Algorithms
-  in Proceedings of the IEEE Data Compression Conference 2000,
-  Snowbird, Utah, USA, 27-30 March 2000.  The main sort in this
-  file implements the algorithm called  cache  in the paper.
---*/
-
-
 #include "bzlib_private.h"
 
 /*---------------------------------------------*/
@@ -155,7 +108,7 @@
 
    while (sp > 0) {
 
-      AssertH ( sp < FALLBACK_QSORT_STACK_SIZE, 1004 );
+      AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 );
 
       fpop ( lo, hi );
       if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
@@ -690,7 +643,7 @@
 
    while (sp > 0) {
 
-      AssertH ( sp < MAIN_QSORT_STACK_SIZE, 1001 );
+      AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 );
 
       mpop ( lo, hi, d );
       if (hi - lo < MAIN_QSORT_SMALL_THRESH || 

Modified: trunk/bzip2/bzip2/bz-fo.xsl
===================================================================
--- trunk/bzip2/bzip2/bz-fo.xsl	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bz-fo.xsl	2007-06-10 00:25:57 UTC (rev 370)
@@ -254,4 +254,23 @@
 </xsl:template>
 
 
+<!-- Bug-fix for Suse 10 PassiveTex version -->
+<!-- Precompute attribute values 'cos PassiveTex is too stupid: -->
+<xsl:attribute-set name="component.title.properties">
+  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+  <xsl:attribute name="space-before.optimum">
+    <xsl:value-of select="concat($body.font.master, 'pt')"/>
+  </xsl:attribute>
+  <xsl:attribute name="space-before.minimum">
+    <xsl:value-of select="$body.font.master * 0.8"/>
+    <xsl:text>pt</xsl:text>
+  </xsl:attribute>
+  <xsl:attribute name="space-before.maximum">
+    <xsl:value-of select="$body.font.master * 1.2"/>
+    <xsl:text>pt</xsl:text>
+  </xsl:attribute>
+  <xsl:attribute name="hyphenate">false</xsl:attribute>
+</xsl:attribute-set>
+
+
 </xsl:stylesheet>

Modified: trunk/bzip2/bzip2/bzdiff
===================================================================
--- trunk/bzip2/bzip2/bzdiff	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bzdiff	2007-06-10 00:25:57 UTC (rev 370)
@@ -12,7 +12,7 @@
 # necessary) and fed to cmp or diff.  The exit status from cmp
 # or diff is preserved.
 
-PATH="/usr/bin:$PATH"; export PATH
+PATH="/usr/bin:/bin:$PATH"; export PATH
 prog=`echo $0 | sed 's|.*/||'`
 case "$prog" in
   *cmp) comp=${CMP-cmp}   ;;
@@ -37,7 +37,7 @@
 	echo "Usage: $prog [${comp}_options] file [file]"
 	exit 1
 fi
-tmp=`tempfile -d /tmp -p bz` || {
+tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
       echo 'cannot create a temporary file' >&2
       exit 1
 }

Modified: trunk/bzip2/bzip2/bzgrep
===================================================================
--- trunk/bzip2/bzip2/bzgrep	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bzgrep	2007-06-10 00:25:57 UTC (rev 370)
@@ -63,7 +63,11 @@
     bzip2 -cdfq "$i" | $grep $opt "$pat"
     r=$?
   else
-    bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${i}:|"
+    j=${i//\\/\\\\}
+    j=${j//|/\\|}
+    j=${j//&/\\&}
+    j=`printf "%s" "$j" | tr '\n' ' '`
+    bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
     r=$?
   fi
   test "$r" -ne 0 && res="$r"

Modified: trunk/bzip2/bzip2/bzip2.1
===================================================================
--- trunk/bzip2/bzip2/bzip2.1	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bzip2.1	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,7 +1,7 @@
 .PU
 .TH bzip2 1
 .SH NAME
-bzip2, bunzip2 \- a block-sorting file compressor, v1.0.3
+bzip2, bunzip2 \- a block-sorting file compressor, v1.0.4
 .br
 bzcat \- decompresses files to stdout
 .br
@@ -405,11 +405,11 @@
 tries hard to detect I/O errors and exit cleanly, but the details of
 what the problem is sometimes seem rather misleading.
 
-This manual page pertains to version 1.0.3 of
+This manual page pertains to version 1.0.4 of
 .I bzip2.  
 Compressed data created by this version is entirely forwards and
 backwards compatible with the previous public releases, versions
-0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2, but with the following
+0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, but with the following
 exception: 0.9.0 and above can correctly decompress multiple
 concatenated compressed files.  0.1pl2 cannot do this; it will stop
 after decompressing just the first file in the stream.

Modified: trunk/bzip2/bzip2/bzip2.1.preformatted
===================================================================
--- trunk/bzip2/bzip2/bzip2.1.preformatted	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bzip2.1.preformatted	2007-06-10 00:25:57 UTC (rev 370)
@@ -3,7 +3,7 @@
 
 
 NNAAMMEE
-       bzip2, bunzip2 − a block‐sorting file compressor, v1.0.3
+       bzip2, bunzip2 − a block‐sorting file compressor, v1.0.4
        bzcat − decompresses files to stdout
        bzip2recover − recovers data from damaged bzip2 files
 
@@ -348,14 +348,14 @@
        but  the  details  of  what  the problem is sometimes seem
        rather misleading.
 
-       This manual page pertains to version 1.0.3 of _b_z_i_p_2_.  Com
+       This manual page pertains to version 1.0.4 of _b_z_i_p_2_.  Com
        pressed  data created by this version is entirely forwards
        and  backwards  compatible  with   the   previous   public
-       releases,  versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
-       1.0.2, but with the following exception: 0.9.0  and  above
-       can  correctly decompress multiple concatenated compressed
-       files.  0.1pl2 cannot do this; it will stop  after  decom
-       pressing just the first file in the stream.
+       releases,  versions  0.1pl2,  0.9.0,  0.9.5, 1.0.0, 1.0.1, 
+       1.0.2 and 1.0.3, but with the  following  exception: 0.9.0
+       and above can  correctly decompress  multiple concatenated
+       compressed files.  0.1pl2  cannot do this;  it  will  stop 
+       after  decompressing just the first file in the stream.
 
        _b_z_i_p_2_r_e_c_o_v_e_r  versions prior to 1.0.2 used 32‐bit integers
        to represent bit positions in compressed  files,  so  they

Modified: trunk/bzip2/bzip2/bzip2.c
===================================================================
--- trunk/bzip2/bzip2/bzip2.c	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bzip2.c	2007-06-10 00:25:57 UTC (rev 370)
@@ -3,118 +3,26 @@
 /*--- A block-sorting, lossless compressor        bzip2.c ---*/
 /*-----------------------------------------------------------*/
 
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
+/* ------------------------------------------------------------------
+   This file is part of bzip2/libbzip2, a program and library for
+   lossless, block-sorting data compression.
 
-  Copyright (C) 1996-2005 Julian R Seward.  All rights reserved.
+   bzip2/libbzip2 version 1.0.4 of 20 December 2006
+   Copyright (C) 1996-2006 Julian Seward <js...@bz...>
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   README file.
 
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
+   This program is released under the terms of the license contained
+   in the file LICENSE.
+   ------------------------------------------------------------------ */
 
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
 
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  js...@bz...
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-/*----------------------------------------------------*/
-/*--- IMPORTANT                                    ---*/
-/*----------------------------------------------------*/
-
-/*--
-   WARNING:
-      This program and library (attempts to) compress data by 
-      performing several non-trivial transformations on it.  
-      Unless you are 100% familiar with *all* the algorithms 
-      contained herein, and with the consequences of modifying them, 
-      you should NOT meddle with the compression or decompression 
-      machinery.  Incorrect changes can and very likely *will* 
-      lead to disasterous loss of data.
-
-   DISCLAIMER:
-      I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
-      USE OF THIS PROGRAM, HOWSOEVER CAUSED.
-
-      Every compression of a file implies an assumption that the
-      compressed file can be decompressed to reproduce the original.
-      Great efforts in design, coding and testing have been made to
-      ensure that this program works correctly.  However, the
-      complexity of the algorithms, and, in particular, the presence
-      of various special cases in the code which occur with very low
-      but non-zero probability make it impossible to rule out the
-      possibility of bugs remaining in the program.  DO NOT COMPRESS
-      ANY DATA WITH THIS PROGRAM AND/OR LIBRARY UNLESS YOU ARE PREPARED 
-      TO ACCEPT THE POSSIBILITY, HOWEVER SMALL, THAT THE DATA WILL 
-      NOT BE RECOVERABLE.
-
-      That is not to say this program is inherently unreliable.
-      Indeed, I very much hope the opposite is true.  bzip2/libbzip2
-      has been carefully constructed and extensively tested.
-
-   PATENTS:
-      To the best of my knowledge, bzip2/libbzip2 does not use any 
-      patented algorithms.  However, I do not have the resources 
-      available to carry out a full patent search.  Therefore I cannot 
-      give any guarantee of the above statement.
---*/
-
-
-
-/*----------------------------------------------------*/
-/*--- and now for something much more pleasant :-) ---*/
-/*----------------------------------------------------*/
-
-/*---------------------------------------------*/
-/*--
-  Place a 1 beside your platform, and 0 elsewhere.
---*/
-
-/*--
-  Generic 32-bit Unix.
-  Also works on 64-bit Unix boxes.
-  This is the default.
---*/
+/* Place a 1 beside your platform, and 0 elsewhere.
+   Generic 32-bit Unix.
+   Also works on 64-bit Unix boxes.
+   This is the default.
+*/
 #define BZ_UNIX      1
 
 /*--
@@ -302,16 +210,17 @@
 FILE    *outputHandleJustInCase;
 Int32   workFactor;
 
-static void    panic                 ( Char* )   NORETURN;
-static void    ioError               ( void )    NORETURN;
-static void    outOfMemory           ( void )    NORETURN;
-static void    configError           ( void )    NORETURN;
-static void    crcError              ( void )    NORETURN;
-static void    cleanUpAndFail        ( Int32 )   NORETURN;
-static void    compressedStreamEOF   ( void )    NORETURN;
+static void    panic                 ( const Char* ) NORETURN;
+static void    ioError               ( void )        NORETURN;
+static void    outOfMemory           ( void )        NORETURN;
+static void    configError           ( void )        NORETURN;
+static void    crcError              ( void )        NORETURN;
+static void    cleanUpAndFail        ( Int32 )       NORETURN;
+static void    compressedStreamEOF   ( void )        NORETURN;
 
 static void    copyFileName ( Char*, Char* );
 static void*   myMalloc     ( Int32 );
+static void    applySavedFileAttrToOutputFile ( IntNative fd );
 
 
 
@@ -457,6 +366,9 @@
    ret = fflush ( zStream );
    if (ret == EOF) goto errhandler_io;
    if (zStream != stdout) {
+      Int32 fd = fileno ( zStream );
+      if (fd < 0) goto errhandler_io;
+      applySavedFileAttrToOutputFile ( fd );
       ret = fclose ( zStream );
       outputHandleJustInCase = NULL;
       if (ret == EOF) goto errhandler_io;
@@ -569,6 +481,11 @@
 
    closeok:
    if (ferror(zStream)) goto errhandler_io;
+   if (stream != stdout) {
+      Int32 fd = fileno ( stream );
+      if (fd < 0) goto errhandler_io;
+      applySavedFileAttrToOutputFile ( fd );
+   }
    ret = fclose ( zStream );
    if (ret == EOF) goto errhandler_io;
 
@@ -826,7 +743,7 @@
 
 /*---------------------------------------------*/
 static 
-void panic ( Char* s )
+void panic ( const Char* s )
 {
    fprintf ( stderr,
              "\n%s: PANIC -- internal consistency error:\n"
@@ -1039,6 +956,7 @@
    For non-Unix platforms, if we are not worrying about
    security issues, simple this simply behaves like fopen.
 */
+static
 FILE* fopen_output_safely ( Char* name, const char* mode )
 {
 #  if BZ_UNIX
@@ -1129,7 +1047,7 @@
 
 
 static 
-void applySavedMetaInfoToOutputFile ( Char *dstName )
+void applySavedTimeInfoToOutputFile ( Char *dstName )
 {
 #  if BZ_UNIX
    IntNative      retVal;
@@ -1138,13 +1056,21 @@
    uTimBuf.actime = fileMetaInfo.st_atime;
    uTimBuf.modtime = fileMetaInfo.st_mtime;
 
-   retVal = chmod ( dstName, fileMetaInfo.st_mode );
+   retVal = utime ( dstName, &uTimBuf );
    ERROR_IF_NOT_ZERO ( retVal );
+#  endif
+}
 
-   retVal = utime ( dstName, &uTimBuf );
+static 
+void applySavedFileAttrToOutputFile ( IntNative fd )
+{
+#  if BZ_UNIX
+   IntNative retVal;
+
+   retVal = fchmod ( fd, fileMetaInfo.st_mode );
    ERROR_IF_NOT_ZERO ( retVal );
 
-   retVal = chown ( dstName, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
+   (void) fchown ( fd, fileMetaInfo.st_uid, fileMetaInfo.st_gid );
    /* chown() will in many cases return with EPERM, which can
       be safely ignored.
    */
@@ -1175,13 +1101,13 @@
 /*---------------------------------------------*/
 #define BZ_N_SUFFIX_PAIRS 4
 
-Char* zSuffix[BZ_N_SUFFIX_PAIRS] 
+const Char* zSuffix[BZ_N_SUFFIX_PAIRS] 
    = { ".bz2", ".bz", ".tbz2", ".tbz" };
-Char* unzSuffix[BZ_N_SUFFIX_PAIRS] 
+const Char* unzSuffix[BZ_N_SUFFIX_PAIRS] 
    = { "", "", ".tar", ".tar" };
 
 static 
-Bool hasSuffix ( Char* s, Char* suffix )
+Bool hasSuffix ( Char* s, const Char* suffix )
 {
    Int32 ns = strlen(s);
    Int32 nx = strlen(suffix);
@@ -1192,7 +1118,8 @@
 
 static 
 Bool mapSuffix ( Char* name, 
-                 Char* oldSuffix, Char* newSuffix )
+                 const Char* oldSuffix, 
+                 const Char* newSuffix )
 {
    if (!hasSuffix(name,oldSuffix)) return False;
    name[strlen(name)-strlen(oldSuffix)] = 0;
@@ -1217,8 +1144,8 @@
 
    switch (srcMode) {
       case SM_I2O: 
-         copyFileName ( inName, "(stdin)" );
-         copyFileName ( outName, "(stdout)" ); 
+         copyFileName ( inName, (Char*)"(stdin)" );
+         copyFileName ( outName, (Char*)"(stdout)" ); 
          break;
       case SM_F2F: 
          copyFileName ( inName, name );
@@ -1227,7 +1154,7 @@
          break;
       case SM_F2O: 
          copyFileName ( inName, name );
-         copyFileName ( outName, "(stdout)" ); 
+         copyFileName ( outName, (Char*)"(stdout)" ); 
          break;
    }
 
@@ -1370,7 +1297,7 @@
 
    /*--- If there was an I/O error, we won't get here. ---*/
    if ( srcMode == SM_F2F ) {
-      applySavedMetaInfoToOutputFile ( outName );
+      applySavedTimeInfoToOutputFile ( outName );
       deleteOutputOnInterrupt = False;
       if ( !keepInputFiles ) {
          IntNative retVal = remove ( inName );
@@ -1401,8 +1328,8 @@
    cantGuess = False;
    switch (srcMode) {
       case SM_I2O: 
-         copyFileName ( inName, "(stdin)" );
-         copyFileName ( outName, "(stdout)" ); 
+         copyFileName ( inName, (Char*)"(stdin)" );
+         copyFileName ( outName, (Char*)"(stdout)" ); 
          break;
       case SM_F2F: 
          copyFileName ( inName, name );
@@ -1415,7 +1342,7 @@
          break;
       case SM_F2O: 
          copyFileName ( inName, name );
-         copyFileName ( outName, "(stdout)" ); 
+         copyFileName ( outName, (Char*)"(stdout)" ); 
          break;
    }
 
@@ -1548,7 +1475,7 @@
    /*--- If there was an I/O error, we won't get here. ---*/
    if ( magicNumberOK ) {
       if ( srcMode == SM_F2F ) {
-         applySavedMetaInfoToOutputFile ( outName );
+         applySavedTimeInfoToOutputFile ( outName );
          deleteOutputOnInterrupt = False;
          if ( !keepInputFiles ) {
             IntNative retVal = remove ( inName );
@@ -1593,9 +1520,9 @@
    if (name == NULL && srcMode != SM_I2O)
       panic ( "testf: bad modes\n" );
 
-   copyFileName ( outName, "(none)" );
+   copyFileName ( outName, (Char*)"(none)" );
    switch (srcMode) {
-      case SM_I2O: copyFileName ( inName, "(stdin)" ); break;
+      case SM_I2O: copyFileName ( inName, (Char*)"(stdin)" ); break;
       case SM_F2F: copyFileName ( inName, name ); break;
       case SM_F2O: copyFileName ( inName, name ); break;
    }
@@ -1678,11 +1605,11 @@
     "bzip2, a block-sorting file compressor.  "
     "Version %s.\n"
     "   \n"
-    "   Copyright (C) 1996-2005 by Julian Seward.\n"
+    "   Copyright (C) 1996-2006 by Julian Seward.\n"
     "   \n"
     "   This program is free software; you can redistribute it and/or modify\n"
     "   it under the terms set out in the LICENSE file, which is included\n"
-    "   in the bzip2-1.0 source distribution.\n"
+    "   in the bzip2-1.0.4 source distribution.\n"
     "   \n"
     "   This program is distributed in the hope that it will be useful,\n"
     "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1885,8 +1812,8 @@
 #  endif
 #  endif
 
-   copyFileName ( inName,  "(none)" );
-   copyFileName ( outName, "(none)" );
+   copyFileName ( inName,  (Char*)"(none)" );
+   copyFileName ( outName, (Char*)"(none)" );
 
    copyFileName ( progNameReally, argv[0] );
    progName = &progNameReally[0];
@@ -1898,8 +1825,8 @@
         expand filename wildcards in arg list.
    --*/
    argList = NULL;
-   addFlagsFromEnvVar ( &argList,  "BZIP2" );
-   addFlagsFromEnvVar ( &argList,  "BZIP" );
+   addFlagsFromEnvVar ( &argList,  (Char*)"BZIP2" );
+   addFlagsFromEnvVar ( &argList,  (Char*)"BZIP" );
    for (i = 1; i <= argc-1; i++)
       APPEND_FILESPEC(argList, argv[i]);
 

Modified: trunk/bzip2/bzip2/bzip2.txt
===================================================================
--- trunk/bzip2/bzip2/bzip2.txt	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bzip2.txt	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,6 +1,6 @@
 
 NAME
-       bzip2, bunzip2 - a block-sorting file compressor, v1.0.3
+       bzip2, bunzip2 - a block-sorting file compressor, v1.0.4
        bzcat - decompresses files to stdout
        bzip2recover - recovers data from damaged bzip2 files
 
@@ -345,14 +345,14 @@
        but  the  details  of  what  the problem is sometimes seem
        rather misleading.
 
-       This manual page pertains to version 1.0.3 of bzip2.  Com-
+       This manual page pertains to version 1.0.4 of bzip2.  Com-
        pressed  data created by this version is entirely forwards
        and  backwards  compatible  with   the   previous   public
-       releases,  versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
-       1.0.2, but with the following exception: 0.9.0  and  above
-       can  correctly decompress multiple concatenated compressed
-       files.  0.1pl2 cannot do this; it will stop  after  decom-
-       pressing just the first file in the stream.
+       releases,  versions  0.1pl2,  0.9.0,  0.9.5, 1.0.0, 1.0.1,
+       1.0.2 and 1.0.3, but with the  following  exception: 0.9.0
+       and above can  correctly decompress  multiple concatenated
+       compressed files.  0.1pl2  cannot do this;  it  will  stop
+       after  decompressing just the first file in the stream.
 
        bzip2recover  versions prior to 1.0.2 used 32-bit integers
        to represent bit positions in compressed  files,  so  they

Modified: trunk/bzip2/bzip2/bzip2recover.c
===================================================================
--- trunk/bzip2/bzip2/bzip2recover.c	2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/bzip2recover.c	2007-06-10 00:25:57 UTC (rev 370)
@@ -1,57 +1,25 @@
-
 /*-----------------------------------------------------------*/
 /*--- Block recoverer program for bzip2                   ---*/
 /*---                                      bzip2recover.c ---*/
 /*-----------------------------------------------------------*/
 
-/*--
-  This program is bzip2recover, a program to attempt data 
-  salvage from damaged files created by the accompanying
-  bzip2-1.0.3 program.
+/* ------------------------------------------------------------------
+   This file is part of bzip2/libbzip2, a program and library for
+   lossless, block-sorting data compression.
 
-  Copyright (C) 1996-2005 Julian R Seward.  All rights reserved.
+   bzip2/libbzip2 version 1.0.4 of 20 December 2006
+   Copyright (C) 1996-2006 Julian Seward <js...@bz...>
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   README file.
 
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
+   This program is released under the terms of the license contained
+   in the file LICENSE.
+   ------------------------------------------------------------------ */
 
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
+/* This program is a complete hack and should be rewritten properly.
+	 It isn't very complicated. */
 
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  js...@bz...
-  bzip2/libbzip2 version 1.0.3 of 15 February 2005
---*/
-
-/*--
-  This program is a complete hack and should be rewritten
-  properly.  It isn't very complicated.
---*/
-
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -114,7 +82,7 @@
 /*---------------------------------------------------*/
 
 /*---------------------------------------------*/
-void readError ( void )
+static void readError ( void )
 {
    fprintf ( stderr,
              "%s: I/O error reading `%s', possible reason follows.\n",
@@ -127,7 +95,7 @@
 
 
 /*---------------------------------------------*/
-void writeError ( void )
+static void writeError ( void )
 {
    fprintf ( stderr,
              "%s: I/O error reading `%s', possible reason follows.\n",
@@ -140,7 +108,7 @@
 
 
 /*---------------------------------------------*/
-void mallocFail ( Int32 n )
+static void mallocFail ( Int32 n )
 {
    fprintf ( stderr,
              "%s: malloc failed on request for %d bytes.\n",
@@ -152,7 +120,7 @@
 
 
 /*---------------------------------------------*/
-void tooManyBlocks ( Int32 max_handled_blocks )
+static void tooManyBlocks ( Int32 max_handled_blocks )
 {
    fprintf ( stderr,
              "%s: `%s' appears to contain more than %d blocks\n",
@@ -183,7 +151,7 @@
 
 
 /*---------------------------------------------*/
-BitStream* bsOpenReadStream ( FILE* stream )
+static BitStream* bsOpenReadStream ( FILE* stream )
 {
    BitStream *bs = malloc ( sizeof(BitStream) );
    if (bs == NULL) mallocFail ( sizeof(BitStream) );
@@ -196,7 +164,7 @@
 
 
 /*---------------------------------------------*/
-BitStream* bsOpenWriteStream ( FILE* stream )
+static BitStream* bsOpenWriteStream ( FILE* stream )
 {
    BitStream *bs = malloc ( sizeof(BitStream) );
    if (bs == NULL) mallocFail ( sizeof(BitStream) );
@@ -209,7 +177,7 @@
 
 
 /*---------------------------------------------*/
-void bsPutBit ( BitStream* bs, Int32 bit )
+static void bsPutBit ( BitStream* bs, Int32 bit )
 {
    if (bs->buffLive == 8) {
       Int32 retVal = putc ( (UChar) bs->buffer, bs->handle );
@@ -228,7 +196,7 @@
 /*--
    Returns 0 or 1, or 2 to indicate EOF.
 --*/
-Int32 bsGetBit ( BitStream* bs )
+static Int32 bsGetBit ( BitStream* bs )
 {
    if (bs->buffLive > 0) {
       bs->buffLive --;
@@ -247,7 +215,7 @@
 
 
 /*---------------------------------------------*/
-void bsClose ( BitStream* bs )
+static void bsClose ( BitStream* bs )
 {
    Int32 retVal;
 
@@ -271,7 +239,7 @@
 
 
 /*---------------------------------------------*/
-void bsPutUChar ( BitStream* bs, UChar c )
+static void bsPutUChar ( BitStream* bs, UChar c )
 {
    Int32 i;
    for (i = 7; i >= 0; i--)
@@ -280,7 +248,7 @@
 
 
 /*---------------------------------------------*/
-void bsPutUInt32 ( BitStream* bs, UInt32 c )
+static void bsPutUInt32 ( BitStream* bs, UInt32 c )
 {
    Int32 i;
 
@@ -290,7 +258,7 @@
 
 
 /*---------------------------------------------*/
-Bool endsInBz2 ( Char* name )
+static Bool endsInBz2 ( Char* name )
 {
    Int32 n = strlen ( name );
    if (n <= 4) return False;
@@ -345,7 +313,7 @@
    inFileName[0] = outFileName[0] = 0;
 
    fprintf ( stderr, 
-             "bzip2recover 1.0.3: extracts blocks from damaged .bz2 files.\n" );
+             "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" );
 
    if (argc != 2) {
       fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",

Modified: trunk/bzip2/bzip2/bzlib.c
==============================...
 
[truncated message content]

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

From: <fr...@us...> - 2007-05-15 12:46:37

Revision: 369
          http://svn.sourceforge.net/fuse-for-macosx/?rev=369&view=rev
Author:   fredm
Date:     2007-05-15 05:45:49 -0700 (Tue, 15 May 2007)

Log Message:
-----------
Add a second screen texture to ensure there is no reading of the old
texture while it is being updated, also add a buffer for the spectrum
screen seperate from the one being updated in the emulator thread to
prevent any synchronisation problems between the emulator and GUI
threads.

Modified Paths:
--------------
    branches/fusegl/fuse/TODO
    branches/fusegl/fuse/fusepb/English.lproj/InfoPlist.strings
    branches/fusegl/fuse/fusepb/FuseMenus.h
    branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
    branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
    branches/fusegl/fuse/ui/cocoa/cocoadisplay.h
    branches/fusegl/fuse/ui/cocoa/cocoadisplay.m

Modified: branches/fusegl/fuse/TODO
===================================================================
--- branches/fusegl/fuse/TODO	2007-05-12 01:33:29 UTC (rev 368)
+++ branches/fusegl/fuse/TODO	2007-05-15 12:45:49 UTC (rev 369)
@@ -43,5 +43,8 @@
 * Shouldn't be able to load Interface II carts in Pentagon
 * Add volume option to standard fuse + a sound API method to set volume (or a
   parameter to sound_lowlevel_init)
+* Save ROM into szx when using a non-default one
+* Randomise FRAMES sys var after autoload snapshot loaded in order to try and
+  get less deterministic program behaviour after load is complete
 
 $Id: TODO,v 1.4 2004/03/02 13:38:08 pak21 Exp $

Modified: branches/fusegl/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: branches/fusegl/fuse/fusepb/FuseMenus.h
===================================================================
--- branches/fusegl/fuse/fusepb/FuseMenus.h	2007-05-12 01:33:29 UTC (rev 368)
+++ branches/fusegl/fuse/fusepb/FuseMenus.h	2007-05-15 12:45:49 UTC (rev 369)
@@ -28,8 +28,6 @@
 #ifndef FUSEMENUS_H
 #define FUSEMENUS_H
 
-#include "ui/cocoa/cocoadisplay.h"
-
 void SetEmulationHz(float);
 
 #endif                       /* #ifndef FUSEMENUS_H */

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-05-12 01:33:29 UTC (rev 368)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-05-15 12:45:49 UTC (rev 369)
@@ -36,13 +36,16 @@
 #include "ui/cocoa/cocoadisplay.h"
 #include "ui/ui.h"
 
+#define MAX_SCREEN_BUFFERS 2
+
 @class Emulator;
 
 @interface DisplayOpenGLView : NSOpenGLView
 {
   /* Need texture size and dimensions and two backing textures */
-  Cocoa_Texture screenTex; /* Screen texture */
-  GLuint screenTexId;
+  Cocoa_Texture screenTex[MAX_SCREEN_BUFFERS]; /* Screen texture */
+  GLuint screenTexId[MAX_SCREEN_BUFFERS];
+  int currentScreenTex;
 
   Cocoa_Texture redCassetteTex;
   GLuint redCassette;

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-05-12 01:33:29 UTC (rev 368)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-05-15 12:45:49 UTC (rev 369)
@@ -137,8 +137,8 @@
     break;
   case 0:
   default: /* Actual size */
-    size.width = screenTex.image_width;
-    size.height = screenTex.image_height;
+    size.width = screenTex[0].image_width;
+    size.height = screenTex[0].image_height;
   }
 
   [[self window] setContentSize:size];
@@ -224,6 +224,8 @@
   [NSThread detachNewThreadSelector:@selector(connectWithPorts:)
             toTarget:real_emulator withObject:portArray]; 
 
+  currentScreenTex = 0;
+
   return self;
 }
 
@@ -374,36 +376,40 @@
 {
   if( NO == screenTexInitialised ) return;
 
+  currentScreenTex = !currentScreenTex;
+
   /* Need to draw texture to screen here */
   /* FIXME: lock screen - direct lock probably faster [emulation lockScreen]; */
+  [buffered_screen_lock lock];
   /* should draw directly from emulation screen instead of screenTex, switch between
      buffers there */
-  memcpy( screenTex.pixels, screen->pixels, screenTex.pitch * screenTex.full_height );
+  memcpy( screenTex[currentScreenTex].pixels, buffered_screen.pixels, screenTex[currentScreenTex].pitch * screenTex[currentScreenTex].full_height );
   /* FIXME: unlock screen - direct lock probably faster [emulation unlockScreen]; */
+  [buffered_screen_lock unlock];
 
   [[self openGLContext] makeCurrentContext];
 
   glClear( GL_COLOR_BUFFER_BIT );
 
   /* Bind, update and draw new image */
-  glBindTexture( GL_TEXTURE_RECTANGLE_EXT, screenTexId );
+  glBindTexture( GL_TEXTURE_RECTANGLE_EXT, screenTexId[currentScreenTex] );
 
-  glTexSubImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, 0, 0, screenTex.full_width,
-                   screenTex.full_height, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV,
-                   screenTex.pixels );
+  glTexSubImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, 0, 0, screenTex[currentScreenTex].full_width,
+                   screenTex[currentScreenTex].full_height, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV,
+                   screenTex[currentScreenTex].pixels );
 
   glBegin( GL_QUADS );
 
-    glTexCoord2f( (float)screenTex.image_width, (float)(screenTex.image_xoffset) );
+    glTexCoord2f( (float)screenTex[currentScreenTex].image_width, (float)(screenTex[currentScreenTex].image_xoffset) );
     glVertex2f( 1.0f, 1.0f );
 
-    glTexCoord2f( (float)screenTex.image_width, (float)screenTex.image_height );
+    glTexCoord2f( (float)screenTex[currentScreenTex].image_width, (float)screenTex[currentScreenTex].image_height );
     glVertex2f( 1.0f, -1.0f );
 
-    glTexCoord2f( (float)screenTex.image_xoffset, (float)screenTex.image_height );
+    glTexCoord2f( (float)screenTex[currentScreenTex].image_xoffset, (float)screenTex[currentScreenTex].image_height );
     glVertex2f( -1.0f, -1.0f );
 
-    glTexCoord2f( (float)screenTex.image_xoffset, (float)screenTex.image_yoffset );
+    glTexCoord2f( (float)screenTex[currentScreenTex].image_xoffset, (float)screenTex[currentScreenTex].image_yoffset );
     glVertex2f( -1.0f, 1.0f );
 
   glEnd();
@@ -482,47 +488,47 @@
 
   if( screenTexInitialised == NO) return;
   /* FIXME: May want to have a double buffered texture later */
-#if 0
-  for(i = 0; i < 1; i++) {
-    GLint dt = i+1;
-    glDeleteTextures(1, &dt);
+  glDeleteTextures( MAX_SCREEN_BUFFERS, screenTexId );
+  for(i = 0; i < MAX_SCREEN_BUFFERS; i++)
+  {
+    free( screenTex[i].pixels );
+    screenTex[i].pixels = NULL;
   }
-#endif
-  glDeleteTextures( 1, &screenTexId );
   screenTexInitialised = NO;
 }
 
--(void) createTexture:(Cocoa_Texture*)newScreen;
+-(void) createTexture:(Cocoa_Texture*)newScreen
 {
-  GLint i;
+  GLuint i;
 
-  screenTex.full_width = newScreen->full_width;
-  screenTex.full_height = newScreen->full_height;
-  screenTex.image_width = newScreen->image_width;
-  screenTex.image_height = newScreen->image_height;
-  screenTex.image_xoffset = newScreen->image_xoffset;
-  screenTex.image_yoffset = newScreen->image_yoffset;
-  screenTex.pixels = calloc( screenTex.full_width * screenTex.full_height, sizeof(uint16_t) );
-  if( !screenTex.pixels ) {
-    fprintf( stderr, "%s: couldn't create screenTex.pixels\n", fuse_progname );
-    return;
-  }
-  screenTex.pitch = screenTex.full_width * sizeof(uint16_t);
-
   [[self openGLContext] makeCurrentContext];
   [[self openGLContext] update];
 
   /* FIXME: May want to have a double buffered texture later */
-  //for(i = 0; i < 1; i++)
-  //{
-    glGenTextures( 1, &screenTexId );
+  glGenTextures( MAX_SCREEN_BUFFERS, screenTexId );
+
+  for(i = 0; i < MAX_SCREEN_BUFFERS; i++)
+  {
+    screenTex[i].full_width = newScreen->full_width;
+    screenTex[i].full_height = newScreen->full_height;
+    screenTex[i].image_width = newScreen->image_width;
+    screenTex[i].image_height = newScreen->image_height;
+    screenTex[i].image_xoffset = newScreen->image_xoffset;
+    screenTex[i].image_yoffset = newScreen->image_yoffset;
+    screenTex[i].pixels = calloc( screenTex[i].full_width * screenTex[i].full_height, sizeof(uint16_t) );
+    if( !screenTex[i].pixels ) {
+      fprintf( stderr, "%s: couldn't create screenTex[%ud].pixels\n", fuse_progname, (unsigned int)i );
+      return;
+    }
+    screenTex[i].pitch = screenTex[i].full_width * sizeof(uint16_t);
+
     glDisable( GL_TEXTURE_2D );
     glEnable( GL_TEXTURE_RECTANGLE_EXT );
-    glBindTexture( GL_TEXTURE_RECTANGLE_EXT, screenTexId );
+    glBindTexture( GL_TEXTURE_RECTANGLE_EXT, screenTexId[i] );
 
     glTextureRangeAPPLE( GL_TEXTURE_RECTANGLE_EXT,
-                         screenTex.full_width * screenTex.pitch,
-                         screenTex.pixels );
+                         screenTex[i].full_width * screenTex[i].pitch,
+                         screenTex[i].pixels );
 
     glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_STORAGE_HINT_APPLE,
                      GL_STORAGE_CACHED_APPLE );
@@ -534,10 +540,10 @@
     glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
     glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
 
-    glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA, screenTex.full_width,
-                  screenTex.full_height, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV,
-                  screenTex.pixels );
-  //}
+    glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA, screenTex[i].full_width,
+                  screenTex[i].full_height, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV,
+                  screenTex[i].pixels );
+  }
   screenTexInitialised = YES;
 }
 

Modified: branches/fusegl/fuse/ui/cocoa/cocoadisplay.h
===================================================================
--- branches/fusegl/fuse/ui/cocoa/cocoadisplay.h	2007-05-12 01:33:29 UTC (rev 368)
+++ branches/fusegl/fuse/ui/cocoa/cocoadisplay.h	2007-05-15 12:45:49 UTC (rev 369)
@@ -27,6 +27,8 @@
 #ifndef FUSE_COCOADISPLAY_H
 #define FUSE_COCOADISPLAY_H
 
+#import <Foundation/NSLock.h>
+
 #include "ui/ui.h"
 
 typedef struct Cocoa_Texture {
@@ -43,6 +45,9 @@
 /* Screen texture */
 extern Cocoa_Texture* screen;
 
+extern NSLock *buffered_screen_lock;
+extern Cocoa_Texture buffered_screen;
+
 void cocoadisplay_display_updated( void );
 
 #endif			/* #ifndef FUSE_COCOADISPLAY_H */

Modified: branches/fusegl/fuse/ui/cocoa/cocoadisplay.m
===================================================================
--- branches/fusegl/fuse/ui/cocoa/cocoadisplay.m	2007-05-12 01:33:29 UTC (rev 368)
+++ branches/fusegl/fuse/ui/cocoa/cocoadisplay.m	2007-05-15 12:45:49 UTC (rev 369)
@@ -62,6 +62,12 @@
 /* Screen texture after scaling (only if a transforming scaler is in place) */
 Cocoa_Texture scaled_screen;
 
+/* Screen texture second buffer */
+Cocoa_Texture buffered_screen;
+
+/* and a lock to protect it from concurrent access */
+NSLock *buffered_screen_lock;
+
 /* Colours are in 1A 5R 5G 5B format */
 static uint16_t colour_values[] = {
   0x0000,
@@ -117,10 +123,10 @@
 
 static int
 allocate_screen( Cocoa_Texture* screen, int height, int width,
-                              float scaling_factor )
+                 float scaling_factor )
 {
-  screen->image_width = image_width * display_current_size;
-  screen->image_height = image_height * display_current_size;
+  screen->image_width = width * scaling_factor;
+  screen->image_height = height * scaling_factor;
 
   /* Need some extra bytes around when using 2xSaI */
   screen->full_width = screen->image_width+3;
@@ -130,7 +136,7 @@
 
   screen->pixels = calloc( screen->full_width*screen->full_height, sizeof(uint16_t) );
   if( !screen->pixels ) {
-    fprintf( stderr, "%s: couldn't create screen.pixels\n", fuse_progname );
+    fprintf( stderr, "%s: couldn't allocate screen.pixels\n", fuse_progname );
     return 1;
   }
 
@@ -168,8 +174,12 @@
     screen = &scaled_screen;
   }
 
+  error = allocate_screen( &buffered_screen, screen->image_height,
+                           screen->image_width, 1.0f );
+  if( error ) return error;
+
   /* Create OpenGL textures for the image in DisplayOpenGLView */
-  [[DisplayOpenGLView instance] createTexture:screen];
+  [[DisplayOpenGLView instance] createTexture:&buffered_screen];
 
   /* Redraw the entire screen... */
   display_refresh_all();
@@ -213,6 +223,9 @@
   if ( scaler_select_scaler( current_scaler ) )
     scaler_select_scaler( SCALER_NORMAL );
 
+  buffered_screen_lock = [[NSLock alloc] init];
+  [buffered_screen_lock retain];
+
   cocoadisplay_load_gfx_mode();
 
   /* We can now output error messages to our output device */
@@ -229,6 +242,7 @@
   /* Free the old surfaces */
   free_screen( &unscaled_screen );
   free_screen( &scaled_screen );
+  free_screen( &buffered_screen );
 
   /* Setup the new GFX mode */
   cocoadisplay_load_gfx_mode();
@@ -371,6 +385,12 @@
 uidisplay_frame_end( void )
 {
   if( display_updated )
+    /* obtain lock for buffered screen */
+    [buffered_screen_lock lock];
+    /* copy screen data to buffered screen */
+    memcpy( buffered_screen.pixels, screen->pixels, screen->pitch * screen->full_height );
+    /* release lock for buffered screen */
+    [buffered_screen_lock unlock];
     [[DisplayOpenGLView instance]
           performSelectorOnMainThread:@selector(setNeedsDisplayYes)
           withObject:nil
@@ -410,8 +430,11 @@
     [[DisplayOpenGLView instance] destroyTexture];
   }
 
+  [buffered_screen_lock release];
+
   free_screen( &unscaled_screen );
   free_screen( &scaled_screen );
+  free_screen( &buffered_screen );
 
   return 0;
 }


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: [368] tags/Release-0_8_0_1/ChangeLog

From: <fr...@us...> - 2007-05-12 01:33:29

Revision: 368
          http://svn.sourceforge.net/fuse-for-macosx/?rev=368&view=rev
Author:   fredm
Date:     2007-05-11 18:33:29 -0700 (Fri, 11 May 2007)

Log Message:
-----------
Add GNU style changelog.

Added Paths:
-----------
    tags/Release-0_8_0_1/ChangeLog

Added: tags/Release-0_8_0_1/ChangeLog
===================================================================
--- tags/Release-0_8_0_1/ChangeLog	                        (rev 0)
+++ tags/Release-0_8_0_1/ChangeLog	2007-05-12 01:33:29 UTC (rev 368)
@@ -0,0 +1,3831 @@
+2007-05-12 01:21  fredm
+
+	* .: Create Release-0_8_0_1 tag.
+
+2007-05-12 01:09  fredm
+
+	* branches/Release-0_8_0/fuse/ChangeLog,
+	  branches/Release-0_8_0/fuse/README,
+	  branches/Release-0_8_0/fuse/acinclude.m4,
+	  branches/Release-0_8_0/fuse/configure.in,
+	  branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist,
+	  branches/Release-0_8_0/fuse/fusepb/config.h,
+	  branches/Release-0_8_0/fuse/fusepb/resources/Fuse
+	  Help/html/changelog.html,
+	  branches/Release-0_8_0/fuse/hacking/ChangeLog,
+	  branches/Release-0_8_0/fuse/hacking/cvs-tags,
+	  branches/Release-0_8_0/fuse/hacking/ui.txt,
+	  branches/Release-0_8_0/fuse/lib/Makefile.am,
+	  branches/Release-0_8_0/fuse/machines/pentagon.c,
+	  branches/Release-0_8_0/fuse/machines/scorpion.c,
+	  branches/Release-0_8_0/fuse/machines/spec128.c,
+	  branches/Release-0_8_0/fuse/machines/spec16.c,
+	  branches/Release-0_8_0/fuse/machines/spec48.c,
+	  branches/Release-0_8_0/fuse/man/fuse.1,
+	  branches/Release-0_8_0/fuse/periph.c,
+	  branches/Release-0_8_0/fuse/screenshot.c,
+	  branches/Release-0_8_0/fuse/snapshot.c,
+	  branches/Release-0_8_0/fuse/spectrum.c,
+	  branches/Release-0_8_0/fuse/spectrum.h,
+	  branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c,
+	  branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c,
+	  branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c,
+	  branches/Release-0_8_0/fuse/ui/scaler/scaler.c,
+	  branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp,
+	  branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c,
+	  branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c,
+	  branches/Release-0_8_0/fuse/ui/uidisplay.h,
+	  branches/Release-0_8_0/fuse/ui/win32/win32display.c,
+	  branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c,
+	  branches/Release-0_8_0/fuse/uidisplay.c,
+	  branches/Release-0_8_0/fuse/ula.c,
+	  branches/Release-0_8_0/fuse/ula.h,
+	  branches/Release-0_8_0/fuse/widget/Makefile.am,
+	  branches/Release-0_8_0/fuse/widget/menu.c,
+	  branches/Release-0_8_0/fuse/widget/pokefinder.c,
+	  branches/Release-0_8_0/libspectrum/Info.plist,
+	  branches/Release-0_8_0/libspectrum/libspectrum.h,
+	  branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj,
+	  branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog,
+	  branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am,
+	  branches/Release-0_8_0/libspectrum/libspectrum/README,
+	  branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4,
+	  branches/Release-0_8_0/libspectrum/libspectrum/configure.in,
+	  branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags,
+	  branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3,
+	  branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt,
+	  branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore,
+	  branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog,
+	  branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am,
+	  branches/Release-0_8_0/libspectrum/libspectrum/libspectrum.h.in,
+	  branches/Release-0_8_0/libspectrum/libspectrum/tap.c,
+	  branches/Release-0_8_0/libspectrum/libspectrum/tzx_read.c: Merge
+	  up to vendor fuse-0.8.0.1 and libspectrum-0.3.0.1 releases.
+
+2007-05-07 13:03  fredm
+
+	* branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/info.nib,
+	  branches/Release-0_8_0/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib:
+	  Correct PAL TV scanline preference.
+
+2007-04-15 13:02  fredm
+
+	* branches/Release-0_8_0/fuse/fusepb/controllers/DebuggerController.m,
+	  branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/info.nib,
+	  branches/Release-0_8_0/fuse/fusepb/nibs/Debugger.nib/keyedobjects.nib:
+	  Fix debugger stack display, tweak debugger window size to avoid
+	  stack and disassembler windows having scrollbars.
+
+2007-04-15 12:57  fredm
+
+	* branches/Release-0_8_0/fuse/fusepb/resources/Fuse
+	  Help/html/changelog.html,
+	  branches/Release-0_8_0/fuse/fusepb/resources/Fuse
+	  Help/html/spotlight.html,
+	  branches/Release-0_8_0/fuse/fusepb/resources/Fuse
+	  Help/html/tocstart.html: Belated 0.8.0 updates plus Spotlight
+	  Importer documentation.
+
+2007-04-11 13:22  fredm
+
+	* branches/Release-0_8_0/bzip2/English.lproj/InfoPlist.strings,
+	  branches/Release-0_8_0/bzip2/Info.plist,
+	  branches/Release-0_8_0/bzip2/bzip2/CHANGES,
+	  branches/Release-0_8_0/bzip2/bzip2/LICENSE,
+	  branches/Release-0_8_0/bzip2/bzip2/Makefile,
+	  branches/Release-0_8_0/bzip2/bzip2/Makefile-libbz2_so,
+	  branches/Release-0_8_0/bzip2/bzip2/README,
+	  branches/Release-0_8_0/bzip2/bzip2/README.COMPILATION.PROBLEMS,
+	  branches/Release-0_8_0/bzip2/bzip2/README.XML.STUFF,
+	  branches/Release-0_8_0/bzip2/bzip2/Y2K_INFO,
+	  branches/Release-0_8_0/bzip2/bzip2/blocksort.c,
+	  branches/Release-0_8_0/bzip2/bzip2/bz-fo.xsl,
+	  branches/Release-0_8_0/bzip2/bzip2/bzdiff,
+	  branches/Release-0_8_0/bzip2/bzip2/bzgrep,
+	  branches/Release-0_8_0/bzip2/bzip2/bzip2.1,
+	  branches/Release-0_8_0/bzip2/bzip2/bzip2.1.preformatted,
+	  branches/Release-0_8_0/bzip2/bzip2/bzip2.c,
+	  branches/Release-0_8_0/bzip2/bzip2/bzip2.txt,
+	  branches/Release-0_8_0/bzip2/bzip2/bzip2recover.c,
+	  branches/Release-0_8_0/bzip2/bzip2/bzlib.c,
+	  branches/Release-0_8_0/bzip2/bzip2/bzlib.h,
+	  branches/Release-0_8_0/bzip2/bzip2/bzlib_private.h,
+	  branches/Release-0_8_0/bzip2/bzip2/compress.c,
+	  branches/Release-0_8_0/bzip2/bzip2/crctable.c,
+	  branches/Release-0_8_0/bzip2/bzip2/decompress.c,
+	  branches/Release-0_8_0/bzip2/bzip2/dlltest.c,
+	  branches/Release-0_8_0/bzip2/bzip2/entities.xml,
+	  branches/Release-0_8_0/bzip2/bzip2/format.pl,
+	  branches/Release-0_8_0/bzip2/bzip2/huffman.c,
+	  branches/Release-0_8_0/bzip2/bzip2/manual.html,
+	  branches/Release-0_8_0/bzip2/bzip2/manual.pdf,
+	  branches/Release-0_8_0/bzip2/bzip2/manual.ps,
+	  branches/Release-0_8_0/bzip2/bzip2/manual.xml,
+	  branches/Release-0_8_0/bzip2/bzip2/mk251.c,
+	  branches/Release-0_8_0/bzip2/bzip2/randtable.c,
+	  branches/Release-0_8_0/bzip2/bzip2/spewG.c,
+	  branches/Release-0_8_0/bzip2/bzip2/unzcrash.c,
+	  branches/Release-0_8_0/bzip2/bzip2/words0,
+	  branches/Release-0_8_0/bzip2/bzip2/words2,
+	  branches/Release-0_8_0/bzip2/bzip2/words3,
+	  branches/Release-0_8_0/bzip2/bzip2/xmlproc.sh: Merge up to
+	  bzip2-1.0.4
+
+2007-04-11 12:59  fredm
+
+	* branches/Release-0_8_0/fuse/ChangeLog,
+	  branches/Release-0_8_0/fuse/README,
+	  branches/Release-0_8_0/fuse/configure.in,
+	  branches/Release-0_8_0/fuse/fuse.cpp,
+	  branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist,
+	  branches/Release-0_8_0/fuse/fusepb/config.h,
+	  branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m,
+	  branches/Release-0_8_0/fuse/hacking/ChangeLog,
+	  branches/Release-0_8_0/fuse/hacking/cvs-tags,
+	  branches/Release-0_8_0/fuse/man/fuse.1,
+	  branches/Release-0_8_0/fuse/rzx.c: Merge up to fuse-0.8.0
+
+2007-04-11 12:33  fredm
+
+	* branches/Release-0_8_0/libspectrum/Info.plist,
+	  branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj,
+	  branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog,
+	  branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am,
+	  branches/Release-0_8_0/libspectrum/libspectrum/README,
+	  branches/Release-0_8_0/libspectrum/libspectrum/configure.in,
+	  branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags,
+	  branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3,
+	  branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog,
+	  branches/Release-0_8_0/libspectrum/libspectrum/internals.h,
+	  branches/Release-0_8_0/libspectrum/libspectrum/z80.c: Merge up to
+	  libspectrum-0.3.0
+
+2007-04-09 11:42  fredm
+
+	* branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m,
+	  branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m,
+	  branches/Release-0_8_0/fuse/rzx.c,
+	  branches/Release-0_8_0/fuse/rzx.h: Merge in changes from Fuse to
+	  reset rzx_instructions_offset on rollback to fix replay of rolled
+	  back recordings (and some refactoring).
+
+2007-04-09 11:40  fredm
+
+	* branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist: Update
+	  version number to reflect fuse version 20070404.
+
+2007-04-09 02:29  fredm
+
+	* branches/Release-0_8_0/fuse/compat/mkstemp.c,
+	  branches/Release-0_8_0/fuse/hacking/ChangeLog,
+	  branches/Release-0_8_0/fuse/joystick.c,
+	  branches/Release-0_8_0/fuse/machines/spec_se.c,
+	  branches/Release-0_8_0/fuse/periph.c,
+	  branches/Release-0_8_0/fuse/printer.c: Merge up to fuse-20070404.
+
+2007-03-10 12:53  fredm
+
+	* branches/Release-0_8_0/fuse/configure.in,
+	  branches/Release-0_8_0/fuse/display.c,
+	  branches/Release-0_8_0/fuse/fuse.cpp,
+	  branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist,
+	  branches/Release-0_8_0/fuse/fusepb/SDLMain.mm,
+	  branches/Release-0_8_0/fuse/fusepb/resources/Fuse
+	  Help/html/divide.html,
+	  branches/Release-0_8_0/fuse/hacking/ChangeLog,
+	  branches/Release-0_8_0/fuse/hacking/cvs-tags,
+	  branches/Release-0_8_0/fuse/if1.c,
+	  branches/Release-0_8_0/fuse/man/fuse.1,
+	  branches/Release-0_8_0/fuse/rzx.c,
+	  branches/Release-0_8_0/fuse/settings.dat,
+	  branches/Release-0_8_0/fuse/sound.c,
+	  branches/Release-0_8_0/fuse/sound/aosound.c,
+	  branches/Release-0_8_0/fuse/sound/coreaudiosound.c,
+	  branches/Release-0_8_0/fuse/sound/sdlsound.c,
+	  branches/Release-0_8_0/fuse/ui.c,
+	  branches/Release-0_8_0/fuse/ui/gtk/gtkui.c,
+	  branches/Release-0_8_0/fuse/utils.c,
+	  branches/Release-0_8_0/fuse/widget/filesel.c,
+	  branches/Release-0_8_0/libspectrum/Info.plist,
+	  branches/Release-0_8_0/libspectrum/libspectrum.h,
+	  branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog,
+	  branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt,
+	  branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog,
+	  branches/Release-0_8_0/libspectrum/libspectrum/internals.h,
+	  branches/Release-0_8_0/libspectrum/libspectrum/libspectrum.h.in,
+	  branches/Release-0_8_0/libspectrum/libspectrum/rzx.c,
+	  branches/Release-0_8_0/libspectrum/libspectrum/tzx_read.c: Merge
+	  up to libspectrum-0.3.0-pre2 and fuse-20070310.
+
+2007-02-06 09:16  fredm
+
+	* branches/Release-0_8_0: Make branch for 0.8.0 release tree.
+
+2007-02-06 09:11  fredm
+
+	* trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add
+	  more to the changes list in the manual.
+
+2007-02-05 13:47  fredm
+
+	* trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj,
+	  trunk/FuseImporter/LibspectrumMetadataImporter.m,
+	  trunk/FuseImporter/libspectrum.h, trunk/fuse/ChangeLog,
+	  trunk/fuse/Makefile.am, trunk/fuse/README, trunk/fuse/autogen.sh,
+	  trunk/fuse/ay.c, trunk/fuse/ay.h, trunk/fuse/compat.h,
+	  trunk/fuse/compat/Makefile.am, trunk/fuse/compat/dirname.c,
+	  trunk/fuse/configure.in, trunk/fuse/dck.c, trunk/fuse/dck.h,
+	  trunk/fuse/debugger/Makefile.am,
+	  trunk/fuse/debugger/breakpoint.c,
+	  trunk/fuse/debugger/breakpoint.h, trunk/fuse/debugger/command.c,
+	  trunk/fuse/debugger/commandl.l, trunk/fuse/debugger/commandy.y,
+	  trunk/fuse/debugger/debugger.c, trunk/fuse/debugger/debugger.h,
+	  trunk/fuse/debugger/debugger_internals.h,
+	  trunk/fuse/debugger/disassemble.c,
+	  trunk/fuse/debugger/expression.c, trunk/fuse/display.c,
+	  trunk/fuse/display.h, trunk/fuse/divide.c, trunk/fuse/divide.h,
+	  trunk/fuse/event.c, trunk/fuse/event.h, trunk/fuse/fuse.cpp,
+	  trunk/fuse/fuse.h, trunk/fuse/fusepb/Credits.html,
+	  trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  trunk/fuse/fusepb/Info-Fuse.plist,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+	  trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx,
+	  trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/about.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/divide.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/filters.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html,
+	  trunk/fuse/fusepb/settings_cocoa.h, trunk/fuse/hacking/ChangeLog,
+	  trunk/fuse/hacking/Makefile.am, trunk/fuse/hacking/cvs-tags,
+	  trunk/fuse/ide.c, trunk/fuse/ide.h, trunk/fuse/if1.c,
+	  trunk/fuse/if1.h, trunk/fuse/if2.c, trunk/fuse/if2.h,
+	  trunk/fuse/input.c, trunk/fuse/input.h, trunk/fuse/joystick.c,
+	  trunk/fuse/joystick.h, trunk/fuse/keyboard.c,
+	  trunk/fuse/keyboard.h, trunk/fuse/keysyms.dat,
+	  trunk/fuse/keysyms.pl, trunk/fuse/lib/Makefile.am,
+	  trunk/fuse/loader.c, trunk/fuse/loader.h, trunk/fuse/machine.c,
+	  trunk/fuse/machine.h, trunk/fuse/machines/Makefile.am,
+	  trunk/fuse/machines/machines.h, trunk/fuse/machines/pentagon.c,
+	  trunk/fuse/machines/scorpion.c, trunk/fuse/machines/scorpion.h,
+	  trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec128.h,
+	  trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c,
+	  trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c,
+	  trunk/fuse/machines/specplus2.c,
+	  trunk/fuse/machines/specplus2a.c,
+	  trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h,
+	  trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c,
+	  trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h,
+	  trunk/fuse/machines/ts2068.c, trunk/fuse/man/Makefile.am,
+	  trunk/fuse/man/fuse.1, trunk/fuse/memory.c, trunk/fuse/memory.h,
+	  trunk/fuse/menu.c, trunk/fuse/menu.h, trunk/fuse/menu_data.c,
+	  trunk/fuse/menu_data.pl, trunk/fuse/periph.c,
+	  trunk/fuse/periph.h, trunk/fuse/perl/Fuse.pm,
+	  trunk/fuse/perl/Fuse/Dialog.pm, trunk/fuse/perl/Fuse/Makefile.am,
+	  trunk/fuse/perl/Makefile.am, trunk/fuse/perl/cpp-perl.pl,
+	  trunk/fuse/pokefinder/Makefile.am,
+	  trunk/fuse/pokefinder/pokefinder.c,
+	  trunk/fuse/pokefinder/pokefinder.h, trunk/fuse/printer.c,
+	  trunk/fuse/printer.h, trunk/fuse/profile.c, trunk/fuse/profile.h,
+	  trunk/fuse/psg.c, trunk/fuse/psg.h, trunk/fuse/roms/Makefile.am,
+	  trunk/fuse/rzx.c, trunk/fuse/rzx.h, trunk/fuse/scld.c,
+	  trunk/fuse/screenshot.c, trunk/fuse/screenshot.h,
+	  trunk/fuse/settings-header.pl, trunk/fuse/settings.dat,
+	  trunk/fuse/settings.pl, trunk/fuse/simpleide.c, trunk/fuse/slt.c,
+	  trunk/fuse/slt.h, trunk/fuse/snapshot.c, trunk/fuse/snapshot.h,
+	  trunk/fuse/sound.c, trunk/fuse/sound.h,
+	  trunk/fuse/sound/Makefile.am, trunk/fuse/sound/aosound.c,
+	  trunk/fuse/sound/coreaudiosound.c, trunk/fuse/sound/dxsound.c,
+	  trunk/fuse/sound/lowlevel.h, trunk/fuse/sound/sdlsound.c,
+	  trunk/fuse/sound/sfifo.c, trunk/fuse/spectrum.c,
+	  trunk/fuse/spectrum.h, trunk/fuse/tape.c, trunk/fuse/tape.h,
+	  trunk/fuse/timer.c, trunk/fuse/timer.h, trunk/fuse/trdos.c,
+	  trunk/fuse/trdos.h, trunk/fuse/ui.c, trunk/fuse/ui/Makefile.am,
+	  trunk/fuse/ui/aalib/Makefile.am,
+	  trunk/fuse/ui/aalib/aalibdisplay.c,
+	  trunk/fuse/ui/aalib/aalibkeyboard.c,
+	  trunk/fuse/ui/aalib/aalibkeyboard.h,
+	  trunk/fuse/ui/aalib/aalibui.c, trunk/fuse/ui/aalib/aalibui.h,
+	  trunk/fuse/ui/aalib/error.c, trunk/fuse/ui/fb/Makefile.am,
+	  trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/fb/fbdisplay.h,
+	  trunk/fuse/ui/fb/fbjoystick.c, trunk/fuse/ui/fb/fbkeyboard.c,
+	  trunk/fuse/ui/fb/fbkeyboard.h, trunk/fuse/ui/fb/fbui.c,
+	  trunk/fuse/ui/ggi/Makefile.am, trunk/fuse/ui/ggi/ggi_internals.h,
+	  trunk/fuse/ui/ggi/ggidisplay.c, trunk/fuse/ui/ggi/ggikeyboard.c,
+	  trunk/fuse/ui/ggi/ggiui.c, trunk/fuse/ui/gtk/Makefile.am,
+	  trunk/fuse/ui/gtk/binary.c, trunk/fuse/ui/gtk/browse.c,
+	  trunk/fuse/ui/gtk/confirm.c, trunk/fuse/ui/gtk/debugger.c,
+	  trunk/fuse/ui/gtk/fileselector.c, trunk/fuse/ui/gtk/gtkdisplay.c,
+	  trunk/fuse/ui/gtk/gtkinternals.h,
+	  trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkkeyboard.c,
+	  trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/gtk/memory.c,
+	  trunk/fuse/ui/gtk/options-header.pl,
+	  trunk/fuse/ui/gtk/options.pl, trunk/fuse/ui/gtk/picture.c,
+	  trunk/fuse/ui/gtk/pixmaps.c, trunk/fuse/ui/gtk/pokefinder.c,
+	  trunk/fuse/ui/gtk/rollback.c, trunk/fuse/ui/gtk/roms.c,
+	  trunk/fuse/ui/gtk/statusbar.c, trunk/fuse/ui/gtk/stock.c,
+	  trunk/fuse/ui/options.dat, trunk/fuse/ui/scaler/Makefile.am,
+	  trunk/fuse/ui/scaler/scaler.c, trunk/fuse/ui/scaler/scaler.h,
+	  trunk/fuse/ui/scaler/scaler_internals.h,
+	  trunk/fuse/ui/scaler/scalers.cpp, trunk/fuse/ui/sdl/Makefile.am,
+	  trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/ui/sdl/sdldisplay.h,
+	  trunk/fuse/ui/sdl/sdljoystick.c, trunk/fuse/ui/sdl/sdljoystick.h,
+	  trunk/fuse/ui/sdl/sdlkeyboard.c, trunk/fuse/ui/sdl/sdlkeyboard.h,
+	  trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/svga/Makefile.am,
+	  trunk/fuse/ui/svga/svgadisplay.c,
+	  trunk/fuse/ui/svga/svgadisplay.h,
+	  trunk/fuse/ui/svga/svgajoystick.c,
+	  trunk/fuse/ui/svga/svgakeyboard.c,
+	  trunk/fuse/ui/svga/svgakeyboard.h, trunk/fuse/ui/svga/svgaui.c,
+	  trunk/fuse/ui/ui.h, trunk/fuse/ui/uidisplay.h,
+	  trunk/fuse/ui/uijoystick.c, trunk/fuse/ui/uijoystick.h,
+	  trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/debugger.c,
+	  trunk/fuse/ui/win32/debugger.h, trunk/fuse/ui/win32/debugger.rc,
+	  trunk/fuse/ui/win32/error.c, trunk/fuse/ui/win32/keysyms.c,
+	  trunk/fuse/ui/win32/menu_data.c, trunk/fuse/ui/win32/menu_data.h,
+	  trunk/fuse/ui/win32/menu_data.rc,
+	  trunk/fuse/ui/win32/pokefinder.c,
+	  trunk/fuse/ui/win32/pokefinder.h,
+	  trunk/fuse/ui/win32/pokefinder.rc,
+	  trunk/fuse/ui/win32/statusbar.c,
+	  trunk/fuse/ui/win32/win32display.c,
+	  trunk/fuse/ui/win32/win32display.h,
+	  trunk/fuse/ui/win32/win32internals.h,
+	  trunk/fuse/ui/win32/win32keyboard.c,
+	  trunk/fuse/ui/win32/win32keyboard.h,
+	  trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/win32/win32ui.rc,
+	  trunk/fuse/ui/xlib/Makefile.am, trunk/fuse/ui/xlib/xdisplay.c,
+	  trunk/fuse/ui/xlib/xdisplay.h, trunk/fuse/ui/xlib/xerror.c,
+	  trunk/fuse/ui/xlib/xjoystick.c, trunk/fuse/ui/xlib/xkeyboard.c,
+	  trunk/fuse/ui/xlib/xkeyboard.h, trunk/fuse/ui/xlib/xui.c,
+	  trunk/fuse/ui/xlib/xui.h, trunk/fuse/uidisplay.c,
+	  trunk/fuse/ula.c, trunk/fuse/ula.h, trunk/fuse/utils.c,
+	  trunk/fuse/utils.h, trunk/fuse/widget/Makefile.am,
+	  trunk/fuse/widget/browse.c, trunk/fuse/widget/debugger.c,
+	  trunk/fuse/widget/error.c, trunk/fuse/widget/filesel.c,
+	  trunk/fuse/widget/menu.c, trunk/fuse/widget/options-header.pl,
+	  trunk/fuse/widget/options.pl, trunk/fuse/widget/picture.c,
+	  trunk/fuse/widget/roms.c, trunk/fuse/widget/select.c,
+	  trunk/fuse/widget/text.c, trunk/fuse/widget/widget.c,
+	  trunk/fuse/widget/widget.h, trunk/fuse/widget/widget_internals.h,
+	  trunk/fuse/z80/Makefile.am, trunk/fuse/z80/coretest.c,
+	  trunk/fuse/z80/harness.pl, trunk/fuse/z80/tests/Makefile.am,
+	  trunk/fuse/z80/z80.c, trunk/fuse/z80/z80.h,
+	  trunk/fuse/z80/z80.pl, trunk/fuse/z80/z80_macros.h,
+	  trunk/fuse/z80/z80_ops.c, trunk/fuse/zxatasp.c,
+	  trunk/fuse/zxatasp.h, trunk/fuse/zxcf.c, trunk/fuse/zxcf.h,
+	  trunk/libspectrum/libspectrum.h,
+	  trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj,
+	  trunk/libspectrum/libspectrum/ChangeLog,
+	  trunk/libspectrum/libspectrum/Makefile.am,
+	  trunk/libspectrum/libspectrum/README,
+	  trunk/libspectrum/libspectrum/accessor.pl,
+	  trunk/libspectrum/libspectrum/autogen.sh,
+	  trunk/libspectrum/libspectrum/bzip2.c,
+	  trunk/libspectrum/libspectrum/configure.in,
+	  trunk/libspectrum/libspectrum/creator.c,
+	  trunk/libspectrum/libspectrum/crypto.c,
+	  trunk/libspectrum/libspectrum/dck.c,
+	  trunk/libspectrum/libspectrum/dll.c,
+	  trunk/libspectrum/libspectrum/doc/Makefile.am,
+	  trunk/libspectrum/libspectrum/doc/cvs-tags,
+	  trunk/libspectrum/libspectrum/doc/libspectrum.3,
+	  trunk/libspectrum/libspectrum/doc/libspectrum.txt,
+	  trunk/libspectrum/libspectrum/hacking/ChangeLog,
+	  trunk/libspectrum/libspectrum/ide.c,
+	  trunk/libspectrum/libspectrum/internals.h,
+	  trunk/libspectrum/libspectrum/libspectrum.c,
+	  trunk/libspectrum/libspectrum/libspectrum.h.in,
+	  trunk/libspectrum/libspectrum/libspectrum.qpg.in,
+	  trunk/libspectrum/libspectrum/make-perl.c,
+	  trunk/libspectrum/libspectrum/microdrive.c,
+	  trunk/libspectrum/libspectrum/myglib/Makefile.am,
+	  trunk/libspectrum/libspectrum/myglib/ghash.c,
+	  trunk/libspectrum/libspectrum/myglib/gslist.c,
+	  trunk/libspectrum/libspectrum/plusd.c,
+	  trunk/libspectrum/libspectrum/rzx.c,
+	  trunk/libspectrum/libspectrum/sna.c,
+	  trunk/libspectrum/libspectrum/snap_accessors.txt,
+	  trunk/libspectrum/libspectrum/snapshot.c,
+	  trunk/libspectrum/libspectrum/snp.c,
+	  trunk/libspectrum/libspectrum/sp.c,
+	  trunk/libspectrum/libspectrum/symbol_table.c,
+	  trunk/libspectrum/libspectrum/szx.c,
+	  trunk/libspectrum/libspectrum/tap.c,
+	  trunk/libspectrum/libspectrum/tape.c,
+	  trunk/libspectrum/libspectrum/tape_accessors.pl,
+	  trunk/libspectrum/libspectrum/tape_accessors.txt,
+	  trunk/libspectrum/libspectrum/tape_block.c,
+	  trunk/libspectrum/libspectrum/tape_block.h,
+	  trunk/libspectrum/libspectrum/tape_set.pl,
+	  trunk/libspectrum/libspectrum/timings.c,
+	  trunk/libspectrum/libspectrum/tzx_read.c,
+	  trunk/libspectrum/libspectrum/tzx_write.c,
+	  trunk/libspectrum/libspectrum/warajevo_read.c,
+	  trunk/libspectrum/libspectrum/z80.c,
+	  trunk/libspectrum/libspectrum/zlib.c,
+	  trunk/libspectrum/libspectrum/zxs.c: Merge in vendor libspectrum
+	  0.3.0-pre1 and Fuse 0.8.0-pre1 versions. Update documentation and
+	  make adjustments to compensate for upstream changes.
+
+2007-01-09 21:02  fredm
+
+	* trunk/fuse/fuse.cpp, trunk/fuse/fuse.h, trunk/fuse/machine.c,
+	  trunk/fuse/sound.c, trunk/fuse/sound.h, trunk/fuse/tape.c: Fix
+	  distorted AY sound on snapshot load.
+
+2007-01-09 21:00  fredm
+
+	* trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  trunk/fuse/fusepb/Info-Fuse.plist: Move version strings to
+	  20070110.
+
+2007-01-09 14:15  fredm
+
+	* trunk/fuse/profile.c: Provide prototype for memset.
+
+2007-01-09 14:14  fredm
+
+	* trunk/fuse/ui/sdl/sdlkeyboard.c: Also pass on native keysyms to
+	  the input layer.
+
+2006-12-17 13:51  fredm
+
+	* trunk/fuse/debugger/breakpoint.c, trunk/fuse/hacking/ChangeLog,
+	  trunk/fuse/machine.c, trunk/fuse/man/fuse.1,
+	  trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/widget/widget.c: Merge
+	  up to fuse-20061217.
+
+2006-12-17 11:37  fredm
+
+	* trunk/fuse/fusepb/controllers/FuseController.m: When starting an
+	  RZX recording from a snapshot, be sure to pass through the embed
+	  snapshot preference.
+
+2006-12-17 03:13  fredm
+
+	* trunk/fuse/fusepb, trunk/fuse/fusepb/settings_cocoa.h: Don't
+	  ignore settings_cocoa.h and check it in for easier builds from
+	  scratch.
+
+2006-12-17 01:26  fredm
+
+	* trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  trunk/fuse/fusepb/Info-Fuse.plist: Move version strings to
+	  20061129.
+
+2006-11-26 11:24  fredm
+
+	* trunk/fuse/fusepb/controllers/PreferencesController.m,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+	  trunk/fuse/ui/sdl/sdljoystick.c: Fix joystick support.
+
+2006-11-26 08:44  fredm
+
+	* trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx,
+	  trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/emulation.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/menus.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html: Some
+	  updates to the Fuse manual.
+
+2006-11-26 08:35  fredm
+
+	* trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Remove
+	  "Auto-save settings" preference as we no longer have manual
+	  preference saving support as it is unlike the standard approach
+	  on OS X.
+
+2006-11-19 12:09  fredm
+
+	* trunk/fuse/fusepb/controllers/FuseController.m: Make default
+	  action on confirmations the action.
+
+2006-11-14 00:34  fredm
+
+	* trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  trunk/fuse/fusepb/Info-Fuse.plist: Move version numbers to
+	  20061114
+
+2006-10-22 02:35  fred
+
+	* trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Made ROM
+	  text boxes small fonts and made reset buttons only enable when
+	  there is something to reset.
+
+2006-10-22 01:57  fred
+
+	* trunk/fuse/fusepb/controllers/PreferencesController.h,
+	  trunk/fuse/fusepb/controllers/PreferencesController.m,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+	  trunk/fuse/settings.pl: Allow custom ROMS to be reset back to
+	  defaults individually.
+
+2006-10-21 16:38  fred
+
+	* trunk/fuse/fusepb/settings-header.pl,
+	  trunk/fuse/machines/tc2048.c, trunk/fuse/settings.pl: Complete
+	  merge up to fuse-20061021.
+
+2006-10-21 16:06  fred
+
+	* trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.c,
+	  trunk/fuse/hacking/ChangeLog, trunk/fuse/if1.c, trunk/fuse/if2.c,
+	  trunk/fuse/machine.c, trunk/fuse/machine.h,
+	  trunk/fuse/machines/pentagon.c, trunk/fuse/machines/scorpion.c,
+	  trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec16.c,
+	  trunk/fuse/machines/spec48.c, trunk/fuse/machines/spec_se.c,
+	  trunk/fuse/machines/specplus2.c,
+	  trunk/fuse/machines/specplus2a.c,
+	  trunk/fuse/machines/specplus3.c,
+	  trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c,
+	  trunk/fuse/machines/tc2068.c, trunk/fuse/machines/ts2068.c,
+	  trunk/fuse/memory.c, trunk/fuse/profile.c, trunk/fuse/scld.c,
+	  trunk/fuse/screenshot.c, trunk/fuse/screenshot.h,
+	  trunk/fuse/settings-header.pl, trunk/fuse/settings.dat,
+	  trunk/fuse/settings.pl, trunk/fuse/snapshot.c,
+	  trunk/fuse/sound/sdlsound.c, trunk/fuse/tape.c,
+	  trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/ggi/ggidisplay.c,
+	  trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/gtk/gtkui.c,
+	  trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/ui/svga/svgadisplay.c,
+	  trunk/fuse/ui/uidisplay.h, trunk/fuse/ui/win32/win32display.c,
+	  trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/uidisplay.c,
+	  trunk/fuse/widget/menu.c, trunk/fuse/widget/roms.c,
+	  trunk/fuse/widget/widget.c: Merge up to fuse-20061021.
+
+2006-10-16 13:42  fred
+
+	* trunk/fuse/fusepb/controllers/PreferencesController.h,
+	  trunk/fuse/fusepb/controllers/PreferencesController.m,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Fix
+	  updating ROMS after selecting new image.
+
+2006-09-04 12:55  fred
+
+	* trunk/fuse/fusepb/SDLMain.mm: Updates from SDL 1.2.11
+
+2006-09-04 12:49  fred
+
+	* trunk/fuse/ui/sdl/sdlui.c: Try enabling Altivec blitters again
+	  now that screen overruns have been solved?
+
+2006-09-04 05:18  fred
+
+	* trunk/fuse/display.c, trunk/fuse/screenshot.c,
+	  trunk/fuse/screenshot.h, trunk/fuse/ui/gtk/gtkui.c,
+	  trunk/fuse/widget/menu.c, trunk/fuse/widget/widget.c: Remove
+	  screenshot_save, now obsolete.
+
+2006-09-03 15:06  fred
+
+	* trunk/fuse/fusepb/controllers/FuseController.m: Make comments
+	  fuse compliant.
+
+2006-09-01 14:28  fred
+
+	* trunk/FuseImporter/libspectrum.h, trunk/fuse/event.c,
+	  trunk/fuse/event.h,
+	  trunk/fuse/fusepb/controllers/FuseController.m,
+	  trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags,
+	  trunk/fuse/hacking/implementation_notes.txt,
+	  trunk/fuse/machine.c, trunk/fuse/machine.h,
+	  trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+	  trunk/fuse/machines/specplus3.c, trunk/fuse/man/fuse.1,
+	  trunk/fuse/memory.c, trunk/fuse/menu.c, trunk/fuse/menu_data.c,
+	  trunk/fuse/profile.c, trunk/fuse/scld.c, trunk/fuse/screenshot.c,
+	  trunk/fuse/tape.c, trunk/fuse/trdos.h, trunk/fuse/ui/gtk/gtkui.c,
+	  trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/z80/tests/README,
+	  trunk/fuse/z80/tests/cb40.out, trunk/fuse/z80/tests/cb42.out,
+	  trunk/fuse/z80/tests/cb44.out, trunk/fuse/z80/tests/cb45.out,
+	  trunk/fuse/z80/tests/cb47_1.out, trunk/fuse/z80/tests/cb48.out,
+	  trunk/fuse/z80/tests/cb49.out, trunk/fuse/z80/tests/cb4a.out,
+	  trunk/fuse/z80/tests/cb4b.out, trunk/fuse/z80/tests/cb4c.out,
+	  trunk/fuse/z80/tests/cb4d.out, trunk/fuse/z80/tests/cb4e.out,
+	  trunk/fuse/z80/tests/cb4f_1.out, trunk/fuse/z80/tests/cb50.out,
+	  trunk/fuse/z80/tests/cb51.out, trunk/fuse/z80/tests/cb52.out,
+	  trunk/fuse/z80/tests/cb53.out, trunk/fuse/z80/tests/cb54.out,
+	  trunk/fuse/z80/tests/cb55.out, trunk/fuse/z80/tests/cb57.out,
+	  trunk/fuse/z80/tests/cb57_1.out, trunk/fuse/z80/tests/cb59.out,
+	  trunk/fuse/z80/tests/cb5b.out, trunk/fuse/z80/tests/cb5e.out,
+	  trunk/fuse/z80/tests/cb5f_1.out, trunk/fuse/z80/tests/cb60.out,
+	  trunk/fuse/z80/tests/cb61.out, trunk/fuse/z80/tests/cb63.out,
+	  trunk/fuse/z80/tests/cb64.out, trunk/fuse/z80/tests/cb65.out,
+	  trunk/fuse/z80/tests/cb67_1.out, trunk/fuse/z80/tests/cb68.out,
+	  trunk/fuse/z80/tests/cb69.out, trunk/fuse/z80/tests/cb6d.out,
+	  trunk/fuse/z80/tests/cb6f_1.out, trunk/fuse/z80/tests/cb71.out,
+	  trunk/fuse/z80/tests/cb72.out, trunk/fuse/z80/tests/cb73.out,
+	  trunk/fuse/z80/tests/cb74.out, trunk/fuse/z80/tests/cb75.out,
+	  trunk/fuse/z80/tests/cb76.out, trunk/fuse/z80/tests/cb77_1.out,
+	  trunk/fuse/z80/tests/cb78.out, trunk/fuse/z80/tests/cb79.out,
+	  trunk/fuse/z80/tests/cb7a.out, trunk/fuse/z80/tests/cb7b.out,
+	  trunk/fuse/z80/tests/cb7d.out, trunk/fuse/z80/tests/cb7f.out,
+	  trunk/fuse/z80/tests/cb7f_1.out, trunk/fuse/z80/tests/ddcb40.out,
+	  trunk/fuse/z80/tests/ddcb41.out, trunk/fuse/z80/tests/ddcb43.out,
+	  trunk/fuse/z80/tests/ddcb44.out, trunk/fuse/z80/tests/ddcb47.out,
+	  trunk/fuse/z80/tests/ddcb48.out, trunk/fuse/z80/tests/ddcb49.out,
+	  trunk/fuse/z80/tests/ddcb4a.out, trunk/fuse/z80/tests/ddcb4b.out,
+	  trunk/fuse/z80/tests/ddcb4c.out, trunk/fuse/z80/tests/ddcb4d.out,
+	  trunk/fuse/z80/tests/ddcb4e.out, trunk/fuse/z80/tests/ddcb4f.out,
+	  trunk/fuse/z80/tests/ddcb51.out, trunk/fuse/z80/tests/ddcb54.out,
+	  trunk/fuse/z80/tests/ddcb56.out, trunk/fuse/z80/tests/ddcb57.out,
+	  trunk/fuse/z80/tests/ddcb5a.out, trunk/fuse/z80/tests/ddcb5b.out,
+	  trunk/fuse/z80/tests/ddcb5e.out, trunk/fuse/z80/tests/ddcb60.out,
+	  trunk/fuse/z80/tests/ddcb61.out, trunk/fuse/z80/tests/ddcb62.out,
+	  trunk/fuse/z80/tests/ddcb65.out, trunk/fuse/z80/tests/ddcb66.out,
+	  trunk/fuse/z80/tests/ddcb69.out, trunk/fuse/z80/tests/ddcb6a.out,
+	  trunk/fuse/z80/tests/ddcb6b.out, trunk/fuse/z80/tests/ddcb6c.out,
+	  trunk/fuse/z80/tests/ddcb6e.out, trunk/fuse/z80/tests/ddcb70.out,
+	  trunk/fuse/z80/tests/ddcb71.out, trunk/fuse/z80/tests/ddcb72.out,
+	  trunk/fuse/z80/tests/ddcb73.out, trunk/fuse/z80/tests/ddcb74.out,
+	  trunk/fuse/z80/tests/ddcb75.out, trunk/fuse/z80/tests/ddcb76.out,
+	  trunk/fuse/z80/tests/ddcb78.out, trunk/fuse/z80/tests/ddcb79.out,
+	  trunk/fuse/z80/tests/ddcb7a.out, trunk/fuse/z80/tests/ddcb7b.out,
+	  trunk/fuse/z80/tests/ddcb7c.out, trunk/fuse/z80/tests/ddcb7d.out,
+	  trunk/fuse/z80/tests/ddcb7e.out, trunk/fuse/z80/tests/ddcb7f.out,
+	  trunk/fuse/z80/tests/fdcb40.out, trunk/fuse/z80/tests/fdcb41.out,
+	  trunk/fuse/z80/tests/fdcb42.out, trunk/fuse/z80/tests/fdcb43.out,
+	  trunk/fuse/z80/tests/fdcb44.out, trunk/fuse/z80/tests/fdcb45.out,
+	  trunk/fuse/z80/tests/fdcb46.out, trunk/fuse/z80/tests/fdcb48.out,
+	  trunk/fuse/z80/tests/fdcb49.out, trunk/fuse/z80/tests/fdcb4a.out,
+	  trunk/fuse/z80/tests/fdcb4b.out, trunk/fuse/z80/tests/fdcb4c.out,
+	  trunk/fuse/z80/tests/fdcb4d.out, trunk/fuse/z80/tests/fdcb4e.out,
+	  trunk/fuse/z80/tests/fdcb4f.out, trunk/fuse/z80/tests/fdcb50.out,
+	  trunk/fuse/z80/tests/fdcb53.out, trunk/fuse/z80/tests/fdcb56.out,
+	  trunk/fuse/z80/tests/fdcb57.out, trunk/fuse/z80/tests/fdcb58.out,
+	  trunk/fuse/z80/tests/fdcb59.out, trunk/fuse/z80/tests/fdcb5a.out,
+	  trunk/fuse/z80/tests/fdcb5b.out, trunk/fuse/z80/tests/fdcb5c.out,
+	  trunk/fuse/z80/tests/fdcb5d.out, trunk/fuse/z80/tests/fdcb5f.out,
+	  trunk/fuse/z80/tests/fdcb60.out, trunk/fuse/z80/tests/fdcb61.out,
+	  trunk/fuse/z80/tests/fdcb62.out, trunk/fuse/z80/tests/fdcb63.out,
+	  trunk/fuse/z80/tests/fdcb64.out, trunk/fuse/z80/tests/fdcb65.out,
+	  trunk/fuse/z80/tests/fdcb6b.out, trunk/fuse/z80/tests/fdcb6e.out,
+	  trunk/fuse/z80/tests/fdcb70.out, trunk/fuse/z80/tests/fdcb71.out,
+	  trunk/fuse/z80/tests/fdcb72.out, trunk/fuse/z80/tests/fdcb73.out,
+	  trunk/fuse/z80/tests/fdcb74.out, trunk/fuse/z80/tests/fdcb75.out,
+	  trunk/fuse/z80/tests/fdcb76.out, trunk/fuse/z80/tests/fdcb77.out,
+	  trunk/fuse/z80/tests/fdcb78.out, trunk/fuse/z80/tests/fdcb7a.out,
+	  trunk/fuse/z80/tests/fdcb7b.out, trunk/fuse/z80/tests/fdcb7c.out,
+	  trunk/fuse/z80/tests/fdcb7d.out, trunk/fuse/z80/tests/fdcb7e.out,
+	  trunk/fuse/z80/z80_macros.h, trunk/libspectrum/libspectrum.h,
+	  trunk/libspectrum/libspectrum/doc/libspectrum.txt,
+	  trunk/libspectrum/libspectrum/hacking/ChangeLog,
+	  trunk/libspectrum/libspectrum/libspectrum.h.in,
+	  trunk/libspectrum/libspectrum/tape.c,
+	  trunk/libspectrum/libspectrum/tape_block.c: Merge up to
+	  libspectrum-20060812 and fuse-20060825.
+
+2006-08-31 13:34  fred
+
+	* trunk/fuse/ui/sdl/sdlkeyboard.c: Only allow quit from windowed
+	  mode.
+
+2006-08-31 08:14  fred
+
+	* trunk/README: Correct bzip2 directory name in build instructions
+
+2006-08-31 08:02  fred
+
+	* trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.h,
+	  trunk/fuse/hacking/implementation_notes.txt,
+	  trunk/fuse/machine.c, trunk/fuse/machine.h,
+	  trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+	  trunk/fuse/machines/specplus3.c, trunk/fuse/memory.c,
+	  trunk/fuse/scld.c, trunk/fuse/screenshot.c,
+	  trunk/fuse/z80/z80_ops.c: Merge in changes from
+	  fuse_interpolate_animation branch (rev 194:207), which now
+	  comprise moving back to the (fixed) version of the standard Fuse
+	  "new" renderer, but incorporating the following from my version:
+	  * Restore rev 173 and move display_plot* over to the UIs and
+	  remove the screen copy in display.c * Move border updating into
+	  the dirty system, fix updating of last border line after it has
+	  already been drawn, more tweaks to frame rates in different
+	  circumstances. * Don't update the screen more than 25 times a
+	  frame when loading from tape only. * Make numbers a little less
+	  magic. * Restore display_last_screen for less overdraw in
+	  screen/mode switch situations. * Minor event optimisations.
+
+2006-08-29 14:26  fred
+
+	* trunk/fuse/display.c, trunk/fuse/memory.c,
+	  trunk/fuse/sound/sdlsound.c, trunk/fuse/timer.c: Merge in 20ms
+	  per frame cap to free up emulation speed in OS X.
+
+2006-08-24 12:03  fred
+
+	* trunk/fuse/memory.c: Fix Shock II again (arrgh!!!)
+
+2006-08-18 01:25  fred
+
+	* trunk/fuse/display.c, trunk/fuse/machine.h, trunk/fuse/memory.c,
+	  trunk/fuse/z80/z80_ops.c: Fix bugs arising from removal of
+	  display events from event system.
+
+2006-08-16 13:12  fred
+
+	* trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.c,
+	  trunk/fuse/event.h, trunk/fuse/machine.c, trunk/fuse/memory.c,
+	  trunk/fuse/z80/z80_ops.c: Remove display events from event
+	  system.
+
+2006-08-15 01:17  fred
+
+	* trunk/fuse/display.c: Hoist common expression.
+
+2006-08-14 13:44  fred
+
+	* trunk/fuse/fusepb/controllers/PreferencesController.m,
+	  trunk/fuse/settings.pl: Fix preferences reset.
+
+2006-08-14 13:42  fred
+
+	* trunk/fuse/fusepb/settings.pl: Remove defunct file (now use
+	  ../setttings.pl)
+
+2006-08-14 13:40  fred
+
+	* trunk/fuse/fusepb/controllers/FuseController.m: Remove debugging
+	  fprintf
+
+2006-08-14 13:38  fred
+
+	* trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Don't
+	  hide printer enabled checkbox when printer enabled.
+
+2006-08-14 13:37  fred
+
+	* trunk/fuse/ui/sdl/sdldisplay.c: Fix tape icon display before a
+	  tape is played.
+
+2006-08-14 13:35  fred
+
+	* trunk/fuse/ui/sdl/sdlkeyboard.c: Also ignore right command (meta)
+	  key
+
+2006-08-12 04:19  fred
+
+	* trunk/fuse/display.c, trunk/fuse/display.h,
+	  trunk/fuse/machines/spec128.c, trunk/fuse/memory.c,
+	  trunk/fuse/scld.c: Put chunks on a checklist when written to and
+	  shortcircuit ULA reads where there have been no changes.
+
+2006-08-09 12:20  fred
+
+	* trunk/fuse/display.c, trunk/fuse/display.h: Make display_get_addr
+	  a macro and make border_changes an array rather than a gslist.
+
+2006-08-09 02:57  fred
+
+	* trunk/fuse/event.c: Display events are frequent and nearly always
+	  added to the front, and there is only one outstanding at any one
+	  time. Add a dedicated slot for display events which are being
+	  added to the head of the queue.
+
+2006-08-08 13:34  fred
+
+	* trunk/fuse/display.c: Bulk allocate border changes.
+
+2006-08-07 13:56  fred
+
+	* trunk/fuse/display.c: Don't use get_beam_posision in
+	  display_write, replace the three individual display cache
+	  elements into a single word for faster aligned access.
+
+2006-08-07 13:55  fred
+
+	* trunk/fuse/event.c: Use a single free element pointer rather than
+	  a list for more speed.
+
+2006-08-07 00:57  fred
+
+	* trunk/fuse/display.c, trunk/fuse/display.h,
+	  trunk/fuse/fusepb/thumbnail.m, trunk/fuse/screenshot.c,
+	  trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/ggi/ggidisplay.c,
+	  trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/sdl/sdldisplay.c,
+	  trunk/fuse/ui/svga/svgadisplay.c, trunk/fuse/ui/uidisplay.h,
+	  trunk/fuse/ui/win32/win32display.c,
+	  trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/uidisplay.c: Move
+	  display_plot* and display_putpixel to the ui level to cut out the
+	  extra copy in the SDL UI, remove display_image and replace with
+	  display_getpixel.
+
+2006-08-06 13:51  fred
+
+	* trunk/fuse/event.c: Use free event list to store event obects.
+
+2006-08-01 13:30  fred
+
+	* trunk/fuse/display.c: Integrate border with display_last_screen
+	  and use display_plot8 for drawing
+
+2006-08-01 05:24  fred
+
+	* trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj,
+	  trunk/fuse/fusepb/controllers/FuseController.m,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Complete
+	  integration of merge up to fuse-20060731
+
+2006-07-31 14:27  fred
+
+	* trunk/fuse/Makefile.am, trunk/fuse/display.c,
+	  trunk/fuse/display.h, trunk/fuse/event.c, trunk/fuse/event.h,
+	  trunk/fuse/fuse.cpp, trunk/fuse/hacking/ChangeLog,
+	  trunk/fuse/hacking/implementation_notes.txt,
+	  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_48.szx,
+	  trunk/fuse/lib/compressed/tape_pentagon.szx,
+	  trunk/fuse/lib/compressed/tape_plus2.szx,
+	  trunk/fuse/lib/compressed/tape_scorpion.szx,
+	  trunk/fuse/lib/compressed/tape_ts2068.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_48.szx,
+	  trunk/fuse/lib/uncompressed/tape_pentagon.szx,
+	  trunk/fuse/lib/uncompressed/tape_plus2.szx,
+	  trunk/fuse/lib/uncompressed/tape_scorpion.szx,
+	  trunk/fuse/lib/uncompressed/tape_ts2068.szx, trunk/fuse/loader.c,
+	  trunk/fuse/loader.h, trunk/fuse/machine.c, trunk/fuse/machine.h,
+	  trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+	  trunk/fuse/machines/specplus3.c, trunk/fuse/man/fuse.1,
+	  trunk/fuse/memory.c, trunk/fuse/menu.c, trunk/fuse/scld.c,
+	  trunk/fuse/screenshot.c, trunk/fuse/settings.dat,
+	  trunk/fuse/spectrum.c, trunk/fuse/tape.c, trunk/fuse/tape.h,
+	  trunk/fuse/ui/options.dat, trunk/fuse/ula.c,
+	  trunk/fuse/z80/tests/03.out, trunk/fuse/z80/tests/09.out,
+	  trunk/fuse/z80/tests/0b.out, trunk/fuse/z80/tests/10.out,
+	  trunk/fuse/z80/tests/13.out, trunk/fuse/z80/tests/19.out,
+	  trunk/fuse/z80/tests/1b.out, trunk/fuse/z80/tests/23.out,
+	  trunk/fuse/z80/tests/29.out, trunk/fuse/z80/tests/2b.out,
+	  trunk/fuse/z80/tests/33.out, trunk/fuse/z80/tests/39.out,
+	  trunk/fuse/z80/tests/3b.out, trunk/fuse/z80/tests/c0_1.out,
+	  trunk/fuse/z80/tests/c0_2.out, trunk/fuse/z80/tests/c5.out,
+	  trunk/fuse/z80/tests/c7.out, trunk/fuse/z80/tests/c8_1.out,
+	  trunk/fuse/z80/tests/c8_2.out, trunk/fuse/z80/tests/cf.out,
+	  trunk/fuse/z80/tests/d0_1.out, trunk/fuse/z80/tests/d0_2.out,
+	  trunk/fuse/z80/tests/d5.out, trunk/fuse/z80/tests/d7.out,
+	  trunk/fuse/z80/tests/d8_1.out, trunk/fuse/z80/tests/d8_2.out,
+	  trunk/fuse/z80/tests/dd09.out, trunk/fuse/z80/tests/dd19.out,
+	  trunk/fuse/z80/tests/dd23.out, trunk/fuse/z80/tests/dd29.out,
+	  trunk/fuse/z80/tests/dd2b.out, trunk/fuse/z80/tests/dd39.out,
+	  trunk/fuse/z80/tests/dde5.out, trunk/fuse/z80/tests/ddf9.out,
+	  trunk/fuse/z80/tests/df.out, trunk/fuse/z80/tests/e0_1.out,
+	  trunk/fuse/z80/tests/e0_2.out, trunk/fuse/z80/tests/e5.out,
+	  trunk/fuse/z80/tests/e7.out, trunk/fuse/z80/tests/e8_1.out,
+	  trunk/fuse/z80/tests/e8_2.out, trunk/fuse/z80/tests/ed42.out,
+	  trunk/fuse/z80/tests/ed47.out, trunk/fuse/z80/tests/ed4a.out,
+	  trunk/fuse/z80/tests/ed4f.out, trunk/fuse/z80/tests/ed52.out,
+	  trunk/fuse/z80/tests/ed57.out, trunk/fuse/z80/tests/ed5a.out,
+	  trunk/fuse/z80/tests/ed5f.out, trunk/fuse/z80/tests/ed62.out,
+	  trunk/fuse/z80/tests/ed6a.out, trunk/fuse/z80/tests/ed72.out,
+	  trunk/fuse/z80/tests/ed7a.out, trunk/fuse/z80/tests/eda2.out,
+	  trunk/fuse/z80/tests/eda3.out, trunk/fuse/z80/tests/edaa.out,
+	  trunk/fuse/z80/tests/edab.out, trunk/fuse/z80/tests/edb2.out,
+	  trunk/fuse/z80/tests/edb3.out, trunk/fuse/z80/tests/edba.out,
+	  trunk/fuse/z80/tests/edbb.out, trunk/fuse/z80/tests/ef.out,
+	  trunk/fuse/z80/tests/f0_1.out, trunk/fuse/z80/tests/f0_2.out,
+	  trunk/fuse/z80/tests/f5.out, trunk/fuse/z80/tests/f7.out,
+	  trunk/fuse/z80/tests/f8_1.out, trunk/fuse/z80/tests/f8_2.out,
+	  trunk/fuse/z80/tests/f9.out, trunk/fuse/z80/tests/fd09.out,
+	  trunk/fuse/z80/tests/fd19.out, trunk/fuse/z80/tests/fd23.out,
+	  trunk/fuse/z80/tests/fd29.out, trunk/fuse/z80/tests/fd2b.out,
+	  trunk/fuse/z80/tests/fd39.out, trunk/fuse/z80/tests/fde5.out,
+	  trunk/fuse/z80/tests/fdf9.out, trunk/fuse/z80/tests/ff.out,
+	  trunk/fuse/z80/z80.c, trunk/fuse/z80/z80.pl,
+	  trunk/fuse/z80/z80_macros.h: Merge up to fuse-20060731
+
+2006-07-30 13:15  fred
+
+	* trunk/fuse/widget/menu.c: Fix apparent bug with writing PNG
+	  screenshots in widget interface
+
+2006-07-29 07:55  fred
+
+	* trunk/fuse/display.c, trunk/fuse/display.h, trunk/fuse/event.c,
+	  trunk/fuse/event.h, trunk/fuse/hacking/implementation_notes.txt,
+	  trunk/fuse/machine.c, trunk/fuse/machine.h,
+	  trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c,
+	  trunk/fuse/machines/specplus3.c, trunk/fuse/memory.c,
+	  trunk/fuse/scld.c, trunk/fuse/screenshot.c: New character based
+	  renderer fixes regressions with various demos and mixed mode
+	  Timex screens.
+
+2006-07-27 12:06  fred
+
+	* trunk/fuse/display.c, trunk/fuse/hacking/ChangeLog,
+	  trunk/fuse/machines/ts2068.c, trunk/fuse/screenshot.c,
+	  trunk/fuse/screenshot.h, trunk/fuse/ui/gtk/gtkui.c,
+	  trunk/fuse/ui/options.dat, trunk/fuse/widget/menu.c,
+	  trunk/fuse/z80/tests/README, trunk/fuse/z80/tests/dd00.in,
+	  trunk/fuse/z80/tests/dd00.out, trunk/fuse/z80/tests/ddfd00.in,
+	  trunk/fuse/z80/tests/ddfd00.out, trunk/fuse/z80/z80.pl,
+	  trunk/fuse/z80/z80_macros.h: Merge up to fuse-20060726.
+
+2006-07-27 10:39  fred
+
+	* trunk/fuse/fuse.cpp: Reenable sound after a pause.
+
+2006-07-26 12:38  fred
+
+	* trunk/fuse/fusepb/settings.pl: Make tape autoload snap for ts2068
+	  work with case sensitive filesystems.
+
+2006-07-26 12:37  fred
+
+	* trunk/fuse/machines/ts2068.c, trunk/fuse/settings.dat,
+	  trunk/fuse/settings.pl: Make tape autoload snap for ts2068 work
+	  with case sensitive filesystems.
+
+2006-07-23 22:19  fred
+
+	* trunk/fuse/fusepb/sdlscreenshot.m: Fix png saving for Intel
+	  machines.
+
+2006-07-20 14:22  fred
+
+	* trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Add
+	  setting to adjust microdrive cartridge size.
+
+2006-07-18 14:06  fred
+
+	* trunk/fuse/fusepb/English.lproj/InfoPlist.strings,
+	  trunk/fuse/fusepb/Info-Fuse.plist,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Use
+	  date for release numbers for beta.
+
+2006-07-18 12:38  fred
+
+	* trunk/FuseImporter/LibspectrumMetadataImporter.m: Get
+	  FuseImporter to recognise RLE pulse blocks too.
+
+2006-07-18 12:26  fred
+
+	* trunk/fuse/fusepb/controllers/FuseController.m,
+	  trunk/libspectrum/libspectrum/tape.c: Fix to allow loading of csw
+	  and raw files, add libspectrum block description for csw/raw
+	  files.
+
+2006-07-17 12:42  fred
+
+	* trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj,
+	  trunk/FuseImporter/Info.plist, trunk/FuseImporter/libspectrum.h:
+	  Bring FuseImporter up to date with libspectrum-20060716.
+
+2006-07-17 12:23  fred
+
+	* trunk/fuse/.cvsignore, trunk/fuse/AUTHORS, trunk/fuse/COPYING,
+	  trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/README,
+	  trunk/fuse/THANKS, trunk/fuse/TODO, trunk/fuse/acinclude.m4,
+	  trunk/fuse/autogen.sh, trunk/fuse/ay.c, trunk/fuse/ay.h,
+	  trunk/fuse/compat.h, trunk/fuse/compat/.cvsignore,
+	  trunk/fuse/compat/Makefile.am, trunk/fuse/compat/dirname.c,
+	  trunk/fuse/compat/getopt.c, trunk/fuse/compat/getopt.h,
+	  trunk/fuse/compat/getopt1.c, trunk/fuse/compat/mkstemp.c,
+	  trunk/fuse/configure.in, trunk/fuse/dck.c, trunk/fuse/dck.h,
+	  trunk/fuse/debugger/.cvsignore, trunk/fuse/debugger/Makefile.am,
+	  trunk/fuse/debugger/breakpoint.c,
+	  trunk/fuse/debugger/breakpoint.h, trunk/fuse/debugger/command.c,
+	  trunk/fuse/debugger/commandl.l, trunk/fuse/debugger/commandy.y,
+	  trunk/fuse/debugger/debugger.c, trunk/fuse/debugger/debugger.h,
+	  trunk/fuse/debugger/debugger_internals.h,
+	  trunk/fuse/debugger/disassemble.c,
+	  trunk/fuse/debugger/expression.c, trunk/fuse/display.c,
+	  trunk/fuse/display.h, trunk/fuse/divide.c, trunk/fuse/divide.h,
+	  trunk/fuse/event.c, trunk/fuse/event.h, trunk/fuse/fuse.cpp,
+	  trunk/fuse/fuse.h,
+	  trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj,
+	  trunk/fuse/fusepb/Info-Fuse.plist,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/info.nib,
+	  trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib,
+	  trunk/fuse/fusepb/resources/Fuse Help/html/menus.html,
+	  trunk/fuse/fusepb/resources/csw.icns,
+	  trunk/fuse/fusepb/resources/raw.icns,
+	  trunk/fuse/hacking/.cvsignore, trunk/fuse/hacking/ChangeLog,
+	  trunk/fuse/hacking/Makefile.am,
+	  trunk/fuse/hacking/coding_style.txt, trunk/fuse/hacking/cvs-tags,
+	  trunk/fuse/hacking/implementation_notes.txt,
+	  trunk/fuse/hacking/input.txt, trunk/fuse/hacking/sound.txt,
+	  trunk/fuse/hacking/tc2048_tech_notes.txt,
+	  trunk/fuse/hacking/timer.txt, trunk/fuse/hacking/ui.txt,
+	  trunk/fuse/ide.c, trunk/fuse/ide.h, trunk/fuse/if1.c,
+	  trunk/fuse/if1.h, trunk/fuse/if2.c, trunk/fuse/if2.h,
+	  trunk/fuse/input.c, trunk/fuse/input.h, trunk/fuse/joystick.c,
+	  trunk/fuse/joystick.h, trunk/fuse/kempmouse.c,
+	  trunk/fuse/kempmouse.h, trunk/fuse/keyboard.c,
+	  trunk/fuse/keyboard.h, trunk/fuse/keysyms.dat,
+	  trunk/fuse/lib/.cvsignore, trunk/fuse/lib/Makefile.am,
+	  trunk/fuse/lib/cassette.bmp,
+	  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/keyboard.scr, trunk/fuse/lib/microdrive.bmp,
+	  trunk/fuse/lib/plus3disk.bmp,
+	  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/machine.h,
+	  trunk/fuse/machines/.cvsignore, trunk/fuse/machines/Makefile.am,
+	  trunk/fuse/machines/machines.h, trunk/fuse/machines/pentagon.c,
+	  trunk/fuse/machines/scorpion.c, trunk/fuse/machines/scorpion.h,
+	  trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec128.h,
+	  trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c,
+	  trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c,
+	  trunk/fuse/machines/specplus2.c,
+	  trunk/fuse/machines/specplus2a.c,
+	  trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h,
+	  trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c,
+	  trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h,
+	  trunk/fuse/machines/ts2068.c, trunk/fuse/man/.cvsignore,
+	  trunk/fuse/man/Makefile.am, trunk/fuse/man/fuse.1,
+	  trunk/fuse/memory.c, trunk/fuse/memory.h, trunk/fuse/menu.c,
+	  trunk/fuse/menu.h, trunk/fuse/menu_data.c,
+	  trunk/fuse/menu_data.pl, trunk/fuse/periph.c,
+	  trunk/fuse/periph.h, trunk/fuse/perl/.cvsignore,
+	  trunk/fuse/perl/Fuse.pm, trunk/fuse/perl/Fuse/.cvsignore,
+	  trunk/fuse/perl/Fuse/Dialog.pm, trunk/fuse/perl/Fuse/Makefile.am,
+	  trunk/fuse/perl/Makefile.am, trunk/fuse/pokefinder/.cvsignore,
+	  trunk/fuse/pokefinder/Makefile.am,
+	  trunk/fuse/pokefinder/pokefinder.c,
+	  trunk/fuse/pokefinder/pokefinder.h, trunk/fuse/printer.c,
+	  trunk/fuse/printer.h, trunk/fuse/profile.c, trunk/fuse/profile.h,
+	  trunk/fuse/psg.c, trunk/fuse/psg.h, trunk/fuse/roms/.cvsignore,
+	  trunk/fuse/roms/128-0.rom, trunk/fuse/roms/128-1.rom,
+	  trunk/fuse/roms/128p-0.rom, trunk/fuse/roms/128p-1.rom,
+	  trunk/fuse/roms/256s-0.rom, trunk/fuse/roms/256s-1.rom,
+	  trunk/fuse/roms/256s-2.rom, trunk/fuse/roms/256s-3.rom,
+	  trunk/fuse/roms/48.rom, trunk/fuse/roms/Makefile.am,
+	  trunk/fuse/roms/if1-1.rom, trunk/fuse/roms/if1-2.rom,
+	  trunk/fuse/roms/plus2-0.rom, trunk/fuse/roms/plus2-1.rom,
+	  trunk/fuse/roms/plus3-0.rom, trunk/fuse/roms/plus3-1.rom,
+	  trunk/fuse/roms/plus3-2.rom, trunk/fuse/roms/plus3-3.rom,
+	  trunk/fuse/roms/plus3e-0.rom, trunk/fuse/roms/plus3e-1.rom,
+	  trunk/fuse/roms/plus3e-2.rom, trunk/fuse/roms/plus3e-3.rom,
+	  trunk/fuse/roms/se-0.rom, trunk/fuse/roms/se-1.rom,
+	  trunk/fuse/roms/tc2048.rom, trunk/fuse/roms/tc2068-0.rom,
+	  trunk/fuse/roms/tc2068-1.rom, trunk/fuse/roms/trdos.rom,
+	  trunk/fuse/rzx.c, trunk/fuse/rzx.h, trunk/fuse/scld.c,
+	  trunk/fuse/scld.h, trunk/fuse/screenshot.c,
+	  trunk/fuse/screenshot.h, trunk/fuse/settings.dat,
+	  trunk/fuse/simpleide.c, trunk/fuse/simpleide.h, trunk/fuse/slt.c,
+	  trunk/fuse/slt.h, trunk/fuse/snapshot.c, trunk/fuse/snapshot.h,
+	  trunk/fuse/sound.c, trunk/fuse/sound.h,
+	  trunk/fuse/sound/.cvsignore, trunk/fuse/sound/Makefile.am,
+	  trunk/fuse/sound/aosound.c, trunk/fuse/sound/dxsound.c,
+	  trunk/fuse/sound/hpsound.c, trunk/fuse/sound/lowlevel.h,
+	  trunk/fuse/sound/nullsound.c, trunk/fuse/sound/osssound.c,
+	  trunk/fuse/sound/sdlsound.c, trunk/fuse/sound/sfifo.c,
+	  trunk/fuse/sound/sfifo.h, trunk/fuse/sound/sunsound.c,
+	  trunk/fuse/spectrum.c, trunk/fuse/spectrum.h, trunk/fuse/tape.c,
+	  trunk/fuse/tape.h, trunk/fuse/timer.c, trunk/fuse/timer.h,
+	  trunk/fuse/trdos.c, trunk/fuse/trdos.h, trunk/fuse/ui.c,
+	  trunk/fuse/ui/.cvsignore, trunk/fuse/ui/Makefile.am,
+	  trunk/fuse/ui/aalib/.cvsignore, trunk/fuse/ui/aalib/Makefile.am,
+	  trunk/fuse/ui/aalib/aalibdisplay.c,
+	  trunk/fuse/ui/aalib/aalibkeyboard.c,
+	  trunk/fuse/ui/aalib/aalibkeyboard.h,
+	  trunk/fuse/ui/aalib/aalibui.c, trunk/fuse/ui/aalib/aalibui.h,
+	  trunk/fuse/ui/aalib/error.c, trunk/fuse/ui/fb/.cvsignore,
+	  trunk/fuse/ui/fb/Makefile.am, trunk/fuse/ui/fb/fbdisplay.c,
+	  trunk/fuse/ui/fb/fbdisplay.h, trunk/fuse/ui/fb/fbjoystick.c,
+	  trunk/fuse/ui/fb/fbkeyboard.c, trunk/fuse/ui/fb/fbkeyboard.h,
+	  trunk/fuse/ui/fb/fbmouse.c, trunk/fuse/ui/fb/fbmouse.h,
+	  trunk/fuse/ui/fb/fbui.c, trunk/fuse/ui/ggi/.cvsignore,
+	  trunk/fuse/ui/ggi/Makefile.am, trunk/fuse/ui/ggi/ggi_internals.h,
+	  trunk/fuse/ui/ggi/ggidisplay.c, trunk/fuse/ui/ggi/ggikeyboard.c,
+	  trunk/fuse/ui/ggi/ggiui.c, trunk/fuse/ui/gtk/.cvsignore,
+	  trunk/fuse/ui/gtk/Makefile.am, trunk/fuse/ui/gtk/binary.c,
+	  trunk/fuse/ui/gtk/browse.c, trunk/fuse/ui/gtk/confirm.c,
+	  trunk/fuse/ui/gtk/debugger.c, trunk/fuse/ui/gtk/fileselector.c,
+	  trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/gtk/gtkinternals.h,
+	  trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkkeyboard.c,
+	  trunk/fuse/ui/gtk/gtkmouse.c, trunk/fuse/ui/gtk/gtkui.c,
+	  trunk/fuse/ui/gtk/memory.c, trunk/fuse/ui/gtk/picture.c,
+	  trunk/fuse/ui/gtk/pixmaps.c, trunk/fuse/ui/gtk/pokefinder.c,
+	  trunk/fuse/ui/gtk/rollback.c, trunk/fuse/ui/gtk/roms.c,
+	  trunk/fuse/ui/gtk/statusbar.c, trunk/fuse/ui/gtk/stock.c,
+	  trunk/fuse/ui/options.dat, trunk/fuse/ui/scaler/.cvsignore,
+	  trunk/fuse/ui/scaler/Makefile.am, trunk/fuse/ui/scaler/scaler.c,
+	  trunk/fuse/ui/scaler/scaler.h,
+	  trunk/fuse/ui/scaler/scaler_internals.h,
+	  trunk/fuse/ui/sdl/.cvsignore, trunk/fuse/ui/sdl/Makefile.am,
+	  trunk/fuse/ui/sdl/sdldisplay.c, trunk/fuse/ui/sdl/sdldisplay.h,
+	  trunk/fuse/ui/sdl/sdljoystick.c, trunk/fuse/ui/sdl/sdljoystick.h,
+	  trunk/fuse/ui/sdl/sdlkeyboard.c, trunk/fuse/ui/sdl/sdlkeyboard.h,
+	  trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/svga/.cvsignore,
+	  trunk/fuse/ui/svga/Makefile.am, trunk/fuse/ui/svga/svgadisplay.c,
+	  trunk/fuse/ui/svga/svgadisplay.h,
+	  trunk/fuse/ui/svga/svgajoystick.c,
+	  trunk/fuse/ui/svga/svgakeyboard.c,
+	  trunk/fuse/ui/svga/svgakeyboard.h, trunk/fuse/ui/svga/svgaui.c,
+	  trunk/fuse/ui/ui.h, trunk/fuse/ui/uidisplay.h,
+	  trunk/fuse/ui/uijoystick.c, trunk/fuse/ui/uijoystick.h,
+	  trunk/fuse/ui/win32/.cvsignore, trunk/fuse/ui/win32/Makefile.am,
+	  trunk/fuse/ui/win32/debugger.c, trunk/fuse/ui/win32/debugger.h,
+	  trunk/fuse/ui/win32/debugger.rc, trunk/fuse/ui/win32/del_o.bat,
+	  trunk/fuse/ui/win32/error.c,
+	  trunk/fuse/ui/win32/icons/disk_active.bmp,
+	  trunk/fuse/ui/win32/icons/disk_inactive.bmp,
+	  trunk/fuse/ui/win32/icons/pause_active.bmp,
+	  trunk/fuse/ui/win32/icons/pause_inactive.bmp,
+	  trunk/fuse/ui/win32/icons/tape_active.bmp,
+	  trunk/fuse/ui/win32/icons/tape_inactive.bmp,
+	  trunk/fuse/ui/win32/icons/tape_marker.bmp,
+	  trunk/fuse/ui/win32/keysyms.c, trunk/fuse/ui/win32/menu_data.c,
+	  trunk/fuse/ui/win32/menu_data.h,
+	  trunk/fuse/ui/win32/menu_data.rc,
+	  trunk/fuse/ui/win32/pokefinder.c,
+	  trunk/fuse/ui/win32/pokefinder.h,
+	  trunk/fuse/ui/win32/pokefinder.rc,
+	  trunk/fuse/ui/win32/statusbar.c, trunk/fuse/ui/win32/todo.txt,
+	  trunk/fuse/ui/win32/win32display.c,
+	  trunk/fuse/ui/win32/win32display.h,
+	  trunk/fuse/ui/win32/win32internals.h,
+	  trunk/fuse/ui/win32/win32keyboard.c,
+	  trunk/fuse/ui/win32/win32keyboard.h,
+	  trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/win32/win32ui.rc,
+	  trunk/fuse/ui/xlib/.cvsignore, trunk/fuse/ui/xlib/Makefile.am,
+	  trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/ui/xlib/xdisplay.h,
+	  trunk/fuse/ui/xlib/xerror.c, trunk/fuse/ui/xlib/xjoystick.c,
+	  trunk/fuse/ui/xlib/xkeyboard.c, trunk/fuse/ui/xlib/xkeyboard.h,
+	  trunk/fuse/ui/xlib/xui.c, trunk/fuse/ui/xlib/xui.h,
+	  trunk/fuse/uidisplay.c, trunk/fuse/ula.c, trunk/fuse/ula.h,
+	  trunk/fuse/utils.c, trunk/fuse/utils.h,
+	  trunk/fuse/widget/.cvsignore, trunk/fuse/widget/Makefile.am,
+	  trunk/fuse/widget/browse.c, trunk/fuse/widget/debugger.c,
+	  trunk/fuse/widget/error.c, trunk/fuse/widget/filesel.c,
+	  trunk/fuse/widget/fuse.font.sbf, trunk/fuse/widget/memory.c,
+	  trunk/fuse/widget/menu.c, trunk/fuse/widget/mkfusefont.pl,
+	  trunk/fuse/widget/picture.c, trunk/fuse/widget/pokefinder.c,
+	  trunk/fuse/widget/query.c, trunk/fuse/widget/roms.c,
+	  trunk/fuse/widget/select.c, trunk/fuse/widget/text.c,
+	  trunk/fuse/widget/widget.c, trunk/fuse/widget/widget.h,
+	  trunk/fuse/widget/widget_internals.h, trunk/fuse/z80/.cvsignore,
+	  trunk/fuse/z80/Makefile.am, trunk/fuse/z80/coretest.c,
+	  trunk/fuse/z80/opcodes_base.dat, trunk/fuse/z80/opcodes_cb.dat,
+	  trunk/fuse/z80/opcodes_ddfd.dat,
+	  trunk/fuse/z80/opcodes_ddfdcb.dat, trunk/fuse/z80/opcodes_ed.dat,
+	  trunk/fuse/z80/tests/.cvsignore, trunk/fuse/z80/tests/00.in,
+	  trunk/fuse/z80/tests/00.out, trunk/fuse/z80/tests/01.in,
+	  trunk/fuse/z80/tests/01.out, trunk/fuse/z80/tests/02.in,
+	  trunk/fuse/z80/tests/02.out, trunk/fuse/z80/tests/03.in,
+	  trunk/fuse/z80/tests/03.out, trunk/fuse/z80/tests/04.in,
+	  trunk/fuse/z80/tests/04.out, trunk/fuse/z80/tests/05.in,
+	  trunk/fuse/z80/tests/05.out, trunk/fuse/z80/tests/06.in,
+	  trunk/fuse/z80/tests/06.out, trunk/fuse/z80/tests/07.in,
+	  trunk/fuse/z80/tests/07.out, trunk/fuse/z80/tests/08.in,
+	  trunk/fuse/z80/tests/08.out, trunk/fuse/z80/tests/09.in,
+	  trunk/fuse/z80/tests/09.out, trunk/fuse/z80/tests/0a.in,
+	  trunk/fuse/z80/tests/0a.out, trunk/fuse/z80/tests/0b.in,
+	  trunk/fuse/z80/tests/0b.out, trunk/fuse/z80/tests/0c.in,
+	  trunk/fuse/z80/tests/0c.out, trunk/fuse/z80/tests/0d.in,
+	  trunk/fuse/z80/tests/0d.out, trunk/fuse/z80/tests/0e.in,
+	  trunk/fuse/z80/tests/0e.out, trunk/fuse/z80/tests/0f.in,
+	  trunk/fuse/z80/tests/0f.out, trunk/fuse/z80/tests/10.in,
+	  trunk/fuse/z80/tests/10.out, trunk/fuse/z80/tests/11.in,
+	  trunk/fuse/z80/tests/11.out, trunk/fuse/z80/tests/12.in,
+	  trunk/fuse/z80/tests/12.out, trunk/fuse/z80/tests/13.in,
+	  trunk/fuse/z80/tests/13.out, trunk/fuse/z80/tests/14.in,
+	  trunk/fuse/z80/tests/14.out, trunk/fuse/z80/tests/15.in,
+	  trunk/fuse/z80/tests/15.out, trunk/fuse/z80/tests/16.in,
+	  trunk/fuse/z80/tests/16.out, trunk/fuse/z80/tests/17.in,
+	  trunk/fuse/z80/tests/17.out, trunk/fuse/z80/tests/18.in,
+	  trunk/fuse/z80/tests/18.out, trunk/fuse/z80/tests/19.in,
+	  trunk/fuse/z80/tests/19.out, trunk/fuse/z80/tests/1a.in,
+	  trunk/fuse/z80/tests/1a.out, trunk/fuse/z80/tests/1b.in,
+	  trunk/fuse/z80/tests/1b.out, trunk/fuse/z80/tests/1c.in,
+	  trunk/fuse/z80/tests/1c.out, trunk/fuse/z80/tests/1d.in,
+	  trunk/fuse/z80/tests/1d.out, trunk/fuse/z80/tests/1e.in,
+	  trunk/fuse/z80/tests/1e.out, trunk/fuse/z80/tests/1f.in,
+	  trunk/fuse/z80/tests/1f.out, trunk/fuse/z80/tests/20_1.in,
+	  trunk/fuse/z80/tests/20_1.out, trunk/fuse/z80/tests/20_2.in,
+	  trunk/fuse/z80/tests/20_2.out, trunk/fuse/z80/tests/21.in,
+	  trunk/fuse/z80/tests/21.out, trunk/fuse/z80/tests/22.in,
+	  trunk/fuse/z80/tests/22.out, trunk/fuse/z80/tests/23.in,
+	  trunk/fuse/z80/tests/23.out, trunk/fuse/z80/tests/24.in,
+	  trunk/fuse/z80/tests/24.out, trunk/fuse/z80/tests/25.in,
+	  trunk/fuse/z80/tests/25.out, trunk/fuse/z80/tests/26.in,
+	  trunk/fuse/z80/tests/26.out, trunk/fuse/z80/tests/27.in,
+	  trunk/fuse/z80/tests/27.out, trunk/fuse/z80/tests/28_1.in,
+	  trunk/fuse/z80/tests/28_1.out, trunk/fuse/z80/tests/28_2.in,
+	  trunk/fuse/z80/tests/28_2.out, trunk/fuse/z80/tests/29.in,
+	  trunk/fuse/z80/tests/29.out, trunk/fuse/z80/tests/2a.in,
+	  trunk/fuse/z80/tests/2a.out, trunk/fuse/z80/tests/2b.in,
+	  trunk/fuse/z80/tests/2b.out, trunk/fuse/z80/tests/2c.in,
+	  trunk/fuse/z80/tests/2c.out, trunk/fuse/z80/tests/2d.in,
+	  trunk/fuse/z80/tests/2d.out, trunk/fuse/z80/tests/2e.in,
+	  trunk/fuse/z80/tests/2e.out, trunk/fuse/z80/tests/2f.in,
+	  trunk/fus...
 
[truncated message content]

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [367] tags/Release-0_8_0_1/

From: <fr...@us...> - 2007-05-12 01:21:15

Revision: 367
          http://svn.sourceforge.net/fuse-for-macosx/?rev=367&view=rev
Author:   fredm
Date:     2007-05-11 18:21:14 -0700 (Fri, 11 May 2007)

Log Message:
-----------
Create Release-0_8_0_1 tag.

Added Paths:
-----------
    tags/Release-0_8_0_1/

Copied: tags/Release-0_8_0_1 (from rev 366, branches/Release-0_8_0)


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: [366] branches/Release-0_8_0

From: <fr...@us...> - 2007-05-12 01:09:14

Revision: 366
          http://svn.sourceforge.net/fuse-for-macosx/?rev=366&view=rev
Author:   fredm
Date:     2007-05-11 18:09:14 -0700 (Fri, 11 May 2007)

Log Message:
-----------
Merge up to vendor fuse-0.8.0.1 and libspectrum-0.3.0.1 releases.

Modified Paths:
--------------
    branches/Release-0_8_0/fuse/ChangeLog
    branches/Release-0_8_0/fuse/README
    branches/Release-0_8_0/fuse/acinclude.m4
    branches/Release-0_8_0/fuse/configure.in
    branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings
    branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist
    branches/Release-0_8_0/fuse/fusepb/config.h
    branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html
    branches/Release-0_8_0/fuse/hacking/ChangeLog
    branches/Release-0_8_0/fuse/hacking/cvs-tags
    branches/Release-0_8_0/fuse/hacking/ui.txt
    branches/Release-0_8_0/fuse/lib/Makefile.am
    branches/Release-0_8_0/fuse/machines/pentagon.c
    branches/Release-0_8_0/fuse/machines/scorpion.c
    branches/Release-0_8_0/fuse/machines/spec128.c
    branches/Release-0_8_0/fuse/machines/spec16.c
    branches/Release-0_8_0/fuse/machines/spec48.c
    branches/Release-0_8_0/fuse/man/fuse.1
    branches/Release-0_8_0/fuse/periph.c
    branches/Release-0_8_0/fuse/screenshot.c
    branches/Release-0_8_0/fuse/snapshot.c
    branches/Release-0_8_0/fuse/spectrum.c
    branches/Release-0_8_0/fuse/spectrum.h
    branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c
    branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c
    branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c
    branches/Release-0_8_0/fuse/ui/scaler/scaler.c
    branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp
    branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c
    branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c
    branches/Release-0_8_0/fuse/ui/uidisplay.h
    branches/Release-0_8_0/fuse/ui/win32/win32display.c
    branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c
    branches/Release-0_8_0/fuse/uidisplay.c
    branches/Release-0_8_0/fuse/ula.c
    branches/Release-0_8_0/fuse/ula.h
    branches/Release-0_8_0/fuse/widget/Makefile.am
    branches/Release-0_8_0/fuse/widget/menu.c
    branches/Release-0_8_0/fuse/widget/pokefinder.c
    branches/Release-0_8_0/libspectrum/Info.plist
    branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog
    branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am
    branches/Release-0_8_0/libspectrum/libspectrum/README
    branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4
    branches/Release-0_8_0/libspectrum/libspectrum/configure.in
    branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags
    branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3
    branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt
    branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog
    branches/Release-0_8_0/libspectrum/libspectrum/libspectrum.h.in
    branches/Release-0_8_0/libspectrum/libspectrum/tap.c
    branches/Release-0_8_0/libspectrum/libspectrum/tzx_read.c
    branches/Release-0_8_0/libspectrum/libspectrum.h
    branches/Release-0_8_0/libspectrum/libspectrum.xcodeproj/project.pbxproj

Added Paths:
-----------
    branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore
    branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am

Modified: branches/Release-0_8_0/fuse/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/ChangeLog	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ChangeLog	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,3 +1,22 @@
+2007-05-11  Philip Kendall  <phi...@sh...>
+
+	* Fuse 0.8.0.1 released (bug fix release)
+
+	* Fix IN timings and floating bus behaviour: fixes Sidewize (thanks,
+	  Pegaz and Mark Woodmass) (Philip Kendall).
+	* Fix widget UI pokefinder and keyboard help picture
+	  (thanks, Alberto Garcia) (Philip Kendall and Fredrick Meunier).
+	* Fix crash if fullscreen mode attempted a resolution higher than
+	  the native graphics mode could handle (thanks, Alberto Garcia)
+	  (Fredrick Meunier).
+	* Ensure ABS, MIN and PATH_MAX are available where needed (Fredrick
+	  Meunier).
+	* Distribute autoload snapshots (thanks, Stuart Brady and Arda
+	  Erdikmen) (Fredrick Meunier).
+	* Remove flicker when playing back RZX files with embedded
+	  snapshots (thanks, Julian Wiseman) (Fredrick Meunier).
+	* Remove warnings when building from CVS (Stuart Brady).
+
 2007-04-11  Philip Kendall  <phi...@sh...>
 
 	* Fuse 0.8.0 released
@@ -788,4 +807,4 @@
 
 	* Version 0.1.0 released.
 
-$Id: ChangeLog,v 1.46.2.1 2007/04/09 16:59:02 pak21 Exp $
+$Id: ChangeLog,v 1.46.2.2 2007/05/10 07:32:38 pak21 Exp $

Modified: branches/Release-0_8_0/fuse/README
===================================================================
--- branches/Release-0_8_0/fuse/README	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/README	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 0.8.0
-============================================
+The Free Unix Spectrum Emulator (Fuse) 0.8.0.1
+==============================================
 
 Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
 unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -139,6 +139,6 @@
 ( http://www.worldofspectrum.org/faq/index.html ) first!
 
 Philip Kendall <phi...@sh...>
-11 April 2007
+11 May 2007
 
-$Id: README,v 1.40.2.2 2007/04/11 08:44:19 pak21 Exp $
+$Id: README,v 1.40.2.3 2007/05/10 07:32:38 pak21 Exp $

Modified: branches/Release-0_8_0/fuse/acinclude.m4
===================================================================
--- branches/Release-0_8_0/fuse/acinclude.m4	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/acinclude.m4	2007-05-12 01:09:14 UTC (rev 366)
@@ -7,7 +7,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl
@@ -420,7 +420,7 @@
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl

Modified: branches/Release-0_8_0/fuse/configure.in
===================================================================
--- branches/Release-0_8_0/fuse/configure.in	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/configure.in	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155.2.2 2007/04/09 16:59:02 pak21 Exp $
+dnl $Id: configure.in,v 1.155.2.3 2007/05/10 07:32:38 pak21 Exp $
 
 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
@@ -24,7 +24,7 @@
 AC_CANONICAL_SYSTEM
 
 dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.8.0)
+AM_INIT_AUTOMAKE(fuse, 0.8.0.1)
 
 dnl Checks for programs.
 AC_PROG_CC

Modified: branches/Release-0_8_0/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/fusepb/Info-Fuse.plist	2007-05-12 01:09:14 UTC (rev 366)
@@ -365,7 +365,7 @@
 	<key>CFBundleSignature</key>
 	<string>FUSE</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.0</string>
+	<string>0.8.0.1</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain</string>
 	<key>NSPrincipalClass</key>

Modified: branches/Release-0_8_0/fuse/fusepb/config.h
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/config.h	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/fusepb/config.h	2007-05-12 01:09:14 UTC (rev 366)
@@ -169,7 +169,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.8.0"
+#define VERSION "0.8.0.1"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */

Modified: branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/fusepb/resources/Fuse Help/html/changelog.html	2007-05-12 01:09:14 UTC (rev 366)
@@ -14,7 +14,37 @@
  name="What's New In Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 0.8.0 of the Fuse emulator." --></font>
 <div class="refsect1" xml:lang="en" lang="en">
 <h2><font face="Lucida Grande,Helvetica,Arial">What's new in Fuse
-For Mac OS X 0.8.0</font></h2>
+For Mac OS X 0.8.0.1</font></h2>
+<ul>
+  <li><font face="Lucida Grande,Helvetica,Arial">Emulation core
+improvements:</font></li>
+  <li
+ style="list-style-type: none; list-style-image: none; list-style-position: outside;">
+    <ul>
+      <li><font face="Lucida Grande,Helvetica,Arial">Fix IN timings and
+floating bus behaviour: fixes Sidewize (thanks, Pegaz and Mark
+Woodmass) (Philip Kendall).</font></li>
+    </ul>
+  </li>
+  <li><font face="Lucida Grande,Helvetica,Arial">Miscellaneous </font><font
+ face="Lucida Grande,Helvetica,Arial">bugfixes</font><font
+ face="Lucida Grande,Helvetica,Arial">:</font></li>
+  <li
+ style="list-style-type: none; list-style-image: none; list-style-position: outside;">
+    <ul>
+      <li><font face="Lucida Grande,Helvetica,Arial">Fix crash if
+fullscreen mode attempted a resolution higher than the native graphics
+mode could handle (thanks, Alberto Garcia) (Fredrick Meunier).</font></li>
+      <li><font face="Lucida Grande,Helvetica,Arial">Remove flicker
+when playing back RZX files with embedded snapshots (thanks, Julian
+Wiseman) (Fredrick Meunier).</font></li>
+      <li><font face="Lucida Grande,Helvetica,Arial">Avoid crash when
+reading an invalid TZX file (thanks, crabfists) (Philip Kendall).</font></li>
+    </ul>
+  </li>
+</ul>
+<h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in Fuse
+For Mac OS X 0.8.0</font></font></h2>
 </div>
 <ul>
   <li><font face="Lucida Grande,Helvetica,Arial">New

Modified: branches/Release-0_8_0/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/hacking/ChangeLog	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/hacking/ChangeLog	2007-05-12 01:09:14 UTC (rev 366)
@@ -1582,4 +1582,37 @@
 	 Julian Wiseman) (Release-0_8_0-branch).
 20070411 README: these aren't all IDE interfaces (Release-0_8_0-branch).
 20070411 fuse.c: update copyright date to 2007 (Release-0_8_0-branch).
-20070411 TAG: Release-0_8_0 (Release-0_8_0-branch).
+20070416 widget/Makefile.am: distribute fuse.font.sbf and mkfusefont.pl
+         (Release-0_8_0-branch) (Fred).
+20070424 TAG: Release-0_8_0 (Release-0_8_0-branch).
+20070425 uidisplay.c,widget/menu.c: initialise border in help screen and
+         center keyboard picture on help screen (thanks, Alberto Garcia)
+         (Release-0_8_0-branch).
+20070425 widget/pokefinder.c: fix up for non-proportional display
+	 (thanks, Alberto Garcia) (Release-0_8_0-branch).
+20070428 hacking/ui.txt,ui/{uidisplay.h,fb/fbdisplay.c,ggi/ggidisplay.c,
+         gtk/gtkdisplay.c,scaler/scaler.c,sdl/sdldisplay.c,
+         svga/svgadisplay.c,win32/win32display.c,xlib/xdisplay.c}:
+         check that we don't exceed maximum fullscreen dimensions with
+         SDL UI and attempt a more graceful failure if things go wrong
+         (fixes bug #1708636; thanks Alberto Garcia) (Release-0_8_0-branch)
+         (Fred).
+20070501 screenshot.c: include limits.h for PATH_MAX (Release-0_8_0-branch)
+         (Fred).
+20070501 ui/scaler/scalers.c: make sure MIN and ABS are defined
+         (Release-0_8_0-branch) (Fred).
+20070503 periph.c,spectrum.[ch],ula.[ch],machines/{pentagon.c,scorpion.c,
+	 spec128.c,spec16.c,spec48.c}: fix IN timings and consequent fixes
+	 to floating bus behaviour (fixes bug #1708597) (thanks, Pegaz and
+	 Mark Woodmass) (Release-0_8_0-branch).
+20070507 lib/Makefile.am: distribute autoload snapshots
+         (thanks Stuart Brady and Arda Erdikmen) (Release-0_8_0-branch)
+         (Fred).
+20070509 snapshot.c: call machine_select() only if the machine has changed
+	 (fixes bug #1701246) (thanks, Julian Wiseman) (Release-0_8_0-branch)
+	 (Fred).
+20070509 acinclude.m4: remove warnings about underquoted definitions
+	 (Release-0_8_0-branch) (Stuart Brady).
+20070510 ChangeLog,README,configure.in,man/fuse.1: doc updates for 0.8.0.1
+	 release (Release-0_8_0-branch).
+20070511 TAG: Release-0_8_0_1 (Release-0_8_0-branch).

Modified: branches/Release-0_8_0/fuse/hacking/cvs-tags
===================================================================
--- branches/Release-0_8_0/fuse/hacking/cvs-tags	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/hacking/cvs-tags	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,6 +1,6 @@
 CVS tags for Fuse
 
-$Id: cvs-tags,v 1.32.2.2 2007/04/11 09:41:31 pak21 Exp $
+$Id: cvs-tags,v 1.32.2.3 2007/05/11 07:27:47 pak21 Exp $
 
 | Release-0_3_1
 | Release-0_3_2pre1
@@ -147,6 +147,7 @@
 | | Release-0_8_0-pre1
 | | Release-0_8_0-pre2
 | | Release-0_8_0
+| | Release-0_8_0_1
 | |
 | | Release-0_8_0-branch
 |

Modified: branches/Release-0_8_0/fuse/hacking/ui.txt
===================================================================
--- branches/Release-0_8_0/fuse/hacking/ui.txt	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/hacking/ui.txt	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 Some brief instructions on adding another user interface to Fuse
 ================================================================
 
-Version: $Id: ui.txt,v 1.9 2003/03/13 14:55:28 pak21 Exp $
+Version: $Id: ui.txt,v 1.9.14.1 2007/04/28 00:23:09 fredm Exp $
 
 In order to add a new user interface (UI) to Fuse, you need to
 implement:
@@ -71,7 +71,7 @@
 This is called at the end of every spectrum frame, giving the ui a
 chance to flush all the drawing done over the course of the frame.
 
-* void uidisplay_hotswap_gfx_mode( void )
+* int uidisplay_hotswap_gfx_mode( void )
 
 This is called when the user has changed the scaler in use by the
 emulator. The ui should change the window to a multiple of the

Modified: branches/Release-0_8_0/fuse/lib/Makefile.am
===================================================================
--- branches/Release-0_8_0/fuse/lib/Makefile.am	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/lib/Makefile.am	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 1999-2004 Philip Kendall
 
-## $Id: Makefile.am,v 1.15 2007/02/02 16:21:53 pak21 Exp $
+## $Id: Makefile.am,v 1.15.2.1 2007/05/07 12:54:24 fredm Exp $
 
 ## 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
@@ -26,9 +26,8 @@
 FILES = cassette.bmp \
 	keyboard.scr \
 	microdrive.bmp \
-	plus3disk.bmp
-
-noinst_FILES = @AUTOLOAD_SNAPS@/disk_plus3.szx \
+	plus3disk.bmp \
+	@AUTOLOAD_SNAPS@/disk_plus3.szx \
 	@AUTOLOAD_SNAPS@/tape_128.szx \
 	@AUTOLOAD_SNAPS@/tape_16.szx \
 	@AUTOLOAD_SNAPS@/tape_2048.szx \

Modified: branches/Release-0_8_0/fuse/machines/pentagon.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/pentagon.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/pentagon.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* pentagon.c: Pentagon 128K specific routines
-   Copyright (c) 1999-2004 Philip Kendall and Fredrick Meunier
+   Copyright (c) 1999-2007 Philip Kendall and Fredrick Meunier
 
-   $Id: pentagon.c,v 1.31 2007/02/02 16:21:54 pak21 Exp $
+   $Id: pentagon.c,v 1.31.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -84,7 +84,7 @@
 static libspectrum_byte
 pentagon_unattached_port( void )
 {
-  return spectrum_unattached_port( 3 );
+  return spectrum_unattached_port();
 }
 
 int

Modified: branches/Release-0_8_0/fuse/machines/scorpion.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/scorpion.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/scorpion.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,8 +1,7 @@
 /* scorpion.c: Scorpion 256K specific routines
-   Copyright (c) 1999-2004 Philip Kendall and Fredrick Meunier
-   Copyright (c) 2004 Stuart Brady
+   Copyright (c) 1999-2007 Philip Kendall, Fredrick Meunier and Stuart Brady
 
-   $Id: scorpion.c,v 1.24 2007/02/02 16:21:54 pak21 Exp $
+   $Id: scorpion.c,v 1.24.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -94,7 +93,7 @@
 static libspectrum_byte
 scorpion_unattached_port( void )
 {
-  return spectrum_unattached_port( 3 );
+  return spectrum_unattached_port();
 }
 
 static libspectrum_byte

Modified: branches/Release-0_8_0/fuse/machines/spec128.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec128.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/spec128.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* spec128.c: Spectrum 128K specific routines
-   Copyright (c) 1999-2004 Philip Kendall
+   Copyright (c) 1999-2007 Philip Kendall
 
-   $Id: spec128.c,v 1.77 2007/02/02 16:21:54 pak21 Exp $
+   $Id: spec128.c,v 1.77.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -61,7 +61,7 @@
 libspectrum_byte
 spec128_unattached_port( void )
 {
-  return spectrum_unattached_port( 3 );
+  return spectrum_unattached_port();
 }
 
 libspectrum_byte

Modified: branches/Release-0_8_0/fuse/machines/spec16.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec16.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/spec16.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* spec16.c: Spectrum 16K specific routines
-   Copyright (c) 1999-2005 Philip Kendall
+   Copyright (c) 1999-2007 Philip Kendall
 
-   $Id: spec16.c,v 1.32 2007/02/02 16:21:54 pak21 Exp $
+   $Id: spec16.c,v 1.32.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -61,7 +61,7 @@
 static libspectrum_byte
 spec16_unattached_port( void )
 {
-  return spectrum_unattached_port( 1 );
+  return spectrum_unattached_port();
 }
 
 int spec16_init( fuse_machine_info *machine )

Modified: branches/Release-0_8_0/fuse/machines/spec48.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec48.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/machines/spec48.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* spec48.c: Spectrum 48K specific routines
-   Copyright (c) 1999-2004 Philip Kendall
+   Copyright (c) 1999-2007 Philip Kendall
 
-   $Id: spec48.c,v 1.72 2007/02/02 16:21:54 pak21 Exp $
+   $Id: spec48.c,v 1.72.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -57,7 +57,7 @@
 static libspectrum_byte
 spec48_unattached_port( void )
 {
-  return spectrum_unattached_port( 1 );
+  return spectrum_unattached_port();
 }
 
 int

Modified: branches/Release-0_8_0/fuse/man/fuse.1
===================================================================
--- branches/Release-0_8_0/fuse/man/fuse.1	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/man/fuse.1	2007-05-12 01:09:14 UTC (rev 366)
@@ -23,7 +23,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH fuse 1 "11th April, 2007" "Version 0.8.0" "Emulators"
+.TH fuse 1 "11th May, 2007" "Version 0.8.0.1" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"

Modified: branches/Release-0_8_0/fuse/periph.c
===================================================================
--- branches/Release-0_8_0/fuse/periph.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/periph.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* periph.c: code for handling peripherals
    Copyright (c) 2005-2007 Philip Kendall
 
-   $Id: periph.c,v 1.20.2.1 2007/03/21 16:21:54 pak21 Exp $
+   $Id: periph.c,v 1.20.2.2 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -168,9 +168,10 @@
 {
   libspectrum_byte b;
 
-  ula_contend_port_preio( port );
+  ula_contend_port_early( port );
+  ula_contend_port_late( port );
   b = readport_internal( port );
-  ula_contend_port_postio( port );
+  tstates++;
 
   return b;
 }
@@ -240,9 +241,9 @@
 void
 writeport( libspectrum_word port, libspectrum_byte b )
 {
-  ula_contend_port_preio( port );
+  ula_contend_port_early( port );
   writeport_internal( port, b );
-  ula_contend_port_postio( port );
+  ula_contend_port_late( port ); tstates++;
 }
 
 void

Modified: branches/Release-0_8_0/fuse/screenshot.c
===================================================================
--- branches/Release-0_8_0/fuse/screenshot.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/screenshot.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* screenshot.c: Routines for handling .png and .scr screenshots
    Copyright (c) 2002-2003 Philip Kendall, Fredrick Meunier
 
-   $Id: screenshot.c,v 1.33 2007/02/02 16:21:52 pak21 Exp $
+   $Id: screenshot.c,v 1.33.2.1 2007/05/01 13:23:51 fredm Exp $
 
    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
@@ -26,6 +26,7 @@
 #include <config.h>
 
 #include <errno.h>
+#include <limits.h>
 #include <string.h>
 
 #include <libspectrum.h>

Modified: branches/Release-0_8_0/fuse/snapshot.c
===================================================================
--- branches/Release-0_8_0/fuse/snapshot.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/snapshot.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* snapshot.c: snapshot handling routines
    Copyright (c) 1999-2004 Philip Kendall
 
-   $Id: snapshot.c,v 1.105 2007/02/02 16:21:52 pak21 Exp $
+   $Id: snapshot.c,v 1.105.2.1 2007/05/09 19:31:02 pak21 Exp $
 
    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
@@ -136,9 +136,13 @@
 
   machine = libspectrum_snap_machine( snap );
 
-  error = machine_select( machine );
-  if( error ) {
-    error = try_fallback_machine( machine ); if( error ) return error;
+  if( machine != machine_current->machine ) {
+    error = machine_select( machine );
+    if( error ) {
+      error = try_fallback_machine( machine ); if( error ) return error;
+    }
+  } else {
+    machine_reset();
   }
 
   capabilities = machine_current->capabilities;

Modified: branches/Release-0_8_0/fuse/spectrum.c
===================================================================
--- branches/Release-0_8_0/fuse/spectrum.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/spectrum.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* spectrum.c: Generic Spectrum routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: spectrum.c,v 1.67 2007/02/02 16:21:52 pak21 Exp $
+   $Id: spectrum.c,v 1.67.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -97,7 +97,7 @@
 
 /* What happens if we read from an unattached port? */
 libspectrum_byte
-spectrum_unattached_port( int offset )
+spectrum_unattached_port( void )
 {
   int line, tstates_through_line, column;
 
@@ -110,24 +110,26 @@
 	   machine_current->line_times[ DISPLAY_BORDER_HEIGHT ] ) /
     machine_current->timings.tstates_per_line;
 
-  /* Idle bus if we're in the lower or upper borders */
+  /* Idle bus if we're in the lower border */
   if( line >= DISPLAY_HEIGHT ) return 0xff;
 
-  /* Work out where we are in this line */
+  /* Work out where we are in this line, remembering that line_times[] holds
+     the first pixel we display, not the start of where the Spectrum produced
+     the left border */
   tstates_through_line = tstates -
-    machine_current->line_times[ DISPLAY_BORDER_HEIGHT + line ];
+    machine_current->line_times[ DISPLAY_BORDER_HEIGHT + line ] +
+    ( machine_current->timings.left_border - DISPLAY_BORDER_WIDTH_COLS * 4 );
 
   /* Idle bus if we're in the left border */
-  if( tstates_through_line < machine_current->timings.left_border - offset )
+  if( tstates_through_line < machine_current->timings.left_border )
     return 0xff;
 
   /* Or the right border or retrace */
   if( tstates_through_line >= machine_current->timings.left_border +
-                              machine_current->timings.horizontal_screen -
-                              offset )
+                              machine_current->timings.horizontal_screen  )
     return 0xff;
 
-  column = ( ( tstates_through_line + 1 -
+  column = ( ( tstates_through_line -
 	       machine_current->timings.left_border ) / 8 ) * 2;
 
   switch( tstates_through_line % 8 ) {
@@ -137,24 +139,24 @@
        http://www.ramsoft.bbk.org/floatingbus.html
 
        However, the timings used are based on the first byte being
-       returned at 14335 (48K) and 14361 (128K) respectively, not
+       returned at 14338 (48K) and 14364 (128K) respectively, not
        14347 and 14368 as used by Ramsoft.
 
        In contrast to previous versions of this code, Arkanoid and
        Sidewize now work. */
 
     /* Attribute bytes */
-    case 3: column++;
-    case 1:
+    case 5: column++;
+    case 3:
       return RAM[ memory_current_screen ][ display_attr_start[line] + column ];
 
     /* Screen data */
-    case 2: column++;
-    case 0:
+    case 4: column++;
+    case 2:
       return RAM[ memory_current_screen ][ display_line_start[line] + column ];
 
     /* Idle bus */
-    case 4: case 5: case 6: case 7:
+    case 0: case 1: case 6: case 7:
       return 0xff;
 
   }

Modified: branches/Release-0_8_0/fuse/spectrum.h
===================================================================
--- branches/Release-0_8_0/fuse/spectrum.h	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/spectrum.h	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* spectrum.h: Spectrum 48K specific routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: spectrum.h,v 1.45 2007/02/02 16:21:52 pak21 Exp $
+   $Id: spectrum.h,v 1.45.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -66,7 +66,7 @@
 
 } spectrum_raminfo;
 
-libspectrum_byte spectrum_unattached_port( int offset );
+libspectrum_byte spectrum_unattached_port( void );
 
 /* Miscellaneous stuff */
 

Modified: branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/fb/fbdisplay.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -2,7 +2,7 @@
    Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt,
 			   Witold Filipczyk
 
-   $Id: fbdisplay.c,v 1.40 2007/02/02 16:21:56 pak21 Exp $
+   $Id: fbdisplay.c,v 1.40.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -293,10 +293,10 @@
   return 1;
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 void

Modified: branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/ggi/ggidisplay.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* ggiui.c: Routines for dealing with the GGI user interface
    Copyright (c) 2003 Catalin Mihaila, Philip Kendall
 
-   $Id: ggidisplay.c,v 1.6 2007/02/02 16:21:56 pak21 Exp $
+   $Id: ggidisplay.c,v 1.6.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -160,10 +160,10 @@
 }
 
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 /* Set one pixel in the display */

Modified: branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/gtk/gtkdisplay.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* gtkdisplay.c: GTK+ routines for dealing with the Speccy screen
    Copyright (c) 2000-2005 Philip Kendall
 
-   $Id: gtkdisplay.c,v 1.59 2007/02/02 16:21:59 pak21 Exp $
+   $Id: gtkdisplay.c,v 1.59.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -332,7 +332,7 @@
 			 scaled_pitch );
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
   fuse_emulation_pause();
@@ -341,6 +341,8 @@
   display_refresh_all();
 
   fuse_emulation_unpause();
+
+  return 0;
 }
 
 int

Modified: branches/Release-0_8_0/fuse/ui/scaler/scaler.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/scaler/scaler.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/scaler/scaler.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* scaler.c: code for selecting (etc) scalers
  * Copyright (C) 2003 Fredrick Meunier, Philip Kendall
  * 
- * $Id: scaler.c,v 1.2 2005/04/18 02:55:20 fred Exp $
+ * $Id: scaler.c,v 1.28.2.1 2007/04/28 00:23:08 fredm Exp $
  *
  * Originally taken from ScummVM - Scumm Interpreter
  * Copyright (C) 2001  Ludvig Strigeus
@@ -141,9 +141,7 @@
   scaler_flags = scaler_get_flags( current_scaler );
   scaler_expander = scaler_get_expander( current_scaler );
 
-  uidisplay_hotswap_gfx_mode();
-
-  return 0;
+  return uidisplay_hotswap_gfx_mode();
 }
 
 int

Modified: branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp
===================================================================
--- branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/scaler/scalers.cpp	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* scalers.cpp: the actual graphics scalers
  * Copyright (C) 2003 Fredrick Meunier, Philip Kendall
  *
- * $Id$
+ * $Id: scalers.c,v 1.37.2.1 2007/05/01 13:26:26 fredm Exp $
  * 
  * Originally taken from ScummVM - Scumm Interpreter
  * Copyright (C) 2001  Ludvig Strigeus
@@ -36,6 +36,14 @@
 #include "ui/ui.h"
 #include "ui/uidisplay.h"
 
+#ifndef MIN
+#define MIN(a,b)    (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef ABS
+#define ABS(x)     ((x)>=0?(x):-(x))
+#endif
+
 /* The actual code for the scalers starts here */
 
 #if SCALER_DATA_SIZE == 2
@@ -1039,16 +1047,6 @@
     B = Y + 1.772 (U-128)
 */
 
-#ifndef ABS
-#define ABS(x) ((x)>=0?(x):-(x))
-#endif /* ABS */
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif /* MIN */
-#ifndef MAX
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#endif /* MAX */
-
 #define YUV_TO_R(y, u, v) ( MIN( ABS( ( 8192L * y              + 11485L * v + 16384 ) >> 15 ), 255 ) )
 #define YUV_TO_G(y, u, v) ( MIN( ABS( ( 8192L * y - 2819L  * u -  5850L * v + 16384 ) >> 15 ), 255 ) )
 #define YUV_TO_B(y, u, v) ( MIN( ABS( ( 8192L * y + 14516L * u              + 16384 ) >> 15 ), 255 ) )

Modified: branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/sdl/sdldisplay.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* sdldisplay.c: Routines for dealing with the SDL display
    Copyright (c) 2000-2006 Philip Kendall, Matan Ziv-Av, Fredrick Meunier
 
-   $Id: sdldisplay.c,v 1.43 2007/02/02 16:21:59 pak21 Exp $
+   $Id: sdldisplay.c,v 1.43.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -89,7 +89,7 @@
 static int num_rects = 0;
 static libspectrum_byte sdldisplay_force_full_refresh = 1;
 
-static int min_fullscreen_width;
+static int max_fullscreen_height;
 static int min_fullscreen_height;
 
 /* The current size of the display (in units of DISPLAY_SCREEN_*) */
@@ -227,12 +227,14 @@
      at all */
   if( modes == (SDL_Rect **) 0 || modes == (SDL_Rect **) -1 ){
     /* Just try whatever we have and see what happens */
-    min_fullscreen_width = 320;
+    max_fullscreen_height = 480;
     min_fullscreen_height = 240;
   } else {
+    /* Record the largest supported fullscreen software mode */
+    max_fullscreen_height = modes[0]->h;
+
     /* Record the smallest supported fullscreen software mode */
     for( i=0; modes[i]; ++i ) {
-      min_fullscreen_width = modes[i]->w;
       min_fullscreen_height = modes[i]->h;
     }
   }
@@ -247,7 +249,7 @@
   if ( scaler_select_scaler( current_scaler ) )
     scaler_select_scaler( SCALER_NORMAL );
 
-  sdldisplay_load_gfx_mode();
+  if( sdldisplay_load_gfx_mode() ) return 1;
 
   SDL_WM_SetCaption( "Fuse", "Fuse" );
 
@@ -295,15 +297,17 @@
   if( settings_current.full_screen ) {
     int i = 0;
     while( i < SCALER_NUM &&
-           image_height * sdldisplay_current_size <= min_fullscreen_height/2 ) {
+           ( image_height*sdldisplay_current_size <= min_fullscreen_height/2 ||
+             image_height*sdldisplay_current_size > max_fullscreen_height ) ) {
       if( windowed_scaler == -1) windowed_scaler = current_scaler;
       while( !scaler_is_supported(i) ) i++;
       scaler_select_scaler( i++ );
       sdldisplay_current_size = scaler_get_scaling_factor( current_scaler );
-      /* if we failed to find a suitable size scaler, just use what the user had
-         originally */
-      if( image_height * sdldisplay_current_size <= min_fullscreen_height/2 ) {
-        scaler_select_scaler( windowed_scaler );
+      /* if we failed to find a suitable size scaler, just use normal (what the
+         user had originally may be too big) */
+      if( image_height * sdldisplay_current_size <= min_fullscreen_height/2 ||
+          image_height * sdldisplay_current_size > max_fullscreen_height ) {
+        scaler_select_scaler( SCALER_NORMAL );
         sdldisplay_current_size = scaler_get_scaling_factor( current_scaler );
       }
     }
@@ -339,8 +343,8 @@
                                  : SDL_SWSURFACE
   );
   if( !sdldisplay_gc ) {
-    fprintf( stderr, "%s: couldn't create gc\n", fuse_progname );
-    return 1;
+    fprintf( stderr, "%s: couldn't create SDL graphics context\n", fuse_progname );
+    fuse_abort();
   }
 
   sdldisplay_is_full_screen =
@@ -367,7 +371,7 @@
 
   if( !tmp_screen ) {
     fprintf( stderr, "%s: couldn't create tmp_screen\n", fuse_progname );
-    return 1;
+    fuse_abort();
   }
 
   sdldisplay_allocate_colours( 16, colour_values, bw_values );
@@ -378,7 +382,7 @@
   return 0;
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
   fuse_emulation_pause();
@@ -390,7 +394,7 @@
   }
 
   /* Setup the new GFX mode */
-  sdldisplay_load_gfx_mode();
+  if( sdldisplay_load_gfx_mode() ) return 1;
 
   /* reset palette */
   SDL_SetColors( sdldisplay_gc, colour_palette, 0, 16 );
@@ -405,6 +409,8 @@
   }
 
   fuse_emulation_unpause();
+
+  return 0;
 }
 
 static void
@@ -666,8 +672,10 @@
   /* We check for a switch to fullscreen here to give systems with a
      windowed-only UI a chance to free menu etc. resources before
      the switch to fullscreen (e.g. Mac OS X) */
-  if( sdldisplay_is_full_screen != settings_current.full_screen ) {
-    uidisplay_hotswap_gfx_mode();
+  if( sdldisplay_is_full_screen != settings_current.full_screen &&
+      uidisplay_hotswap_gfx_mode() ) {
+    fprintf( stderr, "%s: Error switching to fullscreen\n", fuse_progname );
+    fuse_abort();
   }
 
   /* Force a full redraw if requested */

Modified: branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/svga/svgadisplay.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -2,7 +2,7 @@
    Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Witold Filipczyk,
 			   Russell Marks
 
-   $Id: svgadisplay.c,v 1.32 2007/02/02 16:21:59 pak21 Exp $
+   $Id: svgadisplay.c,v 1.32.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -216,10 +216,10 @@
   return 0;
 }
   
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 void

Modified: branches/Release-0_8_0/fuse/ui/uidisplay.h
===================================================================
--- branches/Release-0_8_0/fuse/ui/uidisplay.h	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/uidisplay.h	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* uidisplay.h: Low-level display routines
    Copyright (c) 2000-2003 Philip Kendall
 
-   $Id: uidisplay.h,v 1.23 2007/02/02 16:21:55 pak21 Exp $
+   $Id: uidisplay.h,v 1.23.2.1 2007/04/28 00:23:07 fredm Exp $
 
    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
@@ -34,7 +34,7 @@
 
 void uidisplay_area( int x, int y, int w, int h );
 void uidisplay_frame_end( void );
-void uidisplay_hotswap_gfx_mode( void );
+int uidisplay_hotswap_gfx_mode( void );
 
 int uidisplay_end(void);
 
@@ -44,8 +44,8 @@
 
 void uidisplay_putpixel( int x, int y, int colour );
 void uidisplay_plot8( int x, int y, libspectrum_byte data, libspectrum_byte ink,
-		    libspectrum_byte paper );
+                      libspectrum_byte paper );
 void uidisplay_plot16( int x, int y, libspectrum_word data, libspectrum_byte ink,
-		     libspectrum_byte paper);
+                       libspectrum_byte paper);
 
 #endif			/* #ifndef FUSE_UIDISPLAY_H */

Modified: branches/Release-0_8_0/fuse/ui/win32/win32display.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/win32/win32display.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/win32/win32display.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* win32display.c: Routines for dealing with the Win32 DirectDraw display
    Copyright (c) 2003 Philip Kendall, Marek Januszewski
 
-   $Id: win32display.c,v 1.5 2007/02/02 16:22:00 pak21 Exp $
+   $Id: win32display.c,v 1.5.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -444,7 +444,7 @@
 
 }    
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
 /* TODO: pause hangs emulator
@@ -455,6 +455,8 @@
 /* TODO: pause hangs emulator
   fuse_emulation_unpause();
 */
+
+  return 0;
 }
 
 int

Modified: branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ui/xlib/xdisplay.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* xdisplay.c: Routines for dealing with drawing the Speccy's screen via Xlib
    Copyright (c) 2000-2005 Philip Kendall, Darren Salt
 
-   $Id: xdisplay.c,v 1.56 2007/02/02 16:22:00 pak21 Exp $
+   $Id: xdisplay.c,v 1.56.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -496,10 +496,10 @@
   if( image ) XDestroyImage( image ); image = 0;
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 int

Modified: branches/Release-0_8_0/fuse/uidisplay.c
===================================================================
--- branches/Release-0_8_0/fuse/uidisplay.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/uidisplay.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* uidisplay.c: UI display functions
    Copyright (c) 2002-2003 Philip Kendall
 
-   $Id: uidisplay.c,v 1.9 2007/02/02 16:21:52 pak21 Exp $
+   $Id: uidisplay.c,v 1.9.2.1 2007/04/25 03:32:22 fredm Exp $
 
    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,7 +65,8 @@
 
       data = screen[ display_line_start[y]+x ];
 
-      uidisplay_plot8( x, y, data, ink, paper );
+      uidisplay_plot8( x + DISPLAY_BORDER_WIDTH_COLS, y + DISPLAY_BORDER_HEIGHT,
+                       data, ink, paper );
     }
   }
 

Modified: branches/Release-0_8_0/fuse/ula.c
===================================================================
--- branches/Release-0_8_0/fuse/ula.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ula.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* ula.c: ULA routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: ula.c,v 1.5 2007/02/02 16:21:52 pak21 Exp $
+   $Id: ula.c,v 1.5.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -98,7 +98,7 @@
 }  
 
 void
-ula_contend_port_preio( libspectrum_word port )
+ula_contend_port_early( libspectrum_word port )
 {
   if( ( port & 0xc000 ) == 0x4000 ) tstates += ula_contention[ tstates ];
    
@@ -106,20 +106,20 @@
 }
 
 void
-ula_contend_port_postio( libspectrum_word port )
+ula_contend_port_late( libspectrum_word port )
 {
   if( machine_current->ram.port_contended( port ) ) {
 
-    tstates += ula_contention[ tstates ]; tstates += 3;
+    tstates += ula_contention[ tstates ]; tstates += 2;
 
   } else {
 
     if( ( port & 0xc000 ) == 0x4000 ) {
       tstates += ula_contention[ tstates ]; tstates++;
       tstates += ula_contention[ tstates ]; tstates++;
-      tstates += ula_contention[ tstates ]; tstates++;
+      tstates += ula_contention[ tstates ];
     } else {
-      tstates += 3;
+      tstates += 2;
     }
 
   }

Modified: branches/Release-0_8_0/fuse/ula.h
===================================================================
--- branches/Release-0_8_0/fuse/ula.h	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/ula.h	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* ula.h: ULA routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: ula.h,v 1.3 2007/02/02 16:21:52 pak21 Exp $
+   $Id: ula.h,v 1.3.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -37,7 +37,7 @@
 int ula_from_snapshot( libspectrum_snap *snap );
 int ula_to_snapshot( libspectrum_snap *snap );
 
-void ula_contend_port_preio( libspectrum_word port );
-void ula_contend_port_postio( libspectrum_word port );
+void ula_contend_port_early( libspectrum_word port );
+void ula_contend_port_late( libspectrum_word port );
 
 #endif			/* #ifndef FUSE_ULA_H */

Modified: branches/Release-0_8_0/fuse/widget/Makefile.am
===================================================================
--- branches/Release-0_8_0/fuse/widget/Makefile.am	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/widget/Makefile.am	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 2001,2002 Philip Kendall
 
-## $Id: Makefile.am,v 1.39 2007/02/02 16:22:00 pak21 Exp $
+## $Id: Makefile.am,v 1.39.2.1 2007/04/16 12:35:07 fredm Exp $
 
 ## 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,3 +65,6 @@
 		 options.h options.pl options-header.pl
 
 pkgdata_DATA = fuse.font
+
+EXTRA_DIST = mkfusefont.pl \
+	     fuse.font.sbf

Modified: branches/Release-0_8_0/fuse/widget/menu.c
===================================================================
--- branches/Release-0_8_0/fuse/widget/menu.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/widget/menu.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* menu.c: general menu widget
    Copyright (c) 2001-2006 Philip Kendall
 
-   $Id: menu.c,v 1.109 2007/02/02 16:22:00 pak21 Exp $
+   $Id: menu.c,v 1.109.2.1 2007/04/25 03:32:22 fredm Exp $
 
    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
@@ -553,6 +553,7 @@
 
   info.filename = filename;
   info.screen = file.buffer;
+  info.border = 0;
 
   widget_do( WIDGET_TYPE_PICTURE, &info );
 

Modified: branches/Release-0_8_0/fuse/widget/pokefinder.c
===================================================================
--- branches/Release-0_8_0/fuse/widget/pokefinder.c	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/fuse/widget/pokefinder.c	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 /* pokefinder.c: The poke finder widget
    Copyright (c) 2004 Darren Salt
 
-   $Id: pokefinder.c,v 1.2 2005/03/26 17:25:01 pak21 Exp $
+   $Id: pokefinder.c,v 1.2.6.1 2007/04/25 16:21:32 pak21 Exp $
 
    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
@@ -52,18 +52,17 @@
 widget_pokefinder_draw( void *data )
 {
   widget_dialog_with_border( 1, 2, 30, 12 );
-  widget_printstring( 15 - strlen( title ) / 2, 2, WIDGET_COLOUR_FOREGROUND,
-		      title );
-  widget_printstring( 2, 4, WIDGET_COLOUR_FOREGROUND, "Possible: " );
-  widget_printstring( 2, 5, WIDGET_COLOUR_FOREGROUND, "Value: " );
+  widget_print_title( 16, WIDGET_COLOUR_FOREGROUND, title );
+  widget_printstring( 16, 32, WIDGET_COLOUR_FOREGROUND, "Possible: " );
+  widget_printstring( 16, 40, WIDGET_COLOUR_FOREGROUND, "Value: " );
 
   update_possible();
   display_possible();
   display_value();
 
-  widget_printstring( 2, 12, WIDGET_COLOUR_FOREGROUND,
-		      "(I)nc'd (D)ec'd (S)earch" );
-  widget_printstring( 2, 13, WIDGET_COLOUR_FOREGROUND, "(R)eset (C)lose" );
+  widget_printstring( 16, 96, WIDGET_COLOUR_FOREGROUND,
+		      "\x0AI\x09nc'd \x0A" "D\x09" "ec'd \x0AS\x09" "earch" );
+  widget_printstring( 16, 104, WIDGET_COLOUR_FOREGROUND, "\x0AR\x09" "eset \x0A" "C\x09lose" );
 
   widget_display_lines( 2, 12 );
 
@@ -98,10 +97,10 @@
   widget_rectangle(  96,  32,  48,  8, WIDGET_COLOUR_BACKGROUND );
   widget_rectangle(  16,  56, 128, 32, WIDGET_COLOUR_BACKGROUND );
   widget_rectangle(  16,  88, 136,  8, WIDGET_COLOUR_BACKGROUND );
-  widget_rectangle( 144, 104,  56,  8, WIDGET_COLOUR_BACKGROUND );
+  widget_rectangle(  82, 104,  56,  8, WIDGET_COLOUR_BACKGROUND );
 
   snprintf( buf, sizeof( buf ), "%d", pokefinder_count );
-  widget_printstring( 12, 4, WIDGET_COLOUR_FOREGROUND, buf );
+  widget_printstring( 96, 32, WIDGET_COLOUR_FOREGROUND, buf );
 
   if( FEW_ENOUGH() ) {
     size_t i;
@@ -120,10 +119,10 @@
 
       snprintf( buf, sizeof( buf ), "%2d:%04X", possible_page[i],
 		possible_offset[i] );
-      widget_printstring( x, y, colour, buf );
+      widget_printstring( x * 8, y * 8, colour, buf );
     }
 
-    widget_printstring( 18, 13, WIDGET_COLOUR_FOREGROUND, "(B)reak" );
+    widget_printstring( 83, 104, WIDGET_COLOUR_FOREGROUND, "\x0A" "B\x09reak" );
   }
 
   widget_display_lines( 4, 10 );
@@ -136,7 +135,7 @@
 
   snprintf( buf, sizeof( buf ), "%d", value );
   widget_rectangle( 72, 40, 24, 8, WIDGET_COLOUR_BACKGROUND );
-  widget_printstring( 9, 5, WIDGET_COLOUR_FOREGROUND, buf );
+  widget_printstring( 72, 40, WIDGET_COLOUR_FOREGROUND, buf );
   widget_display_lines( 5, 1 );
 }
 
@@ -202,10 +201,10 @@
 	    possible_offset[selected], 0, DEBUGGER_BREAKPOINT_LIFE_PERMANENT,
 	    NULL
 	  ) ) {
-	widget_printstring( 2, 11, WIDGET_COLOUR_FOREGROUND,
+	widget_printstring( 16, 88, WIDGET_COLOUR_FOREGROUND,
 			    "Breakpoint failed" );
       } else {
-	widget_printstring( 2, 11, WIDGET_COLOUR_FOREGROUND,
+	widget_printstring( 16, 88, WIDGET_COLOUR_FOREGROUND,
 			    "Breakpoint added" );
       }
       widget_display_lines( 11, 1 );

Modified: branches/Release-0_8_0/libspectrum/Info.plist
===================================================================
--- branches/Release-0_8_0/libspectrum/Info.plist	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/Info.plist	2007-05-12 01:09:14 UTC (rev 366)
@@ -23,6 +23,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.0</string>
+	<string>0.3.0.1</string>
 </dict>
 </plist>

Modified: branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/ChangeLog	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,3 +1,18 @@
+2007-05-11  Philip Kendall  <phi...@sh...>
+
+	* libspectrum 0.3.0.1 released (bug fix release).
+
+	* Avoid crash when reading an invalid TZX file (thanks, crabfists).
+	  (Philip Kendall).
+
+	* Export the TZX Generalized Data Block functions when building a
+	  Win32 DLL (Stuart Brady).
+
+	* Distribute the hacking/ directory (thanks, Stuart Brady) (Philip
+	  Kendall).
+
+	* Remove warning when building from CVS (Stuart Brady).
+
 2007-04-11  Philip Kendall  <phi...@sh...>
 
 	* libspectrum 0.3.0 released.
@@ -188,4 +203,4 @@
 	* libspectrum separated from Fuse just before the 0.5.0 release of
 	  Fuse; see Fuse's ChangeLog for changes up to this point
 
-$Id: ChangeLog,v 1.12.2.2 2007/04/11 08:43:07 pak21 Exp $
+$Id: ChangeLog,v 1.12.2.3 2007/05/11 07:04:59 pak21 Exp $

Modified: branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/Makefile.am	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 2001-2004 Philip Kendall
 
-## $Id: Makefile.am,v 1.65.2.1 2007/04/11 08:43:07 pak21 Exp $
+## $Id: Makefile.am,v 1.65.2.3 2007/05/11 07:04:59 pak21 Exp $
 
 ## 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
@@ -55,7 +55,7 @@
 			 zlib.c \
 			 zxs.c
 
-libspectrum_la_LDFLAGS = -version-info 5:0:0 -no-undefined
+libspectrum_la_LDFLAGS = -version-info 5:1:0 -no-undefined
 
 libspectrum_la_LIBADD = myglib/libmyglib.la -lm
 
@@ -99,4 +99,5 @@
 
 
 SUBDIRS = doc \
+	  hacking \
 	  myglib

Modified: branches/Release-0_8_0/libspectrum/libspectrum/README
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/README	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/README	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,5 +1,5 @@
-libspectrum 0.3.0
-=================
+libspectrum 0.3.0.1
+===================
 
 libspectrum is a library which is designed to make the input and
 output of ZX Spectrum emulator files slightly easier than it would be
@@ -50,4 +50,4 @@
 'configure' for the first time.
 
 Philip Kendall <phi...@sh...>
-11 April 2007
+11 May 2007

Modified: branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/acinclude.m4	2007-05-12 01:09:14 UTC (rev 366)
@@ -7,7 +7,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl

Modified: branches/Release-0_8_0/libspectrum/libspectrum/configure.in
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/configure.in	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/configure.in	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Copyright (c) 1999-2004 Philip Kendall
 
-dnl $Id: configure.in,v 1.35.2.1 2007/04/11 08:43:07 pak21 Exp $
+dnl $Id: configure.in,v 1.35.2.3 2007/05/11 07:04:59 pak21 Exp $
 
 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
@@ -25,7 +25,7 @@
 AM_CONFIG_HEADER(config.h)
 
 dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(libspectrum, 0.3.0)
+AM_INIT_AUTOMAKE(libspectrum, 0.3.0.1)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -127,6 +127,7 @@
 AC_OUTPUT(
   Makefile
   doc/Makefile
+  hacking/Makefile
   libspectrum.qpg
   myglib/Makefile
 )

Modified: branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/cvs-tags	2007-05-12 01:09:14 UTC (rev 366)
@@ -55,6 +55,7 @@
 | | libspectrum_0_3_0pre1
 | | libspectrum_0_3_0pre2
 | | libspectrum_0_3_0
+| | libspectrum_0_3_0_1
 | |
 | | libspectrum_0_3_0-branch
 |

Modified: branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.3	2007-05-12 01:09:14 UTC (rev 366)
@@ -22,7 +22,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH libspectrum 3 "11th April, 2004" "Version 0.3.0" "Emulators"
+.TH libspectrum 3 "11th May, 2007" "Version 0.3.0.1" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"

Modified: branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/doc/libspectrum.txt	2007-05-12 01:09:14 UTC (rev 366)
@@ -1,5 +1,5 @@
-libspectrum 0.3.0
-=================
+libspectrum 0.3.0.1
+===================
 
 libspectrum is a fairly simple library designed to make the handling
 of various ZX Spectrum emulator-related file formats easy.  So far it
@@ -1631,4 +1631,4 @@
 
 Write `data' to register `reg' of the IDE channgel `chn'.
 
-$Id: libspectrum.txt,v 1.30.2.1 2007/02/04 18:32:36 pak21 Exp $
+$Id: libspectrum.txt,v 1.30.2.2 2007/05/11 07:04:59 pak21 Exp $

Copied: branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore (from rev 365, vendor/libspectrum/current/hacking/.cvsignore)
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore	                        (rev 0)
+++ branches/Release-0_8_0/libspectrum/libspectrum/hacking/.cvsignore	2007-05-12 01:09:14 UTC (rev 366)
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

Modified: branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog	2007-05-12 00:14:12 UTC (rev 365)
+++ branches/Release-0_8_0/libspectrum/libspectrum/hacking/ChangeLog	2007-05-12 01:09:14 UTC (rev 366)
@@ -409,4 +409,17 @@
 20070409 z80.c: remove warning (libspectrum_0_3_0-branch).
 20070411 ChangeLog,Makefile.am,README,configure.in,doc/libspectrum.3: update
 	 for 0.3.0 release (libspectrum_0_3_0-branch).
-20070411 TAG: libspectrum_0_3_0
\ No newline at end of file
+20070411 TAG: libspectrum_0_3_0 (libspectrum_0_3_0-branch)
+20070425 tap.c,tzx_read.c: call libspectrum_tape_clear() on error rather than
+	 libspectrum_tape_free() to avoid double free bug (fixes bugs #1479451
+	 and #1706994; thanks, crabfists) (libspectrum_0_3_0-branch).
+20070509 libspectrum.in: add WIN32_DLL to Generalised Data Block functions
+	 (part of patch 1711412) (libspectrum_0_3_0-branch) (Stuart Brady).
+20070509 Makefile.am,configure.in,hacking/{.cvsignore,Makefile.am}: distribute
+	 the hacking/ subdir (thanks, Stuart Brady) (libspectrum_0_3_0-branch).
+20070509 acinclude.m4: fix underquoted macro (thanks, Stuart Brady)
+	 (libspectrum_0_3_0-branch).
+20070510 ChangeLog,Makefile.am,README,configure.in,doc/{libspectrum.3,
+	 libspectrum.txt}: updates for 0.3.0.1 release
+	 (libspectrum_0_3_0-branch).
+20070511 TAG: libspectrum_0_3_0_1 (libspectrum_0_3_0-branch)

Copied: branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am (from rev 365, vendor/libspectrum/current/hacking/Makefile.am)
===================================================================
--- branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am	                        (rev 0)
+++ branches/Release-0_8_0/libspectrum/libspectrum/hacking/Makefile.am	2007-05-12 01:09:14 UTC (rev 366)
@@ -0,0 +1,26 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007 Philip Kendall
+
+## $Id: Makefile.am,v 1.1.2.1 2007/05/09 20:24:39 pak21 Exp $
+
+## 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+## Author contact information:
+##
+## E-mail: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = ChangeLog

Modified: branches/Release-0_8_0/libspectrum/libspectrum/libspectrum.h.in
================================...
 
[truncated message content]

[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [365] vendor/fuse/fuse-0.8.0.1/

From: <fr...@us...> - 2007-05-12 00:14:28

Revision: 365
          http://svn.sourceforge.net/fuse-for-macosx/?rev=365&view=rev
Author:   fredm
Date:     2007-05-11 17:14:12 -0700 (Fri, 11 May 2007)

Log Message:
-----------
Tag vendor/fuse/current as vendor/fuse/fuse-0.8.0.1.

Added Paths:
-----------
    vendor/fuse/fuse-0.8.0.1/

Copied: vendor/fuse/fuse-0.8.0.1 (from rev 364, vendor/fuse/current)


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: [364] vendor/fuse/current

From: <fr...@us...> - 2007-05-12 00:13:59

Revision: 364
          http://svn.sourceforge.net/fuse-for-macosx/?rev=364&view=rev
Author:   fredm
Date:     2007-05-11 17:13:58 -0700 (Fri, 11 May 2007)

Log Message:
-----------
Load . into vendor/fuse/current.

Modified Paths:
--------------
    vendor/fuse/current/ChangeLog
    vendor/fuse/current/README
    vendor/fuse/current/acinclude.m4
    vendor/fuse/current/configure.in
    vendor/fuse/current/hacking/ChangeLog
    vendor/fuse/current/hacking/cvs-tags
    vendor/fuse/current/hacking/ui.txt
    vendor/fuse/current/lib/Makefile.am
    vendor/fuse/current/machines/pentagon.c
    vendor/fuse/current/machines/scorpion.c
    vendor/fuse/current/machines/spec128.c
    vendor/fuse/current/machines/spec16.c
    vendor/fuse/current/machines/spec48.c
    vendor/fuse/current/man/fuse.1
    vendor/fuse/current/periph.c
    vendor/fuse/current/screenshot.c
    vendor/fuse/current/snapshot.c
    vendor/fuse/current/spectrum.c
    vendor/fuse/current/spectrum.h
    vendor/fuse/current/ui/fb/fbdisplay.c
    vendor/fuse/current/ui/ggi/ggidisplay.c
    vendor/fuse/current/ui/gtk/gtkdisplay.c
    vendor/fuse/current/ui/scaler/scaler.c
    vendor/fuse/current/ui/scaler/scalers.c
    vendor/fuse/current/ui/sdl/sdldisplay.c
    vendor/fuse/current/ui/svga/svgadisplay.c
    vendor/fuse/current/ui/uidisplay.h
    vendor/fuse/current/ui/win32/win32display.c
    vendor/fuse/current/ui/xlib/xdisplay.c
    vendor/fuse/current/uidisplay.c
    vendor/fuse/current/ula.c
    vendor/fuse/current/ula.h
    vendor/fuse/current/widget/Makefile.am
    vendor/fuse/current/widget/menu.c
    vendor/fuse/current/widget/pokefinder.c

Modified: vendor/fuse/current/ChangeLog
===================================================================
--- vendor/fuse/current/ChangeLog	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ChangeLog	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,3 +1,22 @@
+2007-05-11  Philip Kendall  <phi...@sh...>
+
+	* Fuse 0.8.0.1 released (bug fix release)
+
+	* Fix IN timings and floating bus behaviour: fixes Sidewize (thanks,
+	  Pegaz and Mark Woodmass) (Philip Kendall).
+	* Fix widget UI pokefinder and keyboard help picture
+	  (thanks, Alberto Garcia) (Philip Kendall and Fredrick Meunier).
+	* Fix crash if fullscreen mode attempted a resolution higher than
+	  the native graphics mode could handle (thanks, Alberto Garcia)
+	  (Fredrick Meunier).
+	* Ensure ABS, MIN and PATH_MAX are available where needed (Fredrick
+	  Meunier).
+	* Distribute autoload snapshots (thanks, Stuart Brady and Arda
+	  Erdikmen) (Fredrick Meunier).
+	* Remove flicker when playing back RZX files with embedded
+	  snapshots (thanks, Julian Wiseman) (Fredrick Meunier).
+	* Remove warnings when building from CVS (Stuart Brady).
+
 2007-04-11  Philip Kendall  <phi...@sh...>
 
 	* Fuse 0.8.0 released
@@ -788,4 +807,4 @@
 
 	* Version 0.1.0 released.
 
-$Id: ChangeLog,v 1.46.2.1 2007/04/09 16:59:02 pak21 Exp $
+$Id: ChangeLog,v 1.46.2.2 2007/05/10 07:32:38 pak21 Exp $

Modified: vendor/fuse/current/README
===================================================================
--- vendor/fuse/current/README	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/README	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 0.8.0
-============================================
+The Free Unix Spectrum Emulator (Fuse) 0.8.0.1
+==============================================
 
 Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
 unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -139,6 +139,6 @@
 ( http://www.worldofspectrum.org/faq/index.html ) first!
 
 Philip Kendall <phi...@sh...>
-11 April 2007
+11 May 2007
 
-$Id: README,v 1.40.2.2 2007/04/11 08:44:19 pak21 Exp $
+$Id: README,v 1.40.2.3 2007/05/10 07:32:38 pak21 Exp $

Modified: vendor/fuse/current/acinclude.m4
===================================================================
--- vendor/fuse/current/acinclude.m4	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/acinclude.m4	2007-05-12 00:13:58 UTC (rev 364)
@@ -7,7 +7,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl
@@ -420,7 +420,7 @@
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl

Modified: vendor/fuse/current/configure.in
===================================================================
--- vendor/fuse/current/configure.in	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/configure.in	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155.2.2 2007/04/09 16:59:02 pak21 Exp $
+dnl $Id: configure.in,v 1.155.2.3 2007/05/10 07:32:38 pak21 Exp $
 
 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
@@ -24,7 +24,7 @@
 AC_CANONICAL_SYSTEM
 
 dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.8.0)
+AM_INIT_AUTOMAKE(fuse, 0.8.0.1)
 
 dnl Checks for programs.
 AC_PROG_CC

Modified: vendor/fuse/current/hacking/ChangeLog
===================================================================
--- vendor/fuse/current/hacking/ChangeLog	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/hacking/ChangeLog	2007-05-12 00:13:58 UTC (rev 364)
@@ -1582,4 +1582,37 @@
 	 Julian Wiseman) (Release-0_8_0-branch).
 20070411 README: these aren't all IDE interfaces (Release-0_8_0-branch).
 20070411 fuse.c: update copyright date to 2007 (Release-0_8_0-branch).
-20070411 TAG: Release-0_8_0 (Release-0_8_0-branch).
+20070416 widget/Makefile.am: distribute fuse.font.sbf and mkfusefont.pl
+         (Release-0_8_0-branch) (Fred).
+20070424 TAG: Release-0_8_0 (Release-0_8_0-branch).
+20070425 uidisplay.c,widget/menu.c: initialise border in help screen and
+         center keyboard picture on help screen (thanks, Alberto Garcia)
+         (Release-0_8_0-branch).
+20070425 widget/pokefinder.c: fix up for non-proportional display
+	 (thanks, Alberto Garcia) (Release-0_8_0-branch).
+20070428 hacking/ui.txt,ui/{uidisplay.h,fb/fbdisplay.c,ggi/ggidisplay.c,
+         gtk/gtkdisplay.c,scaler/scaler.c,sdl/sdldisplay.c,
+         svga/svgadisplay.c,win32/win32display.c,xlib/xdisplay.c}:
+         check that we don't exceed maximum fullscreen dimensions with
+         SDL UI and attempt a more graceful failure if things go wrong
+         (fixes bug #1708636; thanks Alberto Garcia) (Release-0_8_0-branch)
+         (Fred).
+20070501 screenshot.c: include limits.h for PATH_MAX (Release-0_8_0-branch)
+         (Fred).
+20070501 ui/scaler/scalers.c: make sure MIN and ABS are defined
+         (Release-0_8_0-branch) (Fred).
+20070503 periph.c,spectrum.[ch],ula.[ch],machines/{pentagon.c,scorpion.c,
+	 spec128.c,spec16.c,spec48.c}: fix IN timings and consequent fixes
+	 to floating bus behaviour (fixes bug #1708597) (thanks, Pegaz and
+	 Mark Woodmass) (Release-0_8_0-branch).
+20070507 lib/Makefile.am: distribute autoload snapshots
+         (thanks Stuart Brady and Arda Erdikmen) (Release-0_8_0-branch)
+         (Fred).
+20070509 snapshot.c: call machine_select() only if the machine has changed
+	 (fixes bug #1701246) (thanks, Julian Wiseman) (Release-0_8_0-branch)
+	 (Fred).
+20070509 acinclude.m4: remove warnings about underquoted definitions
+	 (Release-0_8_0-branch) (Stuart Brady).
+20070510 ChangeLog,README,configure.in,man/fuse.1: doc updates for 0.8.0.1
+	 release (Release-0_8_0-branch).
+20070511 TAG: Release-0_8_0_1 (Release-0_8_0-branch).

Modified: vendor/fuse/current/hacking/cvs-tags
===================================================================
--- vendor/fuse/current/hacking/cvs-tags	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/hacking/cvs-tags	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,6 +1,6 @@
 CVS tags for Fuse
 
-$Id: cvs-tags,v 1.32.2.2 2007/04/11 09:41:31 pak21 Exp $
+$Id: cvs-tags,v 1.32.2.3 2007/05/11 07:27:47 pak21 Exp $
 
 | Release-0_3_1
 | Release-0_3_2pre1
@@ -147,6 +147,7 @@
 | | Release-0_8_0-pre1
 | | Release-0_8_0-pre2
 | | Release-0_8_0
+| | Release-0_8_0_1
 | |
 | | Release-0_8_0-branch
 |

Modified: vendor/fuse/current/hacking/ui.txt
===================================================================
--- vendor/fuse/current/hacking/ui.txt	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/hacking/ui.txt	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 Some brief instructions on adding another user interface to Fuse
 ================================================================
 
-Version: $Id: ui.txt,v 1.9 2003/03/13 14:55:28 pak21 Exp $
+Version: $Id: ui.txt,v 1.9.14.1 2007/04/28 00:23:09 fredm Exp $
 
 In order to add a new user interface (UI) to Fuse, you need to
 implement:
@@ -71,7 +71,7 @@
 This is called at the end of every spectrum frame, giving the ui a
 chance to flush all the drawing done over the course of the frame.
 
-* void uidisplay_hotswap_gfx_mode( void )
+* int uidisplay_hotswap_gfx_mode( void )
 
 This is called when the user has changed the scaler in use by the
 emulator. The ui should change the window to a multiple of the

Modified: vendor/fuse/current/lib/Makefile.am
===================================================================
--- vendor/fuse/current/lib/Makefile.am	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/lib/Makefile.am	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 1999-2004 Philip Kendall
 
-## $Id: Makefile.am,v 1.15 2007/02/02 16:21:53 pak21 Exp $
+## $Id: Makefile.am,v 1.15.2.1 2007/05/07 12:54:24 fredm Exp $
 
 ## 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
@@ -26,9 +26,8 @@
 FILES = cassette.bmp \
 	keyboard.scr \
 	microdrive.bmp \
-	plus3disk.bmp
-
-noinst_FILES = @AUTOLOAD_SNAPS@/disk_plus3.szx \
+	plus3disk.bmp \
+	@AUTOLOAD_SNAPS@/disk_plus3.szx \
 	@AUTOLOAD_SNAPS@/tape_128.szx \
 	@AUTOLOAD_SNAPS@/tape_16.szx \
 	@AUTOLOAD_SNAPS@/tape_2048.szx \

Modified: vendor/fuse/current/machines/pentagon.c
===================================================================
--- vendor/fuse/current/machines/pentagon.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/machines/pentagon.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* pentagon.c: Pentagon 128K specific routines
-   Copyright (c) 1999-2004 Philip Kendall and Fredrick Meunier
+   Copyright (c) 1999-2007 Philip Kendall and Fredrick Meunier
 
-   $Id: pentagon.c,v 1.31 2007/02/02 16:21:54 pak21 Exp $
+   $Id: pentagon.c,v 1.31.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -84,7 +84,7 @@
 static libspectrum_byte
 pentagon_unattached_port( void )
 {
-  return spectrum_unattached_port( 3 );
+  return spectrum_unattached_port();
 }
 
 int

Modified: vendor/fuse/current/machines/scorpion.c
===================================================================
--- vendor/fuse/current/machines/scorpion.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/machines/scorpion.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,8 +1,7 @@
 /* scorpion.c: Scorpion 256K specific routines
-   Copyright (c) 1999-2004 Philip Kendall and Fredrick Meunier
-   Copyright (c) 2004 Stuart Brady
+   Copyright (c) 1999-2007 Philip Kendall, Fredrick Meunier and Stuart Brady
 
-   $Id: scorpion.c,v 1.24 2007/02/02 16:21:54 pak21 Exp $
+   $Id: scorpion.c,v 1.24.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -94,7 +93,7 @@
 static libspectrum_byte
 scorpion_unattached_port( void )
 {
-  return spectrum_unattached_port( 3 );
+  return spectrum_unattached_port();
 }
 
 static libspectrum_byte

Modified: vendor/fuse/current/machines/spec128.c
===================================================================
--- vendor/fuse/current/machines/spec128.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/machines/spec128.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* spec128.c: Spectrum 128K specific routines
-   Copyright (c) 1999-2004 Philip Kendall
+   Copyright (c) 1999-2007 Philip Kendall
 
-   $Id: spec128.c,v 1.77 2007/02/02 16:21:54 pak21 Exp $
+   $Id: spec128.c,v 1.77.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -61,7 +61,7 @@
 libspectrum_byte
 spec128_unattached_port( void )
 {
-  return spectrum_unattached_port( 3 );
+  return spectrum_unattached_port();
 }
 
 libspectrum_byte

Modified: vendor/fuse/current/machines/spec16.c
===================================================================
--- vendor/fuse/current/machines/spec16.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/machines/spec16.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* spec16.c: Spectrum 16K specific routines
-   Copyright (c) 1999-2005 Philip Kendall
+   Copyright (c) 1999-2007 Philip Kendall
 
-   $Id: spec16.c,v 1.32 2007/02/02 16:21:54 pak21 Exp $
+   $Id: spec16.c,v 1.32.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -61,7 +61,7 @@
 static libspectrum_byte
 spec16_unattached_port( void )
 {
-  return spectrum_unattached_port( 1 );
+  return spectrum_unattached_port();
 }
 
 int spec16_init( fuse_machine_info *machine )

Modified: vendor/fuse/current/machines/spec48.c
===================================================================
--- vendor/fuse/current/machines/spec48.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/machines/spec48.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* spec48.c: Spectrum 48K specific routines
-   Copyright (c) 1999-2004 Philip Kendall
+   Copyright (c) 1999-2007 Philip Kendall
 
-   $Id: spec48.c,v 1.72 2007/02/02 16:21:54 pak21 Exp $
+   $Id: spec48.c,v 1.72.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -57,7 +57,7 @@
 static libspectrum_byte
 spec48_unattached_port( void )
 {
-  return spectrum_unattached_port( 1 );
+  return spectrum_unattached_port();
 }
 
 int

Modified: vendor/fuse/current/man/fuse.1
===================================================================
--- vendor/fuse/current/man/fuse.1	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/man/fuse.1	2007-05-12 00:13:58 UTC (rev 364)
@@ -23,7 +23,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH fuse 1 "11th April, 2007" "Version 0.8.0" "Emulators"
+.TH fuse 1 "11th May, 2007" "Version 0.8.0.1" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"

Modified: vendor/fuse/current/periph.c
===================================================================
--- vendor/fuse/current/periph.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/periph.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* periph.c: code for handling peripherals
    Copyright (c) 2005-2007 Philip Kendall
 
-   $Id: periph.c,v 1.20.2.1 2007/03/21 16:21:54 pak21 Exp $
+   $Id: periph.c,v 1.20.2.2 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -168,9 +168,10 @@
 {
   libspectrum_byte b;
 
-  ula_contend_port_preio( port );
+  ula_contend_port_early( port );
+  ula_contend_port_late( port );
   b = readport_internal( port );
-  ula_contend_port_postio( port );
+  tstates++;
 
   return b;
 }
@@ -240,9 +241,9 @@
 void
 writeport( libspectrum_word port, libspectrum_byte b )
 {
-  ula_contend_port_preio( port );
+  ula_contend_port_early( port );
   writeport_internal( port, b );
-  ula_contend_port_postio( port );
+  ula_contend_port_late( port ); tstates++;
 }
 
 void

Modified: vendor/fuse/current/screenshot.c
===================================================================
--- vendor/fuse/current/screenshot.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/screenshot.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* screenshot.c: Routines for handling .png and .scr screenshots
    Copyright (c) 2002-2003 Philip Kendall, Fredrick Meunier
 
-   $Id: screenshot.c,v 1.33 2007/02/02 16:21:52 pak21 Exp $
+   $Id: screenshot.c,v 1.33.2.1 2007/05/01 13:23:51 fredm Exp $
 
    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
@@ -26,6 +26,7 @@
 #include <config.h>
 
 #include <errno.h>
+#include <limits.h>
 #include <string.h>
 
 #include <libspectrum.h>

Modified: vendor/fuse/current/snapshot.c
===================================================================
--- vendor/fuse/current/snapshot.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/snapshot.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* snapshot.c: snapshot handling routines
    Copyright (c) 1999-2004 Philip Kendall
 
-   $Id: snapshot.c,v 1.105 2007/02/02 16:21:52 pak21 Exp $
+   $Id: snapshot.c,v 1.105.2.1 2007/05/09 19:31:02 pak21 Exp $
 
    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
@@ -136,9 +136,13 @@
 
   machine = libspectrum_snap_machine( snap );
 
-  error = machine_select( machine );
-  if( error ) {
-    error = try_fallback_machine( machine ); if( error ) return error;
+  if( machine != machine_current->machine ) {
+    error = machine_select( machine );
+    if( error ) {
+      error = try_fallback_machine( machine ); if( error ) return error;
+    }
+  } else {
+    machine_reset();
   }
 
   capabilities = machine_current->capabilities;

Modified: vendor/fuse/current/spectrum.c
===================================================================
--- vendor/fuse/current/spectrum.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/spectrum.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* spectrum.c: Generic Spectrum routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: spectrum.c,v 1.67 2007/02/02 16:21:52 pak21 Exp $
+   $Id: spectrum.c,v 1.67.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -97,7 +97,7 @@
 
 /* What happens if we read from an unattached port? */
 libspectrum_byte
-spectrum_unattached_port( int offset )
+spectrum_unattached_port( void )
 {
   int line, tstates_through_line, column;
 
@@ -110,24 +110,26 @@
 	   machine_current->line_times[ DISPLAY_BORDER_HEIGHT ] ) /
     machine_current->timings.tstates_per_line;
 
-  /* Idle bus if we're in the lower or upper borders */
+  /* Idle bus if we're in the lower border */
   if( line >= DISPLAY_HEIGHT ) return 0xff;
 
-  /* Work out where we are in this line */
+  /* Work out where we are in this line, remembering that line_times[] holds
+     the first pixel we display, not the start of where the Spectrum produced
+     the left border */
   tstates_through_line = tstates -
-    machine_current->line_times[ DISPLAY_BORDER_HEIGHT + line ];
+    machine_current->line_times[ DISPLAY_BORDER_HEIGHT + line ] +
+    ( machine_current->timings.left_border - DISPLAY_BORDER_WIDTH_COLS * 4 );
 
   /* Idle bus if we're in the left border */
-  if( tstates_through_line < machine_current->timings.left_border - offset )
+  if( tstates_through_line < machine_current->timings.left_border )
     return 0xff;
 
   /* Or the right border or retrace */
   if( tstates_through_line >= machine_current->timings.left_border +
-                              machine_current->timings.horizontal_screen -
-                              offset )
+                              machine_current->timings.horizontal_screen  )
     return 0xff;
 
-  column = ( ( tstates_through_line + 1 -
+  column = ( ( tstates_through_line -
 	       machine_current->timings.left_border ) / 8 ) * 2;
 
   switch( tstates_through_line % 8 ) {
@@ -137,24 +139,24 @@
        http://www.ramsoft.bbk.org/floatingbus.html
 
        However, the timings used are based on the first byte being
-       returned at 14335 (48K) and 14361 (128K) respectively, not
+       returned at 14338 (48K) and 14364 (128K) respectively, not
        14347 and 14368 as used by Ramsoft.
 
        In contrast to previous versions of this code, Arkanoid and
        Sidewize now work. */
 
     /* Attribute bytes */
-    case 3: column++;
-    case 1:
+    case 5: column++;
+    case 3:
       return RAM[ memory_current_screen ][ display_attr_start[line] + column ];
 
     /* Screen data */
-    case 2: column++;
-    case 0:
+    case 4: column++;
+    case 2:
       return RAM[ memory_current_screen ][ display_line_start[line] + column ];
 
     /* Idle bus */
-    case 4: case 5: case 6: case 7:
+    case 0: case 1: case 6: case 7:
       return 0xff;
 
   }

Modified: vendor/fuse/current/spectrum.h
===================================================================
--- vendor/fuse/current/spectrum.h	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/spectrum.h	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* spectrum.h: Spectrum 48K specific routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: spectrum.h,v 1.45 2007/02/02 16:21:52 pak21 Exp $
+   $Id: spectrum.h,v 1.45.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -66,7 +66,7 @@
 
 } spectrum_raminfo;
 
-libspectrum_byte spectrum_unattached_port( int offset );
+libspectrum_byte spectrum_unattached_port( void );
 
 /* Miscellaneous stuff */
 

Modified: vendor/fuse/current/ui/fb/fbdisplay.c
===================================================================
--- vendor/fuse/current/ui/fb/fbdisplay.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/fb/fbdisplay.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -2,7 +2,7 @@
    Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt,
 			   Witold Filipczyk
 
-   $Id: fbdisplay.c,v 1.40 2007/02/02 16:21:56 pak21 Exp $
+   $Id: fbdisplay.c,v 1.40.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -293,10 +293,10 @@
   return 1;
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 void

Modified: vendor/fuse/current/ui/ggi/ggidisplay.c
===================================================================
--- vendor/fuse/current/ui/ggi/ggidisplay.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/ggi/ggidisplay.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* ggiui.c: Routines for dealing with the GGI user interface
    Copyright (c) 2003 Catalin Mihaila, Philip Kendall
 
-   $Id: ggidisplay.c,v 1.6 2007/02/02 16:21:56 pak21 Exp $
+   $Id: ggidisplay.c,v 1.6.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -160,10 +160,10 @@
 }
 
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 /* Set one pixel in the display */

Modified: vendor/fuse/current/ui/gtk/gtkdisplay.c
===================================================================
--- vendor/fuse/current/ui/gtk/gtkdisplay.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/gtk/gtkdisplay.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* gtkdisplay.c: GTK+ routines for dealing with the Speccy screen
    Copyright (c) 2000-2005 Philip Kendall
 
-   $Id: gtkdisplay.c,v 1.59 2007/02/02 16:21:59 pak21 Exp $
+   $Id: gtkdisplay.c,v 1.59.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -332,7 +332,7 @@
 			 scaled_pitch );
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
   fuse_emulation_pause();
@@ -341,6 +341,8 @@
   display_refresh_all();
 
   fuse_emulation_unpause();
+
+  return 0;
 }
 
 int

Modified: vendor/fuse/current/ui/scaler/scaler.c
===================================================================
--- vendor/fuse/current/ui/scaler/scaler.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/scaler/scaler.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* scaler.c: code for selecting (etc) scalers
  * Copyright (C) 2003 Fredrick Meunier, Philip Kendall
  * 
- * $Id: scaler.c,v 1.28 2007/01/28 11:27:13 fredm Exp $
+ * $Id: scaler.c,v 1.28.2.1 2007/04/28 00:23:08 fredm Exp $
  *
  * Originally taken from ScummVM - Scumm Interpreter
  * Copyright (C) 2001  Ludvig Strigeus
@@ -136,9 +136,7 @@
   scaler_flags = scaler_get_flags( current_scaler );
   scaler_expander = scaler_get_expander( current_scaler );
 
-  uidisplay_hotswap_gfx_mode();
-
-  return 0;
+  return uidisplay_hotswap_gfx_mode();
 }
 
 int

Modified: vendor/fuse/current/ui/scaler/scalers.c
===================================================================
--- vendor/fuse/current/ui/scaler/scalers.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/scaler/scalers.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* scalers.c: the actual graphics scalers
  * Copyright (C) 2003 Fredrick Meunier, Philip Kendall
  *
- * $Id: scalers.c,v 1.37 2007/01/29 09:21:18 fredm Exp $
+ * $Id: scalers.c,v 1.37.2.1 2007/05/01 13:26:26 fredm Exp $
  * 
  * Originally taken from ScummVM - Scumm Interpreter
  * Copyright (C) 2001  Ludvig Strigeus
@@ -35,6 +35,14 @@
 #include "ui/ui.h"
 #include "ui/uidisplay.h"
 
+#ifndef MIN
+#define MIN(a,b)    (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef ABS
+#define ABS(a)     ((x)>=0?(x):-(x))
+#endif
+
 /* The actual code for the scalers starts here */
 
 #if SCALER_DATA_SIZE == 2

Modified: vendor/fuse/current/ui/sdl/sdldisplay.c
===================================================================
--- vendor/fuse/current/ui/sdl/sdldisplay.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/sdl/sdldisplay.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* sdldisplay.c: Routines for dealing with the SDL display
    Copyright (c) 2000-2006 Philip Kendall, Matan Ziv-Av, Fredrick Meunier
 
-   $Id: sdldisplay.c,v 1.43 2007/02/02 16:21:59 pak21 Exp $
+   $Id: sdldisplay.c,v 1.43.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -89,7 +89,7 @@
 static int num_rects = 0;
 static libspectrum_byte sdldisplay_force_full_refresh = 1;
 
-static int min_fullscreen_width;
+static int max_fullscreen_height;
 static int min_fullscreen_height;
 
 /* The current size of the display (in units of DISPLAY_SCREEN_*) */
@@ -225,12 +225,14 @@
      at all */
   if( modes == (SDL_Rect **) 0 || modes == (SDL_Rect **) -1 ){
     /* Just try whatever we have and see what happens */
-    min_fullscreen_width = 320;
+    max_fullscreen_height = 480;
     min_fullscreen_height = 240;
   } else {
+    /* Record the largest supported fullscreen software mode */
+    max_fullscreen_height = modes[0]->h;
+
     /* Record the smallest supported fullscreen software mode */
     for( i=0; modes[i]; ++i ) {
-      min_fullscreen_width = modes[i]->w;
       min_fullscreen_height = modes[i]->h;
     }
   }
@@ -245,7 +247,7 @@
   if ( scaler_select_scaler( current_scaler ) )
     scaler_select_scaler( SCALER_NORMAL );
 
-  sdldisplay_load_gfx_mode();
+  if( sdldisplay_load_gfx_mode() ) return 1;
 
   SDL_WM_SetCaption( "Fuse", "Fuse" );
 
@@ -293,15 +295,17 @@
   if( settings_current.full_screen ) {
     int i = 0;
     while( i < SCALER_NUM &&
-           image_height * sdldisplay_current_size <= min_fullscreen_height/2 ) {
+           ( image_height*sdldisplay_current_size <= min_fullscreen_height/2 ||
+             image_height*sdldisplay_current_size > max_fullscreen_height ) ) {
       if( windowed_scaler == -1) windowed_scaler = current_scaler;
       while( !scaler_is_supported(i) ) i++;
       scaler_select_scaler( i++ );
       sdldisplay_current_size = scaler_get_scaling_factor( current_scaler );
-      /* if we failed to find a suitable size scaler, just use what the user had
-         originally */
-      if( image_height * sdldisplay_current_size <= min_fullscreen_height/2 ) {
-        scaler_select_scaler( windowed_scaler );
+      /* if we failed to find a suitable size scaler, just use normal (what the
+         user had originally may be too big) */
+      if( image_height * sdldisplay_current_size <= min_fullscreen_height/2 ||
+          image_height * sdldisplay_current_size > max_fullscreen_height ) {
+        scaler_select_scaler( SCALER_NORMAL );
         sdldisplay_current_size = scaler_get_scaling_factor( current_scaler );
       }
     }
@@ -337,8 +341,8 @@
                                  : SDL_SWSURFACE
   );
   if( !sdldisplay_gc ) {
-    fprintf( stderr, "%s: couldn't create gc\n", fuse_progname );
-    return 1;
+    fprintf( stderr, "%s: couldn't create SDL graphics context\n", fuse_progname );
+    fuse_abort();
   }
 
   sdldisplay_is_full_screen =
@@ -365,7 +369,7 @@
 
   if( !tmp_screen ) {
     fprintf( stderr, "%s: couldn't create tmp_screen\n", fuse_progname );
-    return 1;
+    fuse_abort();
   }
 
   sdldisplay_allocate_colours( 16, colour_values, bw_values );
@@ -376,7 +380,7 @@
   return 0;
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
   fuse_emulation_pause();
@@ -388,7 +392,7 @@
   }
 
   /* Setup the new GFX mode */
-  sdldisplay_load_gfx_mode();
+  if( sdldisplay_load_gfx_mode() ) return 1;
 
   /* reset palette */
   SDL_SetColors( sdldisplay_gc, colour_palette, 0, 16 );
@@ -403,6 +407,8 @@
   }
 
   fuse_emulation_unpause();
+
+  return 0;
 }
 
 static void
@@ -664,8 +670,10 @@
   /* We check for a switch to fullscreen here to give systems with a
      windowed-only UI a chance to free menu etc. resources before
      the switch to fullscreen (e.g. Mac OS X) */
-  if( sdldisplay_is_full_screen != settings_current.full_screen ) {
-    uidisplay_hotswap_gfx_mode();
+  if( sdldisplay_is_full_screen != settings_current.full_screen &&
+      uidisplay_hotswap_gfx_mode() ) {
+    fprintf( stderr, "%s: Error switching to fullscreen\n", fuse_progname );
+    fuse_abort();
   }
 
   /* Force a full redraw if requested */

Modified: vendor/fuse/current/ui/svga/svgadisplay.c
===================================================================
--- vendor/fuse/current/ui/svga/svgadisplay.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/svga/svgadisplay.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -2,7 +2,7 @@
    Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Witold Filipczyk,
 			   Russell Marks
 
-   $Id: svgadisplay.c,v 1.32 2007/02/02 16:21:59 pak21 Exp $
+   $Id: svgadisplay.c,v 1.32.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -216,10 +216,10 @@
   return 0;
 }
   
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 void

Modified: vendor/fuse/current/ui/uidisplay.h
===================================================================
--- vendor/fuse/current/ui/uidisplay.h	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/uidisplay.h	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* uidisplay.h: Low-level display routines
    Copyright (c) 2000-2003 Philip Kendall
 
-   $Id: uidisplay.h,v 1.23 2007/02/02 16:21:55 pak21 Exp $
+   $Id: uidisplay.h,v 1.23.2.1 2007/04/28 00:23:07 fredm Exp $
 
    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
@@ -34,7 +34,7 @@
 
 void uidisplay_area( int x, int y, int w, int h );
 void uidisplay_frame_end( void );
-void uidisplay_hotswap_gfx_mode( void );
+int uidisplay_hotswap_gfx_mode( void );
 
 int uidisplay_end(void);
 
@@ -44,8 +44,8 @@
 
 void uidisplay_putpixel( int x, int y, int colour );
 void uidisplay_plot8( int x, int y, libspectrum_byte data, libspectrum_byte ink,
-		    libspectrum_byte paper );
+                      libspectrum_byte paper );
 void uidisplay_plot16( int x, int y, libspectrum_word data, libspectrum_byte ink,
-		     libspectrum_byte paper);
+                       libspectrum_byte paper);
 
 #endif			/* #ifndef FUSE_UIDISPLAY_H */

Modified: vendor/fuse/current/ui/win32/win32display.c
===================================================================
--- vendor/fuse/current/ui/win32/win32display.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/win32/win32display.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* win32display.c: Routines for dealing with the Win32 DirectDraw display
    Copyright (c) 2003 Philip Kendall, Marek Januszewski
 
-   $Id: win32display.c,v 1.5 2007/02/02 16:22:00 pak21 Exp $
+   $Id: win32display.c,v 1.5.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -444,7 +444,7 @@
 
 }    
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
 /* TODO: pause hangs emulator
@@ -455,6 +455,8 @@
 /* TODO: pause hangs emulator
   fuse_emulation_unpause();
 */
+
+  return 0;
 }
 
 int

Modified: vendor/fuse/current/ui/xlib/xdisplay.c
===================================================================
--- vendor/fuse/current/ui/xlib/xdisplay.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ui/xlib/xdisplay.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* xdisplay.c: Routines for dealing with drawing the Speccy's screen via Xlib
    Copyright (c) 2000-2005 Philip Kendall, Darren Salt
 
-   $Id: xdisplay.c,v 1.56 2007/02/02 16:22:00 pak21 Exp $
+   $Id: xdisplay.c,v 1.56.2.1 2007/04/28 00:23:08 fredm Exp $
 
    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
@@ -496,10 +496,10 @@
   if( image ) XDestroyImage( image ); image = 0;
 }
 
-void
+int
 uidisplay_hotswap_gfx_mode( void )
 {
-  return;
+  return 0;
 }
 
 int

Modified: vendor/fuse/current/uidisplay.c
===================================================================
--- vendor/fuse/current/uidisplay.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/uidisplay.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* uidisplay.c: UI display functions
    Copyright (c) 2002-2003 Philip Kendall
 
-   $Id: uidisplay.c,v 1.9 2007/02/02 16:21:52 pak21 Exp $
+   $Id: uidisplay.c,v 1.9.2.1 2007/04/25 03:32:22 fredm Exp $
 
    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,7 +65,8 @@
 
       data = screen[ display_line_start[y]+x ];
 
-      uidisplay_plot8( x, y, data, ink, paper );
+      uidisplay_plot8( x + DISPLAY_BORDER_WIDTH_COLS, y + DISPLAY_BORDER_HEIGHT,
+                       data, ink, paper );
     }
   }
 

Modified: vendor/fuse/current/ula.c
===================================================================
--- vendor/fuse/current/ula.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ula.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* ula.c: ULA routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: ula.c,v 1.5 2007/02/02 16:21:52 pak21 Exp $
+   $Id: ula.c,v 1.5.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -98,7 +98,7 @@
 }  
 
 void
-ula_contend_port_preio( libspectrum_word port )
+ula_contend_port_early( libspectrum_word port )
 {
   if( ( port & 0xc000 ) == 0x4000 ) tstates += ula_contention[ tstates ];
    
@@ -106,20 +106,20 @@
 }
 
 void
-ula_contend_port_postio( libspectrum_word port )
+ula_contend_port_late( libspectrum_word port )
 {
   if( machine_current->ram.port_contended( port ) ) {
 
-    tstates += ula_contention[ tstates ]; tstates += 3;
+    tstates += ula_contention[ tstates ]; tstates += 2;
 
   } else {
 
     if( ( port & 0xc000 ) == 0x4000 ) {
       tstates += ula_contention[ tstates ]; tstates++;
       tstates += ula_contention[ tstates ]; tstates++;
-      tstates += ula_contention[ tstates ]; tstates++;
+      tstates += ula_contention[ tstates ];
     } else {
-      tstates += 3;
+      tstates += 2;
     }
 
   }

Modified: vendor/fuse/current/ula.h
===================================================================
--- vendor/fuse/current/ula.h	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/ula.h	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* ula.h: ULA routines
    Copyright (c) 1999-2004 Philip Kendall, Darren Salt
 
-   $Id: ula.h,v 1.3 2007/02/02 16:21:52 pak21 Exp $
+   $Id: ula.h,v 1.3.2.1 2007/05/03 07:31:42 pak21 Exp $
 
    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
@@ -37,7 +37,7 @@
 int ula_from_snapshot( libspectrum_snap *snap );
 int ula_to_snapshot( libspectrum_snap *snap );
 
-void ula_contend_port_preio( libspectrum_word port );
-void ula_contend_port_postio( libspectrum_word port );
+void ula_contend_port_early( libspectrum_word port );
+void ula_contend_port_late( libspectrum_word port );
 
 #endif			/* #ifndef FUSE_ULA_H */

Modified: vendor/fuse/current/widget/Makefile.am
===================================================================
--- vendor/fuse/current/widget/Makefile.am	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/widget/Makefile.am	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 2001,2002 Philip Kendall
 
-## $Id: Makefile.am,v 1.39 2007/02/02 16:22:00 pak21 Exp $
+## $Id: Makefile.am,v 1.39.2.1 2007/04/16 12:35:07 fredm Exp $
 
 ## 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,3 +65,6 @@
 		 options.h options.pl options-header.pl
 
 pkgdata_DATA = fuse.font
+
+EXTRA_DIST = mkfusefont.pl \
+	     fuse.font.sbf

Modified: vendor/fuse/current/widget/menu.c
===================================================================
--- vendor/fuse/current/widget/menu.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/widget/menu.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* menu.c: general menu widget
    Copyright (c) 2001-2006 Philip Kendall
 
-   $Id: menu.c,v 1.109 2007/02/02 16:22:00 pak21 Exp $
+   $Id: menu.c,v 1.109.2.1 2007/04/25 03:32:22 fredm Exp $
 
    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
@@ -553,6 +553,7 @@
 
   info.filename = filename;
   info.screen = file.buffer;
+  info.border = 0;
 
   widget_do( WIDGET_TYPE_PICTURE, &info );
 

Modified: vendor/fuse/current/widget/pokefinder.c
===================================================================
--- vendor/fuse/current/widget/pokefinder.c	2007-05-12 00:06:47 UTC (rev 363)
+++ vendor/fuse/current/widget/pokefinder.c	2007-05-12 00:13:58 UTC (rev 364)
@@ -1,7 +1,7 @@
 /* pokefinder.c: The poke finder widget
    Copyright (c) 2004 Darren Salt
 
-   $Id: pokefinder.c,v 1.2 2005/03/26 17:25:01 pak21 Exp $
+   $Id: pokefinder.c,v 1.2.6.1 2007/04/25 16:21:32 pak21 Exp $
 
    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
@@ -52,18 +52,17 @@
 widget_pokefinder_draw( void *data )
 {
   widget_dialog_with_border( 1, 2, 30, 12 );
-  widget_printstring( 15 - strlen( title ) / 2, 2, WIDGET_COLOUR_FOREGROUND,
-		      title );
-  widget_printstring( 2, 4, WIDGET_COLOUR_FOREGROUND, "Possible: " );
-  widget_printstring( 2, 5, WIDGET_COLOUR_FOREGROUND, "Value: " );
+  widget_print_title( 16, WIDGET_COLOUR_FOREGROUND, title );
+  widget_printstring( 16, 32, WIDGET_COLOUR_FOREGROUND, "Possible: " );
+  widget_printstring( 16, 40, WIDGET_COLOUR_FOREGROUND, "Value: " );
 
   update_possible();
   display_possible();
   display_value();
 
-  widget_printstring( 2, 12, WIDGET_COLOUR_FOREGROUND,
-		      "(I)nc'd (D)ec'd (S)earch" );
-  widget_printstring( 2, 13, WIDGET_COLOUR_FOREGROUND, "(R)eset (C)lose" );
+  widget_printstring( 16, 96, WIDGET_COLOUR_FOREGROUND,
+		      "\x0AI\x09nc'd \x0A" "D\x09" "ec'd \x0AS\x09" "earch" );
+  widget_printstring( 16, 104, WIDGET_COLOUR_FOREGROUND, "\x0AR\x09" "eset \x0A" "C\x09lose" );
 
   widget_display_lines( 2, 12 );
 
@@ -98,10 +97,10 @@
   widget_rectangle(  96,  32,  48,  8, WIDGET_COLOUR_BACKGROUND );
   widget_rectangle(  16,  56, 128, 32, WIDGET_COLOUR_BACKGROUND );
   widget_rectangle(  16,  88, 136,  8, WIDGET_COLOUR_BACKGROUND );
-  widget_rectangle( 144, 104,  56,  8, WIDGET_COLOUR_BACKGROUND );
+  widget_rectangle(  82, 104,  56,  8, WIDGET_COLOUR_BACKGROUND );
 
   snprintf( buf, sizeof( buf ), "%d", pokefinder_count );
-  widget_printstring( 12, 4, WIDGET_COLOUR_FOREGROUND, buf );
+  widget_printstring( 96, 32, WIDGET_COLOUR_FOREGROUND, buf );
 
   if( FEW_ENOUGH() ) {
     size_t i;
@@ -120,10 +119,10 @@
 
       snprintf( buf, sizeof( buf ), "%2d:%04X", possible_page[i],
 		possible_offset[i] );
-      widget_printstring( x, y, colour, buf );
+      widget_printstring( x * 8, y * 8, colour, buf );
     }
 
-    widget_printstring( 18, 13, WIDGET_COLOUR_FOREGROUND, "(B)reak" );
+    widget_printstring( 83, 104, WIDGET_COLOUR_FOREGROUND, "\x0A" "B\x09reak" );
   }
 
   widget_display_lines( 4, 10 );
@@ -136,7 +135,7 @@
 
   snprintf( buf, sizeof( buf ), "%d", value );
   widget_rectangle( 72, 40, 24, 8, WIDGET_COLOUR_BACKGROUND );
-  widget_printstring( 9, 5, WIDGET_COLOUR_FOREGROUND, buf );
+  widget_printstring( 72, 40, WIDGET_COLOUR_FOREGROUND, buf );
   widget_display_lines( 5, 1 );
 }
 
@@ -202,10 +201,10 @@
 	    possible_offset[selected], 0, DEBUGGER_BREAKPOINT_LIFE_PERMANENT,
 	    NULL
 	  ) ) {
-	widget_printstring( 2, 11, WIDGET_COLOUR_FOREGROUND,
+	widget_printstring( 16, 88, WIDGET_COLOUR_FOREGROUND,
 			    "Breakpoint failed" );
       } else {
-	widget_printstring( 2, 11, WIDGET_COLOUR_FOREGROUND,
+	widget_printstring( 16, 88, WIDGET_COLOUR_FOREGROUND,
 			    "Breakpoint added" );
       }
       widget_display_lines( 11, 1 );


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: [363] vendor/libspectrum/libspectrum-0.3.0.1/

From: <fr...@us...> - 2007-05-12 00:06:45

Revision: 363
          http://svn.sourceforge.net/fuse-for-macosx/?rev=363&view=rev
Author:   fredm
Date:     2007-05-11 17:06:47 -0700 (Fri, 11 May 2007)

Log Message:
-----------
Tag vendor/libspectrum/current as
vendor/libspectrum/libspectrum-0.3.0.1.

Added Paths:
-----------
    vendor/libspectrum/libspectrum-0.3.0.1/

Copied: vendor/libspectrum/libspectrum-0.3.0.1 (from rev 362, vendor/libspectrum/current)


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

Flat | Threaded

<< < 1 .. 17 18 19 20 21 .. 25 > >> (Page 19 of 25)