Fuse - the Free Unix Spectrum Emulator

Revision: 4172
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4172&view=rev
Author:   pak21
Date:     2010-10-03 22:51:59 +0000 (Sun, 03 Oct 2010)

Log Message:
-----------
Small update to mention WoS forums.

Modified Paths:
--------------
    trunk/fuse/README
    trunk/fuse/hacking/ChangeLog

Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README	2010-10-03 17:50:54 UTC (rev 4171)
+++ trunk/fuse/README	2010-10-03 22:51:59 UTC (rev 4172)
@@ -209,9 +209,9 @@
 and the Fuse project page on SourceForge,
 http://sourceforge.net/projects/fuse-emulator/
 
-If you're interested in more general Speccy related discussions, visit
-the Usenet group 'comp.sys.sinclair', but do read the FAQ
-( http://www.worldofspectrum.org/faq/index.html ) first!
+For Spectrum discussions not directly related to Fuse, visit either the
+Usenet newsgroup `comp.sys.sinclair' or the World of Spectrum forums
+<http://www.worldofspectrum.org/forums/>.
 
 Philip Kendall <philip-fuse@...>
 FIXME October 2010

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-03 17:50:54 UTC (rev 4171)
+++ trunk/fuse/hacking/ChangeLog	2010-10-03 22:51:59 UTC (rev 4172)
@@ -3342,3 +3342,4 @@
 20100930 ChangeLog,fuse.c,man/fuse.1,README: first updates for a "1.0" release.
 20101002 lib/{compressed,uncompressed}/*.szx: update libspectrum signature in
          each file so we know they don't have the A-F swap bug.
+20101003 README: small update to mention WoS forums.


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

Revision: 4175
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4175&view=rev
Author:   fredm
Date:     2010-10-06 10:44:19 +0000 (Wed, 06 Oct 2010)

Log Message:
-----------
Update header check for XShm.h (patch #3081497) (Gergely Szasz).

Modified Paths:
--------------
    trunk/fuse/configure.in
    trunk/fuse/hacking/ChangeLog

Modified: trunk/fuse/configure.in
===================================================================
--- trunk/fuse/configure.in	2010-10-05 11:20:02 UTC (rev 4174)
+++ trunk/fuse/configure.in	2010-10-06 10:44:19 UTC (rev 4175)
@@ -251,7 +251,11 @@
   fi
 
   dnl Check for the MIT-SHM extension
-  AC_CHECK_HEADERS( X11/extensions/XShm.h )
+  AC_CHECK_HEADERS( X11/extensions/XShm.h,,,[[
+	#include <sys/ipc.h>
+	#include <sys/shm.h>
+	#include <X11/Xlib.h>
+	]])
   AC_CHECK_LIB( Xext, XShmAttach, LIBS="$LIBS -lXext" )
 
   AC_DEFINE([UI_X], 1, [Defined if Xlib UI in use])

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-05 11:20:02 UTC (rev 4174)
+++ trunk/fuse/hacking/ChangeLog	2010-10-06 10:44:19 UTC (rev 4175)
@@ -3343,3 +3343,5 @@
 20101002 lib/{compressed,uncompressed}/*.szx: update libspectrum signature in
          each file so we know they don't have the A-F swap bug.
 20101003 README: small update to mention WoS forums.
+20101006 configure.in: update header check for XShm.h (patch #3081497) (Gergely
+         Szasz).


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

Revision: 4176
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4176&view=rev
Author:   fredm
Date:     2010-10-06 10:56:05 +0000 (Wed, 06 Oct 2010)

Log Message:
-----------
Use F1 as shortcut to open menus, set window dialogs as transient for the main
window and set a fixed width for the emulation speed display (patch #3081729)
(Sergio Baldovi).

Modified Paths:
--------------
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/ui/gtk/gtkkeyboard.c
    trunk/fuse/ui/gtk/gtkui.c
    trunk/fuse/ui/gtk/statusbar.c
    trunk/fuse/ui/gtk/stock.c

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-06 10:44:19 UTC (rev 4175)
+++ trunk/fuse/hacking/ChangeLog	2010-10-06 10:56:05 UTC (rev 4176)
@@ -3345,3 +3345,7 @@
 20101003 README: small update to mention WoS forums.
 20101006 configure.in: update header check for XShm.h (patch #3081497) (Gergely
          Szasz).
+20101006 ui/gtk/{gtkkeyboard.c,gtkui.c,statusbar.c,stock.c}: use F1 as shortcut to
+         open menus, set window dialogs as transient for the main window and set a
+         fixed width for the emulation speed display (patch #3081729) (Sergio
+         Baldovi).

Modified: trunk/fuse/ui/gtk/gtkkeyboard.c
===================================================================
--- trunk/fuse/ui/gtk/gtkkeyboard.c	2010-10-06 10:44:19 UTC (rev 4175)
+++ trunk/fuse/ui/gtk/gtkkeyboard.c	2010-10-06 10:56:05 UTC (rev 4176)
@@ -82,7 +82,7 @@
 {
   input_event_t fuse_event;
 
-  if( event->key.keyval == GDK_F10 && event->key.state == 0 )
+  if( event->key.keyval == GDK_F1 && event->key.state == 0 )
     ui_mouse_suspend();
 
   fuse_event.type = INPUT_EVENT_KEYPRESS;

Modified: trunk/fuse/ui/gtk/gtkui.c
===================================================================
--- trunk/fuse/ui/gtk/gtkui.c	2010-10-06 10:44:19 UTC (rev 4175)
+++ trunk/fuse/ui/gtk/gtkui.c	2010-10-06 10:56:05 UTC (rev 4176)
@@ -144,6 +144,7 @@
 {
   GtkWidget *box, *menu_bar;
   GtkAccelGroup *accel_group;
+  GtkSettings *settings;
 
   gtk_init(argc,argv);
 
@@ -154,6 +155,8 @@
 
   gtkui_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
+  settings = gtk_widget_get_settings( GTK_WIDGET( gtkui_window ) );
+  g_object_set( settings, "gtk-menu-bar-accel", "F1", NULL );
   gtk_window_set_title( GTK_WINDOW(gtkui_window), "Fuse" );
   gtk_window_set_wmclass( GTK_WINDOW(gtkui_window), fuse_progname, "Fuse" );
 

Modified: trunk/fuse/ui/gtk/statusbar.c
===================================================================
--- trunk/fuse/ui/gtk/statusbar.c	2010-10-06 10:44:19 UTC (rev 4175)
+++ trunk/fuse/ui/gtk/statusbar.c	2010-10-06 10:56:05 UTC (rev 4176)
@@ -97,6 +97,7 @@
 					   NULL, gtkpixmap_mouse_active );
 
   speed_status = gtk_label_new( "100%" );
+  gtk_label_set_width_chars( GTK_LABEL( speed_status ), 8 );
   gtk_box_pack_end( GTK_BOX( status_bar ), speed_status, FALSE, FALSE, 0 );
 
   separator = gtk_vseparator_new();

Modified: trunk/fuse/ui/gtk/stock.c
===================================================================
--- trunk/fuse/ui/gtk/stock.c	2010-10-06 10:44:19 UTC (rev 4175)
+++ trunk/fuse/ui/gtk/stock.c	2010-10-06 10:56:05 UTC (rev 4176)
@@ -180,5 +180,8 @@
   gtk_signal_connect( GTK_OBJECT( dialog ), "delete-event",
 		      destroy ? destroy : DEFAULT_DESTROY, NULL );
   if( destroy == NULL ) gtk_window_set_modal( GTK_WINDOW( dialog ), TRUE );
+  gtk_window_set_transient_for( GTK_WINDOW( dialog ),
+                                GTK_WINDOW( gtkui_window ) );
+
   return dialog;
 }


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

Revision: 4177
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4177&view=rev
Author:   fredm
Date:     2010-10-07 09:34:31 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
Don't close a disk or mdr if a write fails (patch #3058156) (thanks, Crisis)
(Gergely Szasz).

Modified Paths:
--------------
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/ui.c

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-06 10:56:05 UTC (rev 4176)
+++ trunk/fuse/hacking/ChangeLog	2010-10-07 09:34:31 UTC (rev 4177)
@@ -3349,3 +3349,5 @@
          open menus, set window dialogs as transient for the main window and set a
          fixed width for the emulation speed display (patch #3081729) (Sergio
          Baldovi).
+20101007 ui.c: don't close a disk or mdr if a write fails (patch #3058156) (thanks,
+         Crisis) (Gergely Szasz).

Modified: trunk/fuse/ui.c
===================================================================
--- trunk/fuse/ui.c	2010-10-06 10:56:05 UTC (rev 4176)
+++ trunk/fuse/ui.c	2010-10-07 09:34:31 UTC (rev 4177)
@@ -643,6 +643,7 @@
 int
 ui_plus3_disk_write( specplus3_drive_number which )
 {
+  int err;
   char drive, *filename, title[80];
 
   switch( which ) {
@@ -658,18 +659,19 @@
   filename = ui_get_save_filename( title );
   if( !filename ) { fuse_emulation_unpause(); return 1; }
 
-  specplus3_disk_write( which, filename );
+  err = specplus3_disk_write( which, filename );
 
   free( filename );
 
   fuse_emulation_unpause();
 
-  return 0;
+  return err;
 }
 
 int
 ui_beta_disk_write( beta_drive_number which )
 {
+  int err;
   char drive, *filename, title[80];
 
   switch( which ) {
@@ -687,18 +689,19 @@
   filename = ui_get_save_filename( title );
   if( !filename ) { fuse_emulation_unpause(); return 1; }
 
-  beta_disk_write( which, filename );
+  err = beta_disk_write( which, filename );
 
   free( filename );
 
   fuse_emulation_unpause();
 
-  return 0;
+  return err;
 }
 
 int
 ui_opus_disk_write( opus_drive_number which )
 {
+  int err;
   char drive, *filename, title[80];
 
   switch( which ) {
@@ -714,18 +717,19 @@
   filename = ui_get_save_filename( title );
   if( !filename ) { fuse_emulation_unpause(); return 1; }
 
-  opus_disk_write( which, filename );
+  err = opus_disk_write( which, filename );
 
   free( filename );
 
   fuse_emulation_unpause();
 
-  return 0;
+  return err;
 }
 
 int
 ui_plusd_disk_write( plusd_drive_number which )
 {
+  int err;
   char drive, *filename, title[80];
 
   switch( which ) {
@@ -741,18 +745,19 @@
   filename = ui_get_save_filename( title );
   if( !filename ) { fuse_emulation_unpause(); return 1; }
 
-  plusd_disk_write( which, filename );
+  err = plusd_disk_write( which, filename );
 
   free( filename );
 
   fuse_emulation_unpause();
 
-  return 0;
+  return err;
 }
 
 int
 ui_mdr_write( int which )
 {
+  int err;
   char *filename, title[80];
 
   fuse_emulation_pause();
@@ -762,13 +767,13 @@
   filename = ui_get_save_filename( title );
   if( !filename ) { fuse_emulation_unpause(); return 1; }
 
-  if1_mdr_write( which, filename );
+  err = if1_mdr_write( which, filename );
 
   free( filename );
 
   fuse_emulation_unpause();
 
-  return 0;
+  return err;
 }
 
 #ifdef USE_WIDGET


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

Revision: 4179
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4179&view=rev
Author:   fredm
Date:     2010-10-08 10:05:55 +0000 (Fri, 08 Oct 2010)

Log Message:
-----------
Fix colour of dialog Cancel entry and correct action returned when cancel is
selected (patch #3083619) (Gergely Szasz).

Modified Paths:
--------------
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/ui/widget/query.c

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-07 09:51:34 UTC (rev 4178)
+++ trunk/fuse/hacking/ChangeLog	2010-10-08 10:05:55 UTC (rev 4179)
@@ -3345,9 +3345,11 @@
 20101003 README: small update to mention WoS forums.
 20101006 configure.in: update header check for XShm.h (patch #3081497) (Gergely
          Szasz).
-20101006 ui/gtk/{gtkkeyboard.c,gtkui.c,statusbar.c,stock.c}: use F1 as shortcut to
-         open menus, set window dialogs as transient for the main window and set a
-         fixed width for the emulation speed display (patch #3081729) (Sergio
-         Baldovi).
-20101007 ui.c: don't close a disk or mdr if a write fails (patch #3058156) (thanks,
-         Crisis) (Gergely Szasz).
+20101006 ui/gtk/{gtkkeyboard.c,gtkui.c,statusbar.c,stock.c}: use F1 as shortcut
+         to open menus, set window dialogs as transient for the main window and
+         set a fixed width for the emulation speed display (patch #3081729)
+         (Sergio Baldovi).
+20101007 ui.c: don't close a disk or mdr if a write fails (patch #3058156)
+         (thanks, Crisis) (Gergely Szasz).
+20101007 ui/widget/query.c: fix colour of dialog Cancel entry and correct action
+         returned when cancel is selected (patch #3083619) (Gergely Szasz).

Modified: trunk/fuse/ui/widget/query.c
===================================================================
--- trunk/fuse/ui/widget/query.c	2010-10-07 09:51:34 UTC (rev 4178)
+++ trunk/fuse/ui/widget/query.c	2010-10-08 10:05:55 UTC (rev 4179)
@@ -62,7 +62,7 @@
 static widget_query_entry query_save[] = {
   { "\012S\001ave", 0, INPUT_KEY_s, widget_save_click },
   { "\012D\001on't save", 1, INPUT_KEY_d, widget_dont_save_click },
-  { "\010C\001ancel", 2, INPUT_KEY_c, widget_cancel_click },
+  { "\012C\001ancel", 2, INPUT_KEY_c, widget_cancel_click },
   { NULL }
 };
 
@@ -87,7 +87,7 @@
 static void
 widget_cancel_click( void )
 {
-  widget_query.save = UI_CONFIRM_SAVE_DONTSAVE;
+  widget_query.save = UI_CONFIRM_SAVE_CANCEL;
 }
 
 static void


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

Revision: 4180
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4180&view=rev
Author:   fredm
Date:     2010-10-09 12:59:37 +0000 (Sat, 09 Oct 2010)

Log Message:
-----------
Change "Eject and write" menu items to "Save" and "Save as" (patch #3083639)
(Gergely Szasz).

Modified Paths:
--------------
    trunk/fuse/disk/beta.c
    trunk/fuse/disk/disk.c
    trunk/fuse/disk/disk.h
    trunk/fuse/disk/opus.c
    trunk/fuse/disk/plusd.c
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/if1.c
    trunk/fuse/machines/specplus3.c
    trunk/fuse/man/fuse.1
    trunk/fuse/menu.c
    trunk/fuse/menu_data.dat
    trunk/fuse/ui/ui.h
    trunk/fuse/ui.c

Modified: trunk/fuse/disk/beta.c
===================================================================
--- trunk/fuse/disk/beta.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/disk/beta.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -564,25 +564,28 @@
 }
 
 int
-beta_disk_eject( beta_drive_number which, int write )
+beta_disk_eject( beta_drive_number which, int saveas )
 {
   wd_fdc_drive *d;
   char drive;
-  
+
   if( which >= BETA_NUM_DRIVES )
     return 1;
-    
+
   d = &beta_drives[ which ];
-  
+
   if( !d->fdd.loaded )
     return 0;
-    
-  if( write ) {
-  
-    if( ui_beta_disk_write( which ) ) return 1;
 
+  if( saveas ) {	/* 1 -> save as.., 2 -> save */
+
+    if( d->disk.filename == NULL ) saveas = 1;
+    if( ui_beta_disk_write( which, 2 - saveas ) ) return 1;
+    d->disk.dirty = 0;
+    return 0;
+
   } else {
-  
+
     if( d->disk.dirty ) {
       ui_confirm_save_t confirm;
 
@@ -603,7 +606,7 @@
       switch( confirm ) {
 
       case UI_CONFIRM_SAVE_SAVE:
-	if( ui_beta_disk_write( which ) ) return 1;
+	if( beta_disk_eject( which, 2 ) ) return 1;	/* first save */
 	break;
 
       case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -641,6 +644,7 @@
   int error;
 
   d->disk.type = DISK_TYPE_NONE;
+  if( filename == NULL ) filename = d->disk.filename;	/* write over original file */
   error = disk_write( &d->disk, filename );
 
   if( error != DISK_OK ) {
@@ -649,6 +653,10 @@
     return 1;
   }
 
+  if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+    free( d->disk.filename );
+    d->disk.filename = strdup( filename );
+  }
   return 0;
 }
 

Modified: trunk/fuse/disk/disk.c
===================================================================
--- trunk/fuse/disk/disk.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/disk/disk.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -675,6 +675,10 @@
     free( d->data );
     d->data = NULL;
   }
+  if( d->filename != NULL ) {
+    free( d->filename );
+    d->filename = NULL;
+  }
   d->type = DISK_TYPE_NONE;
 }
 
@@ -728,6 +732,7 @@
 disk_new( disk_t *d, int sides, int cylinders,
 	     disk_dens_t density, disk_type_t type )
 {
+  d->filename = NULL;
   if( density < DISK_DENS_AUTO || density > DISK_HD ||	/* unknown density */
       type <= DISK_TYPE_NONE || type >= DISK_TYPE_LAST || /* unknown type */
       sides < 1 || sides > 2 ||				/* 1 or 2 side */
@@ -1903,6 +1908,7 @@
   d->dirty = 0;
   disk_update_tlens( d );
   update_tracks_mode( d );
+  d->filename = strdup( filename );
   return d->status = DISK_OK;
 }
 
@@ -1972,6 +1978,7 @@
   int l, g = 0, pos = 0;
   disk_t d1, d2;
 
+  d->filename = NULL;
   if( filename == NULL || *filename == '\0' )
     return d->status = DISK_OPEN;
 

Modified: trunk/fuse/disk/disk.h
===================================================================
--- trunk/fuse/disk/disk.h	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/disk/disk.h	2010-10-09 12:59:37 UTC (rev 4180)
@@ -87,6 +87,7 @@
 } disk_dens_t;
 
 typedef struct disk_t {
+  char *filename;	/* original filename */
   int sides;		/* 1 or 2 */
   int cylinders;	/* tracks per side  */
   int bpt;		/* bytes per track */

Modified: trunk/fuse/disk/opus.c
===================================================================
--- trunk/fuse/disk/opus.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/disk/opus.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -410,7 +410,7 @@
 }
 
 int
-opus_disk_eject( opus_drive_number which, int write )
+opus_disk_eject( opus_drive_number which, int saveas )
 {
   wd_fdc_drive *d;
 
@@ -422,9 +422,12 @@
   if( d->disk.type == DISK_TYPE_NONE )
     return 0;
 
-  if( write ) {
+  if( saveas ) {	/* 1 -> save as.., 2 -> save */
 
-    if( ui_opus_disk_write( which ) ) return 1;
+    if( d->disk.filename == NULL ) saveas = 1;
+    if( ui_opus_disk_write( which, 2 - saveas ) ) return 1;
+    d->disk.dirty = 0;
+    return 0;
 
   } else {
 
@@ -439,7 +442,7 @@
       switch( confirm ) {
 
       case UI_CONFIRM_SAVE_SAVE:
-	if( ui_opus_disk_write( which ) ) return 1;
+	if( opus_disk_eject( which, 2 ) ) return 1;	/* first save */
 	break;
 
       case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -529,6 +532,7 @@
   int error;
   
   d->disk.type = DISK_TYPE_NONE;
+  if( filename == NULL ) filename = d->disk.filename;	/* write over original file */
   error = disk_write( &d->disk, filename );
 
   if( error != DISK_OK ) {
@@ -537,6 +541,10 @@
     return 1;
   }
 
+  if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+    free( d->disk.filename );
+    d->disk.filename = strdup( filename );
+  }
   return 0;
 }
 

Modified: trunk/fuse/disk/plusd.c
===================================================================
--- trunk/fuse/disk/plusd.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/disk/plusd.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -457,7 +457,7 @@
 }
 
 int
-plusd_disk_eject( plusd_drive_number which, int write )
+plusd_disk_eject( plusd_drive_number which, int saveas )
 {
   wd_fdc_drive *d;
 
@@ -469,9 +469,12 @@
   if( d->disk.type == DISK_TYPE_NONE )
     return 0;
 
-  if( write ) {
+  if( saveas ) {	/* 1 -> save as.., 2 -> save */
 
-    if( ui_plusd_disk_write( which ) ) return 1;
+    if( d->disk.filename == NULL ) saveas = 1;
+    if( ui_plusd_disk_write( which, 2 - saveas ) ) return 1;
+    d->disk.dirty = 0;
+    return 0;
 
   } else {
 
@@ -486,7 +489,7 @@
       switch( confirm ) {
 
       case UI_CONFIRM_SAVE_SAVE:
-	if( ui_plusd_disk_write( which ) ) return 1;
+	if( plusd_disk_eject( which, 2 ) ) return 1;	/* first save */
 	break;
 
       case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -569,13 +572,15 @@
   return 0;
 }
 
+/***TODO most part of the next routine could be move to a common place... */
 int
 plusd_disk_write( plusd_drive_number which, const char *filename )
 {
   wd_fdc_drive *d = &plusd_drives[ which ];
   int error;
-  
+
   d->disk.type = DISK_TYPE_NONE;
+  if( filename == NULL ) filename = d->disk.filename;	/* write over original file */
   error = disk_write( &d->disk, filename );
 
   if( error != DISK_OK ) {
@@ -583,6 +588,10 @@
 	      disk_strerror( error ) );
     return 1;
   }
+  if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+    free( d->disk.filename );
+    d->disk.filename = strdup( filename );
+  }
 
   return 0;
 }

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/hacking/ChangeLog	2010-10-09 12:59:37 UTC (rev 4180)
@@ -3353,3 +3353,6 @@
          (thanks, Crisis) (Gergely Szasz).
 20101007 ui/widget/query.c: fix colour of dialog Cancel entry and correct action
          returned when cancel is selected (patch #3083619) (Gergely Szasz).
+20101009 disk/{beta.c,disk.[ch],opus.c,plusd.c},if1.c,machines/specplus3.c,
+         man/fuse.1,menu.c,menu_data.dat,ui.c,ui/ui.h: change "Eject and write"
+         menu items to "Save" and "Save as" (patch #3083639) (Gergely Szasz).

Modified: trunk/fuse/if1.c
===================================================================
--- trunk/fuse/if1.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/if1.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -64,6 +64,7 @@
  
 typedef struct microdrive_t {
   utils_file file;
+  char *filename;		/* old filename */
   int inserted;
   int modified;
   int motor_on;
@@ -1052,6 +1053,7 @@
   libspectrum_byte len;
   long int i;
 
+  mdr->filename = NULL;
   if( settings_current.mdr_random_len ) {	/* Random length */
     len = 171 + ( ( rand() >> 2 ) + ( rand() >> 2 ) +
                   ( rand() >> 2 ) + ( rand() >> 2 ) )
@@ -1135,6 +1137,7 @@
 
   mdr->inserted = 1;
   mdr->modified = 0;
+  mdr->filename = strdup( filename );
   /* we assume formatted cartridges */
   for( i = libspectrum_microdrive_cartridge_len( mdr->cartridge );
 	i > 0; i-- )
@@ -1146,7 +1149,7 @@
 }
 
 int
-if1_mdr_eject( int which, int write )
+if1_mdr_eject( int which, int saveas )
 {
   microdrive_t *mdr;
 
@@ -1158,9 +1161,12 @@
   if( !mdr->inserted )
     return 0;
 
-  if( write ) {
+  if( saveas ) {	/* 1 -> save as.., 2 -> save */
 
-    if( ui_mdr_write( which ) ) return 1;
+    if( mdr->filename == NULL ) saveas = 1;
+    if( ui_mdr_write( which, 2 - saveas ) ) return 1;
+    mdr->modified = 0;
+    return 0;
 
   } else {
 
@@ -1175,7 +1181,7 @@
       switch( confirm ) {
 
       case UI_CONFIRM_SAVE_SAVE:
-	if( ui_mdr_write( which ) ) return 1;
+	if( if1_mdr_eject( which, 2 ) ) return 1;	/* first save */
 	break;
 
       case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -1186,7 +1192,11 @@
   }
 
   mdr->inserted = 0;
-  
+  if( mdr->filename != NULL ) {
+    free( mdr->filename );
+    mdr->filename = NULL;
+  }
+
   update_menu( UMENU_MDRV1 + which );
   return 0;
 }
@@ -1198,10 +1208,16 @@
   
   libspectrum_microdrive_mdr_write( mdr->cartridge, &mdr->file.buffer,
 			            &mdr->file.length );
-    
+
+  if( filename == NULL ) filename = mdr->filename;	/* Write over the original file */
+
   if( utils_write_file( filename, mdr->file.buffer, mdr->file.length ) )
     return 1;
 
+  if( mdr->filename && strcmp( filename, mdr->filename ) ) {
+    free( mdr->filename );
+    mdr->filename = strdup( filename );
+  }
   return 0;
 }
 

Modified: trunk/fuse/machines/specplus3.c
===================================================================
--- trunk/fuse/machines/specplus3.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/machines/specplus3.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -452,7 +452,7 @@
       break;
     }
     error = disk_new( &d->disk, dt->heads, dt->cylinders, DISK_DENS_AUTO, DISK_UDI );
-    disk_preformat( &d->disk );						/* pre-format disk for +3 */
+    disk_preformat( &d->disk );			/* pre-format disk for +3 */
     if( error != DISK_OK ) {
       ui_error( UI_ERROR_ERROR, "Failed to create disk image: %s",
 				disk_strerror( error ) );
@@ -488,7 +488,7 @@
 }
 
 int
-specplus3_disk_eject( specplus3_drive_number which, int write )
+specplus3_disk_eject( specplus3_drive_number which, int saveas )
 {
   upd_fdc_drive *d;
 
@@ -500,9 +500,12 @@
   if( d->disk.type == DISK_TYPE_NONE )
     return 0;
 
-  if( write ) {
+  if( saveas ) {	/* 1 -> save as.., 2 -> save */
 
-    if( ui_plus3_disk_write( which ) ) return 1;
+    if( d->disk.filename == NULL ) saveas = 1;
+    if( ui_plus3_disk_write( which, 2 - saveas ) ) return 1;	/* save as... */
+    d->disk.dirty = 0;
+    return 0;
 
   } else {
 
@@ -517,7 +520,7 @@
       switch( confirm ) {
 
       case UI_CONFIRM_SAVE_SAVE:
-	if( ui_plus3_disk_write( which ) ) return 1;
+	if( specplus3_disk_eject( which, 2 ) ) return 1;   /* first save it...*/
 	break;
 
       case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -605,8 +608,9 @@
 {
   upd_fdc_drive *d = &specplus3_drives[ which ];
   int error;
-  
+
   d->disk.type = DISK_TYPE_NONE;
+  if( filename == NULL ) filename = d->disk.filename; /* write over original file */
   error = disk_write( &d->disk, filename );
 
   if( error != DISK_OK ) {
@@ -615,6 +619,10 @@
     return 1;
   }
 
+  if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+    free( d->disk.filename );
+    d->disk.filename = strdup( filename );
+  }
   return 0;
 }
 

Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/man/fuse.1	2010-10-09 12:59:37 UTC (rev 4180)
@@ -2327,8 +2327,7 @@
 active from the
 .I "Options, Peripherals"
 menu. Note that any changes to the Microdrive image will not be
-written to the file on disk until the appropriate `eject and write'
-option is used.
+written to the file on disk until the appropriate save option is used.
 .RE
 .PP
 .I "Media, Interface I, Microdrive 1, Insert New"
@@ -2349,12 +2348,17 @@
 modified, you will be asked as to whether you want any changes saved.
 .RE
 .PP
-.I "Media, Interface I, Microdrive 1, Eject and write..."
+.I "Media, Interface I, Microdrive 1, Save"
 .RS
-Write the Microdrive image in Microdrive 1 to a file, and then eject
-the image.  You will be prompted for a filename.
+Save the Microdrive image in Microdrive 1.
 .RE
 .PP
+.I "Media, Interface I, Microdrive 1, Save as..."
+.RS
+Write the Microdrive image in Microdrive 1 to a file. You will be 
+prompted for a filename.
+.RE
+.PP
 .I "Media, Interface I, Microdrive 1, Write protect, Enable"
 .RS
 Enable the write protect tab for the image in Microdrive 1.
@@ -2415,23 +2419,28 @@
 .PP
 .I "Media, Disk, +3, Drive A:, Insert..."
 .RS
-Select a disk-image file to read/write in the +3's emulated drive
+Insert a disk-image file to read/write in the +3's emulated drive
 A:.
 .RE
 .PP
 .I "Media, Disk, +3, Drive A:, Eject"
 .RS
-Deselect the disk image currently in the +3's emulated drive A: \- or
+Eject the disk image currently in the +3's emulated drive A: \- or
 from the emulated machine's perspective, eject it. Note that any
 changes made to the image will not be saved.
 .RE
 .PP
-.I "Media, Disk, +3, Drive A:, Eject and write..."
+.I "Media, Disk, +3, Drive A:, Save"
 .RS
-Deselect the disk image currently in the +3's drive A: and write the
-current state of the disk to a file. You will be prompted for a filename.
+Save the disk image currently in the +3's drive A:.
 .RE
 .PP
+.I "Media, Disk, +3, Drive A:, Save as..."
+.RS
+Save the current state of the disk image currently in the +3's 
+drive A: to a file. You will be prompted for a filename.
+.RE
+.PP
 .I "Media, Disk, +3, Drive B:, Insert..."
 .RS
 As above, but for the +3's drive B:. Fuse emulates drive B: as a
@@ -2443,11 +2452,16 @@
 As above, but for drive B:.
 .RE
 .PP
-.I "Media, Disk, +3, Drive B:, Eject and write"
+.I "Media, Disk, +3, Drive B:, Save"
 .RS
 As above, but for drive B:.
 .RE
 .PP
+.I "Media, Disk, +3, Drive B:, Save as..."
+.RS
+As above, but for drive B:.
+.RE
+.PP
 .I "Media, Disk, Beta, Drive A:, Insert New"
 .RS
 Insert a new (unformatted) disk into the emulated Beta drive A:.
@@ -2457,7 +2471,9 @@
 .br
 .I "Media, Disk, Beta, Drive A:, Eject"
 .br
-.I "Media, Disk, Beta, Drive A:, Eject and write..."
+.I "Media, Disk, Beta, Drive A:, Save"
+.br
+.I "Media, Disk, Beta, Drive A:, Save as..."
 .RS
 As above, but for the emulated Beta disk drive A:.
 .RE
@@ -2487,8 +2503,10 @@
 .br
 .I "Media, Disk, Opus, Drive 1, Eject"
 .br
-.I "Media, Disk, Opus, Drive 1, Eject and write..."
+.I "Media, Disk, Opus, Drive 1, Save"
 .br
+.I "Media, Disk, Opus, Drive 1, Save as..."
+.br
 .I "Media, Disk, Opus, Drive 1, Write protect, Enable"
 .br
 .I "Media, Disk, Opus, Drive 1, Write protect, Disable"
@@ -2504,8 +2522,10 @@
 .br
 .I "Media, Disk, +D, Drive 1, Eject"
 .br
-.I "Media, Disk, +D, Drive 1, Eject and write..."
+.I "Media, Disk, +D, Drive 1, Save"
 .br
+.I "Media, Disk, +D, Drive 1, Save as..."
+.br
 .I "Media, Disk, +D, Drive 1, Write protect, Enable"
 .br
 .I "Media, Disk, +D, Drive 1, Write protect, Disable"

Modified: trunk/fuse/menu.c
===================================================================
--- trunk/fuse/menu.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/menu.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -435,32 +435,39 @@
   fuse_emulation_unpause();
 }
 
+/*
+1. menu_media_eject
+2. xxx_disk_eject
+2.a. ui_xxx_disk_write( save )
+2.b. ui_xxx_disk_write( saveas )
+[2.c. ui_xxx_disk_eject( save )]
+*/
 MENU_CALLBACK_WITH_ACTION( menu_media_eject )
 {
-  int which, write, type;
+  int which, saveas, type;
 
   ui_widget_finish();
 
   action--;
   which = action & 0x00f;
   type = ( action & 0x0f0 ) >> 4;
-  write = !!( action & 0x100 );
+  saveas = ( action & 0xf00 ) >> 8;    /* 0 -> eject, 1 -> save as, 2 -> save */
 
   switch( type ) {
   case 0:
-    specplus3_disk_eject( which, write );
+    specplus3_disk_eject( which, saveas );
     break;
   case 1:
-    beta_disk_eject( which, write );
+    beta_disk_eject( which, saveas );
     break;
   case 2:
-    plusd_disk_eject( which, write );
+    plusd_disk_eject( which, saveas );
     break;
   case 3:
-    if1_mdr_eject( which, write );
+    if1_mdr_eject( which, saveas );
     break;
   case 4:
-    opus_disk_eject( which, write );
+    opus_disk_eject( which, saveas );
     break;
   }
 }

Modified: trunk/fuse/menu_data.dat
===================================================================
--- trunk/fuse/menu_data.dat	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/menu_data.dat	2010-10-09 12:59:37 UTC (rev 4180)
@@ -143,7 +143,8 @@
 Media/Interface I/Microdrive 1/Insert _New, Item,, menu_media_insert_new,, 0x31
 Media/Interface I/Microdrive 1/_Insert..., Item,, menu_media_insert,, 0x31
 Media/Interface I/Microdrive 1/_Eject, Item,, menu_media_eject,, 0x031
-Media/Interface I/Microdrive 1/Eject and _write..., Item,, menu_media_eject,, 0x131
+Media/Interface I/Microdrive 1/_Save, Item,, menu_media_eject,, 0x231
+Media/Interface I/Microdrive 1/Save _As..., Item,, menu_media_eject,, 0x131
 Media/Interface I/Microdrive 1/Write _protect, Branch
 Media/Interface I/Microdrive 1/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x131
 Media/Interface I/Microdrive 1/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x031
@@ -152,7 +153,8 @@
 Media/Interface I/Microdrive 2/Insert _New, Item,, menu_media_insert_new,, 0x32
 Media/Interface I/Microdrive 2/_Insert..., Item,, menu_media_insert,, 0x32
 Media/Interface I/Microdrive 2/_Eject, Item,, menu_media_eject,, 0x032
-Media/Interface I/Microdrive 2/Eject and _write..., Item,, menu_media_eject,, 0x132
+Media/Interface I/Microdrive 2/_Save, Item,, menu_media_eject,, 0x232
+Media/Interface I/Microdrive 2/Save _As..., Item,, menu_media_eject,, 0x132
 Media/Interface I/Microdrive 2/Write _protect, Branch
 Media/Interface I/Microdrive 2/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x132
 Media/Interface I/Microdrive 2/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x032
@@ -161,7 +163,8 @@
 Media/Interface I/Microdrive 3/Insert _New, Item,, menu_media_insert_new,, 0x33
 Media/Interface I/Microdrive 3/_Insert..., Item,, menu_media_insert,, 0x33
 Media/Interface I/Microdrive 3/_Eject, Item,, menu_media_eject,, 0x033
-Media/Interface I/Microdrive 3/Eject and _write..., Item,, menu_media_eject,, 0x133
+Media/Interface I/Microdrive 3/_Save, Item,, menu_media_eject,, 0x233
+Media/Interface I/Microdrive 3/Save _As..., Item,, menu_media_eject,, 0x133
 Media/Interface I/Microdrive 3/Write _protect, Branch
 Media/Interface I/Microdrive 3/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x133
 Media/Interface I/Microdrive 3/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x033
@@ -170,7 +173,8 @@
 Media/Interface I/Microdrive 4/Insert _New, Item,, menu_media_insert_new,, 0x34
 Media/Interface I/Microdrive 4/_Insert..., Item,, menu_media_insert,, 0x34
 Media/Interface I/Microdrive 4/_Eject, Item,, menu_media_eject,, 0x034
-Media/Interface I/Microdrive 4/Eject and _write..., Item,, menu_media_eject,, 0x134
+Media/Interface I/Microdrive 4/_Save, Item,, menu_media_eject,, 0x234
+Media/Interface I/Microdrive 4/Save _As..., Item,, menu_media_eject,, 0x134
 Media/Interface I/Microdrive 4/Write _protect, Branch
 Media/Interface I/Microdrive 4/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x134
 Media/Interface I/Microdrive 4/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x034
@@ -179,7 +183,8 @@
 Media/Interface I/Microdrive 5/Insert _New, Item,, menu_media_insert_new,, 0x35
 Media/Interface I/Microdrive 5/_Insert..., Item,, menu_media_insert,, 0x35
 Media/Interface I/Microdrive 5/_Eject, Item,, menu_media_eject,, 0x035
-Media/Interface I/Microdrive 5/Eject and _write..., Item,, menu_media_eject,, 0x135
+Media/Interface I/Microdrive 5/_Save, Item,, menu_media_eject,, 0x235
+Media/Interface I/Microdrive 5/Save _As..., Item,, menu_media_eject,, 0x135
 Media/Interface I/Microdrive 5/Write _protect, Branch
 Media/Interface I/Microdrive 5/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x135
 Media/Interface I/Microdrive 5/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x035
@@ -188,7 +193,8 @@
 Media/Interface I/Microdrive 6/Insert _New, Item,, menu_media_insert_new,, 0x36
 Media/Interface I/Microdrive 6/_Insert..., Item,, menu_media_insert,, 0x36
 Media/Interface I/Microdrive 6/_Eject, Item,, menu_media_eject,, 0x036
-Media/Interface I/Microdrive 6/Eject and _write..., Item,, menu_media_eject,, 0x136
+Media/Interface I/Microdrive 6/_Save, Item,, menu_media_eject,, 0x236
+Media/Interface I/Microdrive 6/Save _As..., Item,, menu_media_eject,, 0x136
 Media/Interface I/Microdrive 6/Write _protect, Branch
 Media/Interface I/Microdrive 6/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x136
 Media/Interface I/Microdrive 6/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x036
@@ -197,7 +203,8 @@
 Media/Interface I/Microdrive 7/Insert _New, Item,, menu_media_insert_new,, 0x37
 Media/Interface I/Microdrive 7/_Insert..., Item,, menu_media_insert,, 0x37
 Media/Interface I/Microdrive 7/_Eject, Item,, menu_media_eject,, 0x037
-Media/Interface I/Microdrive 7/Eject and _write..., Item,, menu_media_eject,, 0x137
+Media/Interface I/Microdrive 7/_Save, Item,, menu_media_eject,, 0x237
+Media/Interface I/Microdrive 7/Save _As..., Item,, menu_media_eject,, 0x137
 Media/Interface I/Microdrive 7/Write _protect, Branch
 Media/Interface I/Microdrive 7/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x137
 Media/Interface I/Microdrive 7/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x037
@@ -206,7 +213,8 @@
 Media/Interface I/Microdrive 8/Insert _New, Item,, menu_media_insert_new,, 0x38
 Media/Interface I/Microdrive 8/_Insert..., Item,, menu_media_insert,, 0x38
 Media/Interface I/Microdrive 8/_Eject, Item,, menu_media_eject,, 0x038
-Media/Interface I/Microdrive 8/Eject and _write..., Item,, menu_media_eject,, 0x138
+Media/Interface I/Microdrive 8/_Save, Item,, menu_media_eject,, 0x238
+Media/Interface I/Microdrive 8/Save _As..., Item,, menu_media_eject,, 0x138
 Media/Interface I/Microdrive 8/Write _protect, Branch
 Media/Interface I/Microdrive 8/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x138
 Media/Interface I/Microdrive 8/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x038
@@ -230,7 +238,8 @@
 Media/Disk/+3/Drive A:/Insert _New, Item,, menu_media_insert_new,, 0x01
 Media/Disk/+3/Drive A:/_Insert..., Item,, menu_media_insert,, 0x01
 Media/Disk/+3/Drive A:/_Eject, Item,, menu_media_eject,, 0x01
-Media/Disk/+3/Drive A:/Eject and _write..., Item,, menu_media_eject,, 0x101
+Media/Disk/+3/Drive A:/_Save, Item,, menu_media_eject,, 0x201
+Media/Disk/+3/Drive A:/Save _As..., Item,, menu_media_eject,, 0x101
 Media/Disk/+3/Drive A:/_Flip disk, Branch
 Media/Disk/+3/Drive A:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x101
 Media/Disk/+3/Drive A:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x001
@@ -241,7 +250,8 @@
 Media/Disk/+3/Drive B:/Insert _New, Item,, menu_media_insert_new,, 0x02
 Media/Disk/+3/Drive B:/_Insert..., Item,, menu_media_insert,, 0x02
 Media/Disk/+3/Drive B:/_Eject, Item,, menu_media_eject,, 0x02
-Media/Disk/+3/Drive B:/Eject and _write..., Item,, menu_media_eject,, 0x102
+Media/Disk/+3/Drive B:/_Save, Item,, menu_media_eject,, 0x202
+Media/Disk/+3/Drive B:/Save _As..., Item,, menu_media_eject,, 0x102
 Media/Disk/+3/Drive B:/_Flip disk, Branch
 Media/Disk/+3/Drive B:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x102
 Media/Disk/+3/Drive B:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x002
@@ -254,7 +264,8 @@
 Media/Disk/Beta/Drive A:/Insert _New, Item,, menu_media_insert_new,, 0x11
 Media/Disk/Beta/Drive A:/_Insert..., Item,, menu_media_insert,, 0x11
 Media/Disk/Beta/Drive A:/_Eject, Item,, menu_media_eject,, 0x11
-Media/Disk/Beta/Drive A:/Eject and _write..., Item,, menu_media_eject,, 0x111
+Media/Disk/Beta/Drive A:/_Save, Item,, menu_media_eject,, 0x211
+Media/Disk/Beta/Drive A:/Save _As..., Item,, menu_media_eject,, 0x111
 Media/Disk/Beta/Drive A:/_Flip disk, Branch
 Media/Disk/Beta/Drive A:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x111
 Media/Disk/Beta/Drive A:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x011
@@ -265,7 +276,8 @@
 Media/Disk/Beta/Drive B:/Insert _New, Item,, menu_media_insert_new,, 0x12
 Media/Disk/Beta/Drive B:/_Insert..., Item,, menu_media_insert,, 0x12
 Media/Disk/Beta/Drive B:/_Eject, Item,, menu_media_eject,, 0x012
-Media/Disk/Beta/Drive B:/Eject and _write..., Item,, menu_media_eject,, 0x112
+Media/Disk/Beta/Drive B:/_Save, Item,, menu_media_eject,, 0x212
+Media/Disk/Beta/Drive B:/Save _As..., Item,, menu_media_eject,, 0x112
 Media/Disk/Beta/Drive B:/_Flip disk, Branch
 Media/Disk/Beta/Drive B:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x112
 Media/Disk/Beta/Drive B:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x012
@@ -276,7 +288,8 @@
 Media/Disk/Beta/Drive C:/Insert _New, Item,, menu_media_insert_new,, 0x13
 Media/Disk/Beta/Drive C:/_Insert..., Item,, menu_media_insert,, 0x13
 Media/Disk/Beta/Drive C:/_Eject, Item,, menu_media_eject,, 0x013
-Media/Disk/Beta/Drive C:/Eject and _write..., Item,, menu_media_eject,, 0x113
+Media/Disk/Beta/Drive C:/_Save, Item,, menu_media_eject,, 0x213
+Media/Disk/Beta/Drive C:/Save _As..., Item,, menu_media_eject,, 0x113
 Media/Disk/Beta/Drive C:/_Flip disk, Branch
 Media/Disk/Beta/Drive C:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x113
 Media/Disk/Beta/Drive C:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x013
@@ -287,7 +300,8 @@
 Media/Disk/Beta/Drive D:/Insert _New, Item,, menu_media_insert_new,, 0x14
 Media/Disk/Beta/Drive D:/_Insert..., Item,, menu_media_insert,, 0x14
 Media/Disk/Beta/Drive D:/_Eject, Item,, menu_media_eject,, 0x014
-Media/Disk/Beta/Drive D:/Eject and _write..., Item,, menu_media_eject,, 0x114
+Media/Disk/Beta/Drive D:/_Save, Item,, menu_media_eject,, 0x214
+Media/Disk/Beta/Drive D:/Save _As..., Item,, menu_media_eject,, 0x114
 Media/Disk/Beta/Drive D:/_Flip disk, Branch
 Media/Disk/Beta/Drive D:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x114
 Media/Disk/Beta/Drive D:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x014
@@ -300,7 +314,8 @@
 Media/Disk/+D/Drive 1/Insert _New, Item,, menu_media_insert_new,, 0x21
 Media/Disk/+D/Drive 1/_Insert..., Item,, menu_media_insert,, 0x21
 Media/Disk/+D/Drive 1/_Eject, Item,, menu_media_eject,, 0x021
-Media/Disk/+D/Drive 1/Eject and _write..., Item,, menu_media_eject,, 0x121
+Media/Disk/+D/Drive 1/_Save, Item,, menu_media_eject,, 0x221
+Media/Disk/+D/Drive 1/Save _As..., Item,, menu_media_eject,, 0x121
 Media/Disk/+D/Drive 1/_Flip disk, Branch
 Media/Disk/+D/Drive 1/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x121
 Media/Disk/+D/Drive 1/Flip disk/Turn _back, Item,, menu_media_flip,, 0x021
@@ -311,7 +326,8 @@
 Media/Disk/+D/Drive 2/Insert _New, Item,, menu_media_insert_new,, 0x22
 Media/Disk/+D/Drive 2/_Insert..., Item,, menu_media_insert,, 0x22
 Media/Disk/+D/Drive 2/_Eject, Item,, menu_media_eject,, 0x022
-Media/Disk/+D/Drive 2/Eject and _write..., Item,, menu_media_eject,, 0x122
+Media/Disk/+D/Drive 2/_Save, Item,, menu_media_eject,, 0x222
+Media/Disk/+D/Drive 2/Save _As..., Item,, menu_media_eject,, 0x122
 Media/Disk/+D/Drive 2/_Flip disk, Branch
 Media/Disk/+D/Drive 2/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x122
 Media/Disk/+D/Drive 2/Flip disk/Turn _back, Item,, menu_media_flip,, 0x022
@@ -324,7 +340,8 @@
 Media/Disk/Opus/Drive 1/Insert _New, Item,, menu_media_insert_new,, 0x41
 Media/Disk/Opus/Drive 1/_Insert..., Item,, menu_media_insert,, 0x41
 Media/Disk/Opus/Drive 1/_Eject, Item,, menu_media_eject,, 0x041
-Media/Disk/Opus/Drive 1/Eject and _write..., Item,, menu_media_eject,, 0x141
+Media/Disk/Opus/Drive 1/_Save, Item,, menu_media_eject,, 0x241
+Media/Disk/Opus/Drive 1/Save _As..., Item,, menu_media_eject,, 0x141
 Media/Disk/Opus/Drive 1/_Flip disk, Branch
 Media/Disk/Opus/Drive 1/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x141
 Media/Disk/Opus/Drive 1/Flip disk/Turn _back, Item,, menu_media_flip,, 0x041
@@ -335,7 +352,8 @@
 Media/Disk/Opus/Drive 2/Insert _New, Item,, menu_media_insert_new,, 0x42
 Media/Disk/Opus/Drive 2/_Insert..., Item,, menu_media_insert,, 0x42
 Media/Disk/Opus/Drive 2/_Eject, Item,, menu_media_eject,, 0x042
-Media/Disk/Opus/Drive 2/Eject and _write..., Item,, menu_media_eject,, 0x142
+Media/Disk/Opus/Drive 2/_Save, Item,, menu_media_eject,, 0x242
+Media/Disk/Opus/Drive 2/Save _As..., Item,, menu_media_eject,, 0x142
 Media/Disk/Opus/Drive 2/_Flip disk, Branch
 Media/Disk/Opus/Drive 2/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x142
 Media/Disk/Opus/Drive 2/Flip disk/Turn _back, Item,, menu_media_flip,, 0x042

Modified: trunk/fuse/ui/ui.h
===================================================================
--- trunk/fuse/ui/ui.h	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/ui/ui.h	2010-10-09 12:59:37 UTC (rev 4180)
@@ -115,11 +115,11 @@
 int ui_tape_write( void );
 
 /* Write a +3, Beta or +D disk out */
-int ui_plus3_disk_write( specplus3_drive_number which );
-int ui_beta_disk_write( beta_drive_number which );
-int ui_opus_disk_write( opus_drive_number which );
-int ui_plusd_disk_write( plusd_drive_number which );
-int ui_mdr_write( int which );
+int ui_plus3_disk_write( specplus3_drive_number which, int saveas );
+int ui_beta_disk_write( beta_drive_number which, int saveas );
+int ui_opus_disk_write( opus_drive_number which, int saveas );
+int ui_plusd_disk_write( plusd_drive_number which, int saveas );
+int ui_mdr_write( int which, int saveas );
 
 /* Get a rollback point from the given list */
 int ui_get_rollback_point( GSList *points );

Modified: trunk/fuse/ui.c
===================================================================
--- trunk/fuse/ui.c	2010-10-08 10:05:55 UTC (rev 4179)
+++ trunk/fuse/ui.c	2010-10-09 12:59:37 UTC (rev 4180)
@@ -238,7 +238,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M1_EJECT,
     "/Media/Interface I/Microdrive 1/Eject",
-    "/Media/Interface I/Microdrive 1/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 1/Save As...", 0,
+    "/Media/Interface I/Microdrive 1/Save", 0,
     "/Media/Interface I/Microdrive 1/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M1_WP_SET,
@@ -247,7 +248,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M2_EJECT,
     "/Media/Interface I/Microdrive 2/Eject",
-    "/Media/Interface I/Microdrive 2/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 2/Save As...", 0,
+    "/Media/Interface I/Microdrive 2/Save", 0,
     "/Media/Interface I/Microdrive 2/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M2_WP_SET,
@@ -256,7 +258,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M3_EJECT,
     "/Media/Interface I/Microdrive 3/Eject",
-    "/Media/Interface I/Microdrive 3/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 3/Save As...", 0,
+    "/Media/Interface I/Microdrive 3/Save", 0,
     "/Media/Interface I/Microdrive 3/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M3_WP_SET,
@@ -265,7 +268,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M4_EJECT,
     "/Media/Interface I/Microdrive 4/Eject",
-    "/Media/Interface I/Microdrive 4/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 4/Save As...", 0,
+    "/Media/Interface I/Microdrive 4/Save", 0,
     "/Media/Interface I/Microdrive 4/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M4_WP_SET,
@@ -274,7 +278,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M5_EJECT,
     "/Media/Interface I/Microdrive 5/Eject",
-    "/Media/Interface I/Microdrive 5/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 5/Save As...", 0,
+    "/Media/Interface I/Microdrive 5/Save", 0,
     "/Media/Interface I/Microdrive 5/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M5_WP_SET,
@@ -283,7 +288,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M6_EJECT,
     "/Media/Interface I/Microdrive 6/Eject",
-    "/Media/Interface I/Microdrive 6/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 6/Save As...", 0,
+    "/Media/Interface I/Microdrive 6/Save", 0,
     "/Media/Interface I/Microdrive 6/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M6_WP_SET,
@@ -292,7 +298,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M7_EJECT,
     "/Media/Interface I/Microdrive 7/Eject",
-    "/Media/Interface I/Microdrive 7/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 7/Save As...", 0,
+    "/Media/Interface I/Microdrive 7/Save", 0,
     "/Media/Interface I/Microdrive 7/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M7_WP_SET,
@@ -301,7 +308,8 @@
 
   { UI_MENU_ITEM_MEDIA_IF1_M8_EJECT,
     "/Media/Interface I/Microdrive 8/Eject",
-    "/Media/Interface I/Microdrive 8/Eject and write...", 0,
+    "/Media/Interface I/Microdrive 8/Save As...", 0,
+    "/Media/Interface I/Microdrive 8/Save", 0,
     "/Media/Interface I/Microdrive 8/Write protect", 0 },
 
   { UI_MENU_ITEM_MEDIA_IF1_M8_WP_SET,
@@ -328,7 +336,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_PLUS3_A_EJECT,
     "/Media/Disk/+3/Drive A:/Eject",
-    "/Media/Disk/+3/Drive A:/Eject and write...", 0,
+    "/Media/Disk/+3/Drive A:/Save As...", 0,
+    "/Media/Disk/+3/Drive A:/Save", 0,
     "/Media/Disk/+3/Drive A:/Flip disk", 0,
     "/Media/Disk/+3/Drive A:/Write protect", 0 },
 
@@ -344,7 +353,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_PLUS3_B_EJECT,
     "/Media/Disk/+3/Drive B:/Eject",
-    "/Media/Disk/+3/Drive B:/Eject and write...", 0,
+    "/Media/Disk/+3/Drive B:/Save As...", 0,
+    "/Media/Disk/+3/Drive B:/Save", 0,
     "/Media/Disk/+3/Drive B:/Flip disk", 0,
     "/Media/Disk/+3/Drive B:/Write protect", 0 },
 
@@ -362,7 +372,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_BETA_A_EJECT,
     "/Media/Disk/Beta/Drive A:/Eject",
-    "/Media/Disk/Beta/Drive A:/Eject and write...", 0,
+    "/Media/Disk/Beta/Drive A:/Save As...", 0,
+    "/Media/Disk/Beta/Drive A:/Save", 0,
     "/Media/Disk/Beta/Drive A:/Flip disk", 0,
     "/Media/Disk/Beta/Drive A:/Write protect", 0 },
 
@@ -378,7 +389,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_BETA_B_EJECT,
     "/Media/Disk/Beta/Drive B:/Eject",
-    "/Media/Disk/Beta/Drive B:/Eject and write...", 0,
+    "/Media/Disk/Beta/Drive B:/Save As...", 0,
+    "/Media/Disk/Beta/Drive B:/Save", 0,
     "/Media/Disk/Beta/Drive B:/Flip disk", 0,
     "/Media/Disk/Beta/Drive B:/Write protect", 0 },
 
@@ -394,7 +406,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_BETA_C_EJECT,
     "/Media/Disk/Beta/Drive C:/Eject",
-    "/Media/Disk/Beta/Drive C:/Eject and write...", 0,
+    "/Media/Disk/Beta/Drive C:/Save As...", 0,
+    "/Media/Disk/Beta/Drive C:/Save", 0,
     "/Media/Disk/Beta/Drive C:/Flip disk", 0,
     "/Media/Disk/Beta/Drive C:/Write protect", 0 },
 
@@ -410,7 +423,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_BETA_D_EJECT,
     "/Media/Disk/Beta/Drive D:/Eject",
-    "/Media/Disk/Beta/Drive D:/Eject and write...", 0,
+    "/Media/Disk/Beta/Drive D:/Save As...", 0,
+    "/Media/Disk/Beta/Drive D:/Save", 0,
     "/Media/Disk/Beta/Drive D:/Flip disk", 0,
     "/Media/Disk/Beta/Drive D:/Write protect", 0 },
 
@@ -428,7 +442,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_PLUSD_1_EJECT,
     "/Media/Disk/+D/Drive 1/Eject",
-    "/Media/Disk/+D/Drive 1/Eject and write...", 0,
+    "/Media/Disk/+D/Drive 1/Save As...", 0,
+    "/Media/Disk/+D/Drive 1/Save", 0,
     "/Media/Disk/+D/Drive 1/Flip disk", 0,
     "/Media/Disk/+D/Drive 1/Write protect", 0 },
 
@@ -444,7 +459,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_PLUSD_2_EJECT,
     "/Media/Disk/+D/Drive 2/Eject",
-    "/Media/Disk/+D/Drive 2/Eject and write...", 0,
+    "/Media/Disk/+D/Drive 2/Save As...", 0,
+    "/Media/Disk/+D/Drive 2/Save", 0,
     "/Media/Disk/+D/Drive 2/Flip disk", 0,
     "/Media/Disk/+D/Drive 2/Write protect", 0 },
 
@@ -462,7 +478,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_OPUS_1_EJECT,
     "/Media/Disk/Opus/Drive 1/Eject",
-    "/Media/Disk/Opus/Drive 1/Eject and write...", 0,
+    "/Media/Disk/Opus/Drive 1/Save As...", 0,
+    "/Media/Disk/Opus/Drive 1/Save", 0,
     "/Media/Disk/Opus/Drive 1/Flip disk", 0,
     "/Media/Disk/Opus/Drive 1/Write protect", 0 },
 
@@ -478,7 +495,8 @@
 
   { UI_MENU_ITEM_MEDIA_DISK_OPUS_2_EJECT,
     "/Media/Disk/Opus/Drive 2/Eject",
-    "/Media/Disk/Opus/Drive 2/Eject and write...", 0,
+    "/Media/Disk/Opus/Drive 2/Save As...", 0,
+    "/Media/Disk/Opus/Drive 2/Save", 0,
     "/Media/Disk/Opus/Drive 2/Flip disk", 0,
     "/Media/Disk/Opus/Drive 2/Write protect", 0 },
 
@@ -641,10 +659,10 @@
 }
 
 int
-ui_plus3_disk_write( specplus3_drive_number which )
+ui_plus3_disk_write( specplus3_drive_number which, int saveas )
 {
   int err;
-  char drive, *filename, title[80];
+  char drive, *filename = NULL, title[80];
 
   switch( which ) {
     case SPECPLUS3_DRIVE_A: drive = 'A'; break;
@@ -656,12 +674,13 @@
 
   snprintf( title, 80, "Fuse - Write +3 Disk %c:", drive );
 
-  filename = ui_get_save_filename( title );
-  if( !filename ) { fuse_emulation_unpause(); return 1; }
-
+  if( saveas ) {
+    filename = ui_get_save_filename( title );
+    if( !filename ) { fuse_emulation_unpause(); return 1; }
+  }
   err = specplus3_disk_write( which, filename );
 
-  free( filename );
+  if( saveas ) free( filename );
 
   fuse_emulation_unpause();
 
@@ -669,10 +688,10 @@
 }
 
 int
-ui_beta_disk_write( beta_drive_number which )
+ui_beta_disk_write( beta_drive_number which, int saveas )
 {
   int err;
-  char drive, *filename, title[80];
+  char drive, *filename = NULL, title[80];
 
   switch( which ) {
     case BETA_DRIVE_A: drive = 'A'; break;
@@ -686,12 +705,14 @@
 
   snprintf( title, 80, "Fuse - Write Beta Disk %c:", drive );
 
-  filename = ui_get_save_filename( title );
-  if( !filename ) { fuse_emulation_unpause(); return 1; }
+  if( saveas ) {
+    filename = ui_get_save_filename( title );
+    if( !filename ) { fuse_emulation_unpause(); return 1; }
+  }
 
   err = beta_disk_write( which, filename );
 
-  free( filename );
+  if( saveas ) free( filename );
 
   fuse_emulation_unpause();
 
@@ -699,10 +720,10 @@
 }
 
 int
-ui_opus_disk_write( opus_drive_number which )
+ui_opus_disk_write( opus_drive_number which, int saveas )
 {
   int err;
-  char drive, *filename, title[80];
+  char drive, *filename = NULL, title[80];
 
   switch( which ) {
     case OPUS_DRIVE_1: drive = '1'; break;
@@ -714,12 +735,14 @@
 
   snprintf( title, 80, "Fuse - Write Opus Disk %c", drive );
 
-  filename = ui_get_save_filename( title );
-  if( !filename ) { fuse_emulation_unpause(); return 1; }
+  if( saveas ) {
+    filename = ui_get_save_filename( title );
+    if( !filename ) { fuse_emulation_unpause(); return 1; }
+  }
 
   err = opus_disk_write( which, filename );
 
-  free( filename );
+  if( saveas ) free( filename );
 
   fuse_emulation_unpause();
 
@@ -727,10 +750,10 @@
 }
 
 int
-ui_plusd_disk_write( plusd_drive_number which )
+ui_plusd_disk_write( plusd_drive_number which, int saveas )
 {
   int err;
-  char drive, *filename, title[80];
+  char drive, *filename = NULL, title[80];
 
   switch( which ) {
     case PLUSD_DRIVE_1: drive = '1'; break;
@@ -742,12 +765,14 @@
 
   snprintf( title, 80, "Fuse - Write +D Disk %c", drive );
 
-  filename = ui_get_save_filename( title );
-  if( !filename ) { fuse_emulation_unpause(); return 1; }
+  if( saveas ) {
+    filename = ui_get_save_filename( title );
+    if( !filename ) { fuse_emulation_unpause(); return 1; }
+  }
 
   err = plusd_disk_write( which, filename );
 
-  free( filename );
+  if( saveas ) free( filename );
 
   fuse_emulation_unpause();
 
@@ -755,21 +780,23 @@
 }
 
 int
-ui_mdr_write( int which )
+ui_mdr_write( int which, int saveas )
 {
   int err;
-  char *filename, title[80];
+  char *filename = NULL, title[80];
 
   fuse_emulation_pause();
 
   snprintf( title, 80, "Fuse - Write Microdrive Cartridge %i", which + 1 );
 
-  filename = ui_get_save_filename( title );
-  if( !filename ) { fuse_emulation_unpause(); return 1; }
+  if( saveas ) {
+    filename = ui_get_save_filename( title );
+    if( !filename ) { fuse_emulation_unpause(); return 1; }
+  }
 
   err = if1_mdr_write( which, filename );
 
-  free( filename );
+  if( saveas ) free( filename );
 
   fuse_emulation_unpause();
 


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

Revision: 4182
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4182&view=rev
Author:   fredm
Date:     2010-10-11 12:24:13 +0000 (Mon, 11 Oct 2010)

Log Message:
-----------
Resize window when machine selection switches between Timex and non-Timex modes
(fixes bug #3084862) (thanks, Phil).

Modified Paths:
--------------
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/ui/gtk/gtkdisplay.c

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-10 10:28:09 UTC (rev 4181)
+++ trunk/fuse/hacking/ChangeLog	2010-10-11 12:24:13 UTC (rev 4182)
@@ -3358,3 +3358,6 @@
          menu items to "Save" and "Save as" (patch #3083639) (Gergely Szasz).
 20101010 configure.in: pad version number for Win32 if needed (patch #3084574)
          (Sergio Baldovi).
+20101011 ui/gtk/gtkdisplay.c: resize window when machine selection switches
+         between Timex and non-Timex modes (fixes bug #3084862) (thanks, Phil)
+         (Fred).

Modified: trunk/fuse/ui/gtk/gtkdisplay.c
===================================================================
--- trunk/fuse/ui/gtk/gtkdisplay.c	2010-10-10 10:28:09 UTC (rev 4181)
+++ trunk/fuse/ui/gtk/gtkdisplay.c	2010-10-11 12:24:13 UTC (rev 4182)
@@ -97,6 +97,7 @@
 static int init_colours( void );
 static void gtkdisplay_area(int x, int y, int width, int height);
 static void register_scalers( int force_scaler );
+static void gtkdisplay_load_gfx_mode( void );
 
 /* Callbacks */
 
@@ -168,6 +169,8 @@
   if ( scaler_select_scaler( current_scaler ) )
         scaler_select_scaler( SCALER_NORMAL );
 
+  gtkdisplay_load_gfx_mode();
+
   display_ui_initialised = 1;
 
   return 0;
@@ -231,9 +234,13 @@
 
   if( force_scaler ) {
     switch( gtkdisplay_current_size ) {
-    case 1: scaler = SCALER_NORMAL; break;
-    case 2: scaler = SCALER_DOUBLESIZE; break;
-    case 3: scaler = SCALER_TRIPLESIZE; break;
+    case 1: scaler = machine_current->timex ? SCALER_HALF : SCALER_NORMAL;
+      break;
+    case 2: scaler = machine_current->timex ? SCALER_NORMAL : SCALER_DOUBLESIZE;
+      break;
+    case 3: scaler = machine_current->timex ? SCALER_TIMEX1_5X :
+                                              SCALER_TRIPLESIZE;
+      break;
     }
   }
 
@@ -299,55 +306,11 @@
 int
 uidisplay_hotswap_gfx_mode( void )
 {
-  GdkGeometry geometry;
-  GdkWindowHints hints;
-  float scale;
-
   fuse_emulation_pause();
 
-  scale = scaler_get_scaling_factor( current_scaler );
+  /* Setup the new GFX mode */
+  gtkdisplay_load_gfx_mode();
 
-  hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |
-          GDK_HINT_BASE_SIZE | GDK_HINT_RESIZE_INC;
-
-  geometry.min_width = DISPLAY_ASPECT_WIDTH;
-  geometry.min_height = DISPLAY_SCREEN_HEIGHT;
-  geometry.max_width = 3 * DISPLAY_ASPECT_WIDTH;
-  geometry.max_height = 3 * DISPLAY_SCREEN_HEIGHT;
-  geometry.base_width = scale * image_width;
-  geometry.base_height = scale * image_height;
-  geometry.width_inc = DISPLAY_ASPECT_WIDTH;
-  geometry.height_inc = DISPLAY_SCREEN_HEIGHT;
-
-  if( settings_current.aspect_hint ) {
-    hints |= GDK_HINT_ASPECT;
-    if( settings_current.strict_aspect_hint ) {
-      geometry.min_aspect = geometry.max_aspect =
-        (float)DISPLAY_ASPECT_WIDTH / DISPLAY_SCREEN_HEIGHT;
-    } else {
-      geometry.min_aspect = 1.2;
-      geometry.max_aspect = 1.5;
-    }
-  }
-
-  gtk_window_set_geometry_hints( GTK_WINDOW( gtkui_window ),
-                                 GTK_WIDGET( gtkui_drawing_area ),
-                                 &geometry, hints );
-
-  gtk_window_set_default_size( GTK_WINDOW( gtkui_window ),
-                               scale * image_width, scale * image_height );
-
-  gtk_drawing_area_size( GTK_DRAWING_AREA( gtkui_drawing_area ),
-                         scale * image_width, scale * image_height );
-
-  drawing_area_resize( scale * image_width, scale * image_height, 0 );
- 
-  gtk_window_resize( GTK_WINDOW( gtkui_window ), scale * image_width,
-                     scale * image_height );
-
-  /* Redraw the entire screen... */
-  display_refresh_all();
-
   fuse_emulation_unpause();
 
   return 0;
@@ -465,3 +428,54 @@
   drawing_area_resize( event->configure.width, event->configure.height, 1 );
   return TRUE;
 }
+
+static void
+gtkdisplay_load_gfx_mode( void )
+{
+  GdkGeometry geometry;
+  GdkWindowHints hints;
+  float scale;
+
+  scale = scaler_get_scaling_factor( current_scaler );
+
+  hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |
+          GDK_HINT_BASE_SIZE | GDK_HINT_RESIZE_INC;
+
+  geometry.min_width = DISPLAY_ASPECT_WIDTH;
+  geometry.min_height = DISPLAY_SCREEN_HEIGHT;
+  geometry.max_width = 3 * DISPLAY_ASPECT_WIDTH;
+  geometry.max_height = 3 * DISPLAY_SCREEN_HEIGHT;
+  geometry.base_width = scale * image_width;
+  geometry.base_height = scale * image_height;
+  geometry.width_inc = DISPLAY_ASPECT_WIDTH;
+  geometry.height_inc = DISPLAY_SCREEN_HEIGHT;
+
+  if( settings_current.aspect_hint ) {
+    hints |= GDK_HINT_ASPECT;
+    if( settings_current.strict_aspect_hint ) {
+      geometry.min_aspect = geometry.max_aspect =
+        (float)DISPLAY_ASPECT_WIDTH / DISPLAY_SCREEN_HEIGHT;
+    } else {
+      geometry.min_aspect = 1.2;
+      geometry.max_aspect = 1.5;
+    }
+  }
+
+  gtk_window_set_geometry_hints( GTK_WINDOW( gtkui_window ),
+                                 GTK_WIDGET( gtkui_drawing_area ),
+                                 &geometry, hints );
+
+  gtk_window_set_default_size( GTK_WINDOW( gtkui_window ),
+                               scale * image_width, scale * image_height );
+
+  gtk_drawing_area_size( GTK_DRAWING_AREA( gtkui_drawing_area ),
+                         scale * image_width, scale * image_height );
+
+  drawing_area_resize( scale * image_width, scale * image_height, 0 );
+ 
+  gtk_window_resize( GTK_WINDOW( gtkui_window ), scale * image_width,
+                     scale * image_height );
+
+  /* Redraw the entire screen... */
+  display_refresh_all();
+}


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

Revision: 4186
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4186&view=rev
Author:   fredm
Date:     2010-10-25 10:29:45 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
writable_roms preference shouldn't affect the 16K machine "empty" page (thanks,
Andrew Owen).

Modified Paths:
--------------
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/memory.c

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-11 21:50:48 UTC (rev 4185)
+++ trunk/fuse/hacking/ChangeLog	2010-10-25 10:29:45 UTC (rev 4186)
@@ -3361,3 +3361,5 @@
 20101011 ui/gtk/gtkdisplay.c: resize window when machine selection switches
          between Timex and non-Timex modes (fixes bug #3084862) (thanks, Phil)
          (Fred).
+20101025 memory.c: writable_roms preference shouldn't affect the 16K machine
+         "empty" page (thanks, Andrew Owen) (Fred).

Modified: trunk/fuse/memory.c
===================================================================
--- trunk/fuse/memory.c	2010-10-11 21:50:48 UTC (rev 4185)
+++ trunk/fuse/memory.c	2010-10-25 10:29:45 UTC (rev 4186)
@@ -276,7 +276,9 @@
 
   if( opus_active && address >= 0x2800 && address < 0x3800 ) {
     opus_write( address, b );
-  } else if( mapping->writable || settings_current.writable_roms ) {
+  } else if( mapping->writable ||
+             (mapping->bank != MEMORY_BANK_NONE &&
+              settings_current.writable_roms) ) {
     libspectrum_word offset = address & 0x1fff;
     libspectrum_byte *memory = mapping->page;
 


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

Revision: 4187
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4187&view=rev
Author:   fredm
Date:     2010-10-29 11:02:24 +0000 (Fri, 29 Oct 2010)

Log Message:
-----------
Some updates to bring things a bit more up to date.

Modified Paths:
--------------
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/man/fuse.1

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2010-10-25 10:29:45 UTC (rev 4186)
+++ trunk/fuse/hacking/ChangeLog	2010-10-29 11:02:24 UTC (rev 4187)
@@ -3363,3 +3363,4 @@
          (Fred).
 20101025 memory.c: writable_roms preference shouldn't affect the 16K machine
          "empty" page (thanks, Andrew Owen) (Fred).
+20101029 man/fuse.1: some updates to bring things a bit more up to date (Fred).

Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1	2010-10-25 10:29:45 UTC (rev 4186)
+++ trunk/fuse/man/fuse.1	2010-10-29 11:02:24 UTC (rev 4187)
@@ -54,10 +54,12 @@
 virtual-tape files. Saving to SZX, Z80 and SNA snapshots and TZX and
 TAP tape files is supported. The SLT extension to the Z80 format is
 partly supported (enough for multi-load games); however, loading of
-the old DAT-file variant is not. DSK disk images are supported when
-emulating a +3, TRD and SCL disk images are supported when emulating
-a Pentagon or Scorpion and DCK cartridge images are supported when
-emulating a Timex 2068 variant. Interface II ROM cartridges are also
+the old DAT-file variant is not. DSK, UDI, FDI, TR0, SDF, MGT, IMG, 
+SAD, TRD, SCL and OPD disk images are supported when a disk interface
+is being emulated, including the integrated disk drives on +3, 
+Pentagon or Scorpion machines as well as the +D, Opus Discovery and 
+Beta 128 interfaces. DCK cartridge images are supported when 
+emulating a Timex 2068 variant. Interface II ROM cartridges are also 
 supported.
 .PP
 Finally, there is also support for reading and writing the RZX input recording
@@ -435,6 +437,7 @@
 a 48K Spectrum. The available options are
 .IR 16 ,
 .IR 48 ,
+.IR 48_ntsc,
 .IR 128 ,
 .IR plus2 ,
 .IR plus2a ,
@@ -445,8 +448,9 @@
 .IR pentagon ,
 .IR pentagon512 ,
 .IR pentagon1024 ,
+.IR scorpion
 and
-.IR scorpion .
+.IR se .
 .RE
 .PP
 .I "\-\-melodik"
@@ -1669,9 +1673,9 @@
 .RE
 .PP
 .I "AY volume"
+.RS
+Sets the relative volume of the AY-3-8912 chip from a range of 0-100%.
 .RE
-Sets the relative volume of the AY-3-8912 chip from a range of 0-100%.
-.RS
 .PP
 .I "Beeper volume"
 .RS
@@ -2104,6 +2108,12 @@
 of RAM respectively.
 .RE
 .PP
+.I "Spectrum 48K (NTSC)"
+.RS
+The NTSC 48K machine released in limited numbers in parts of South 
+America.
+.RE
+.PP
 .I "Spectrum 128K"
 .RS
 The 128K machine as released by Sinclair in 1985 (Spain) or 1986 (UK).
@@ -3494,13 +3504,16 @@
 .\"
 .SH BETA 128 EMULATION
 .PP
-Fuse supports .SCL and .TRD images in its Pentagon and Scorpion
+Fuse supports Betadisk emulation in its Pentagon and Scorpion
 emulation, and also under 48K, TC2048, 128K and +2 (but not +2A)
 emulation if the
 .I Beta 128 interface
 option from the
 .I "Options, Peripherals..."
 dialog is enabled.
+See the
+.B "DISK FILE FORMATS"
+section for mode details on supported disk file formats.
 .\"
 .\"------------------------------------------------------------------
 .\"
@@ -3508,7 +3521,9 @@
 .PP
 By default, Fuse emulates the Opus Discovery interface with the optional 2k RAM
 expansion and a second 40 track single sided disk drive.
-Fuse supports .OPD and .OPU images in its Opus Discovery emulation. The Opus
+See the
+.B "DISK FILE FORMATS"
+section for mode details on supported disk file formats. The Opus
 Discovery's printer port is also emulated for output only. (See the
 .B "PRINTER EMULATION"                                             
 section for more details.) The Opus Discovery may only be
@@ -3519,7 +3534,9 @@
 .\"
 .SH +D EMULATION
 .PP
-Fuse supports .MGT and .IMG images in its +D emulation. The +D's
+Fuse supports emulating the +D disk and printer interface. See the
+.B "DISK FILE FORMATS"
+section for mode details on supported disk file formats. The +D's
 printer port is emulated. (See the
 .B "PRINTER EMULATION"                                             
 section for more details.) The +D may only be


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

Revision: 4169
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4169&view=rev
Author:   pak21
Date:     2010-10-03 17:38:56 +0000 (Sun, 03 Oct 2010)

Log Message:
-----------
libspectrum now automatically fixes the problem of A and F being transposed.

Modified Paths:
--------------
    trunk/fuse-utils/hacking/ChangeLog
    trunk/fuse-utils/man/snapconv.1

Modified: trunk/fuse-utils/hacking/ChangeLog
===================================================================
--- trunk/fuse-utils/hacking/ChangeLog	2010-10-03 01:14:09 UTC (rev 4168)
+++ trunk/fuse-utils/hacking/ChangeLog	2010-10-03 17:38:56 UTC (rev 4169)
@@ -308,3 +308,5 @@
 20101003 snapconv.c,man/snapconv.1: add -f flag to write snapshots with A and F
          and A' and F' transposed to fix SZX snaps written with old versions of
          libspectrum (Fred).
+20101003 man/snapconv.1: libspectrum now automatically fixes the problem of
+         A and F being transposed.

Modified: trunk/fuse-utils/man/snapconv.1
===================================================================
--- trunk/fuse-utils/man/snapconv.1	2010-10-03 01:14:09 UTC (rev 4168)
+++ trunk/fuse-utils/man/snapconv.1	2010-10-03 17:38:56 UTC (rev 4169)
@@ -61,8 +61,15 @@
 Version 0.5.0 and older of 
 .IR libspectrum "(3)"
 had a bug that resulted in these registers being swapped in SZX 
-snapshots only, and this flag can be used to correct any such 
-snapshots.
+snapshots only. Version 0.5.1 and newer of
+.IR libspectrum "(3)"
+automatically recognise these snapshots and correct the problem, but
+this flag is necessary to fix some snapshots created by
+.I development versions only
+of
+.IR libspectrum "(3)"
+which had the bug fixed, but cannot be distinguished from snapshots
+containing the bug.
 .TP
 .I infile
 specifies the snapshot to be converted. This file can be in any of the


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

Revision: 4178
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4178&view=rev
Author:   fredm
Date:     2010-10-07 09:51:34 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
Add missing default for version (fixes bug #3082566; thanks, UB880D) (Fred).

Modified Paths:
--------------
    trunk/fuse-utils/hacking/ChangeLog
    trunk/fuse-utils/raw2hdf.c

Modified: trunk/fuse-utils/hacking/ChangeLog
===================================================================
--- trunk/fuse-utils/hacking/ChangeLog	2010-10-07 09:34:31 UTC (rev 4177)
+++ trunk/fuse-utils/hacking/ChangeLog	2010-10-07 09:51:34 UTC (rev 4178)
@@ -310,3 +310,5 @@
          libspectrum (Fred).
 20101003 man/snapconv.1: libspectrum now automatically fixes the problem of
          A and F being transposed.
+20101007 raw2hdf.c: add missing default for version (fixes bug #3082566; thanks,
+         UB880D) (Fred).

Modified: trunk/fuse-utils/raw2hdf.c
===================================================================
--- trunk/fuse-utils/raw2hdf.c	2010-10-07 09:34:31 UTC (rev 4177)
+++ trunk/fuse-utils/raw2hdf.c	2010-10-07 09:51:34 UTC (rev 4178)
@@ -201,7 +201,7 @@
   FILE *raw, *hdf;
   int error;
   size_t byte_count;
-  enum hdf_version_t version;
+  enum hdf_version_t version = HDF_VERSION_11;
 
   progname = argv[0];
 


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

Revision: 4174
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4174&view=rev
Author:   fredm
Date:     2010-10-05 11:20:02 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
Move fmfconv to fuse-utils.

Modified Paths:
--------------
    branches/fmfx-2010-09-14/fuse/Makefile.am
    branches/fmfx-2010-09-14/fuse/configure.in
    branches/fmfx-2010-09-14/fuse-utils/Makefile.am
    branches/fmfx-2010-09-14/fuse-utils/configure.in

Added Paths:
-----------
    branches/fmfx-2010-09-14/fuse-utils/compat/getopt.c
    branches/fmfx-2010-09-14/fuse-utils/compat/getopt.h
    branches/fmfx-2010-09-14/fuse-utils/compat/getopt1.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv.h
    branches/fmfx-2010-09-14/fuse-utils/fmfconv_aiff.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv_au.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv_ff.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv_ppm.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv_scr.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv_wav.c
    branches/fmfx-2010-09-14/fuse-utils/fmfconv_yuv.c
    branches/fmfx-2010-09-14/fuse-utils/movie_tables.h

Removed Paths:
-------------
    branches/fmfx-2010-09-14/fuse/fmfconv.c
    branches/fmfx-2010-09-14/fuse/fmfconv.h
    branches/fmfx-2010-09-14/fuse/fmfconv_aiff.c
    branches/fmfx-2010-09-14/fuse/fmfconv_au.c
    branches/fmfx-2010-09-14/fuse/fmfconv_ff.c
    branches/fmfx-2010-09-14/fuse/fmfconv_ppm.c
    branches/fmfx-2010-09-14/fuse/fmfconv_scr.c
    branches/fmfx-2010-09-14/fuse/fmfconv_wav.c
    branches/fmfx-2010-09-14/fuse/fmfconv_yuv.c
    branches/fmfx-2010-09-14/fuse/movie_tables.h

Property Changed:
----------------
    branches/fmfx-2010-09-14/fuse-utils/

Modified: branches/fmfx-2010-09-14/fuse/Makefile.am
===================================================================
--- branches/fmfx-2010-09-14/fuse/Makefile.am	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/Makefile.am	2010-10-05 11:20:02 UTC (rev 4174)
@@ -23,25 +23,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-bin_PROGRAMS = fuse fmfconv
+bin_PROGRAMS = fuse
 
-fmfconv_SOURCES = fmfconv.c \
-		  fmfconv_ff.c \
-		  fmfconv_yuv.c \
-		  fmfconv_scr.c \
-		  fmfconv_ppm.c \
-		  fmfconv_wav.c \
-		  fmfconv_au.c \
-		  fmfconv_aiff.c
-
-if COMPAT_GETOPT
-fmfconv_SOURCES += compat/getopt.c compat/getopt1.c
-endif
-
-fmfconv_LDADD = @FFMPEG_LIBS@
-
-fmfconv_DEPENDENCIES = compat/@COMPAT_OSNAME@...
-
 SUBDIRS = @COMPAT_SUBDIR@ \
 	  debugger \
 	  disk \
@@ -227,9 +210,7 @@
 	printer.h \
 	profile.h \
 	scld.h \
-	ula.h \
-	\
-	fmfconv.h
+	ula.h
 
 EXTRA_DIST = AUTHORS \
 	     README \

Modified: branches/fmfx-2010-09-14/fuse/configure.in
===================================================================
--- branches/fmfx-2010-09-14/fuse/configure.in	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/configure.in	2010-10-05 11:20:02 UTC (rev 4174)
@@ -72,41 +72,6 @@
 dnl Checks for library functions.
 AC_CHECK_FUNCS(dirname geteuid getopt_long mkstemp fsync)
 
-dnl Check for zlib (the UNIX version is called z, Win32 zdll)
-AC_MSG_CHECKING(whether to use zlib)
-AC_ARG_WITH(zlib,
-[  --without-zlib          don't use zlib],
-if test "$withval" = no; then zlib=no; else zlib=yes; fi,
-zlib=yes)
-AC_MSG_RESULT($zlib)
-if test "$zlib" = yes; then
-  AC_CHECK_HEADERS(
-    zlib.h,
-    AC_SEARCH_LIBS(compress2, z zdll)
-  )
-fi
-
-dnl Check for ffmpeg libs
-AC_MSG_CHECKING(whether ffmpeg movie recording requested)
-AC_ARG_WITH(ffmpeg,
-  [  --with-ffmpeg            use ffmpeg for movie converting],
-  if test "$withval" = no; then ffmpeglib=no; else ffmpeglib=yes; fi,
-  ffmpeglib=yes
-)
-AC_MSG_RESULT($ffmpeglib)
-if test "$ffmpeglib" = yes; then
-  AC_CHECK_HEADERS(
-    libavformat/avformat.h libswscale/swscale.h,
-    FFMPEG_LIBS="-lavformat -lavcodec -lswscale",
-    FFMPEG_LIBS=''; break
-  )
-  if test "x$FFMPEG_LIBS" != "x"
-  then
-    AC_SUBST(FFMPEG_LIBS)
-    AC_DEFINE([USE_FFMPEG], 1, [Defined if ffmpeg available and requested])
-  fi
-fi
-
 dnl Allow the user to say that various libraries are in one place
 AC_ARG_WITH(local-prefix,
 [  --with-local-prefix=PFX local libraries installed in PFX (optional)],

Deleted: branches/fmfx-2010-09-14/fuse/fmfconv.c
===================================================================
--- branches/fmfx-2010-09-14/fuse/fmfconv.c	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/fmfconv.c	2010-10-05 11:20:02 UTC (rev 4174)
@@ -1,1805 +0,0 @@
-/* fmfconv.c: Convert .fmf movie files
-   Copyright (c) 2004-2005 Gergely Szasz
-
-   $Id: $
-
-   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: szaszg@...
-
-*/
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>		/* Needed for strncasecmp() on QNX6 */
-#endif /* #ifdef HAVE_STRINGS_H */
-#include <fcntl.h>
-
-#include "libspectrum.h"
-#include "movie_tables.h"
-
-#include <getopt.h>
-
-#ifdef USE_FFMPEG
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-#endif
-
-#ifdef HAVE_ZLIB_H
-#define USE_ZLIB 1
-#endif
-
-#ifdef USE_ZLIB
-#include <zlib.h>
-#endif
-
-#include "fmfconv.h"
-
-#define VERBOSE_MAX 3
-#define VERBOSE_MIN -1
-
-#ifdef USE_ZLIB
-#define ZBUF_SIZE 1024
-#define ZBUF_INP_SIZE 512
-z_stream zstream;			/* zlib struct */
-unsigned char zbuf_o[ZBUF_SIZE];	/* zlib output buffer */
-unsigned char zbuf_i[ZBUF_INP_SIZE];	/* zlib input buffer */
-int fmf_compr_feof = 0;
-#endif	/* USE_ZLIB */
-
-typedef enum {
-  DO_FILE = 0,		/* open (next) file */
-  DO_HEAD,		/* read and check file header (FMF) */
-  DO_FRAME_HEAD,	/* a video frame ready */
-  DO_SLICE,		/* read next slice or sound chunk */
-  DO_SOUND,		/* a sound chunk ready */
-  DO_SOUND_FLUSH,	/* a sound chunk ready but flush sound buffer */
-  DO_FRAME,		/* a video frame ready */
-  DO_LAST_FRAME,	/* last video frame ready */
-  DO_EOP,		/* end of input(s) */
-} do_t;
-
-int verbose = 0;
-int do_info = 0;	/* no output and verbose 2 */
-do_t do_now = DO_FILE;
-
-FILE *inp = NULL, *out = NULL, *snd = NULL;
-
-type_t inp_t = TYPE_UNSET, out_t = TYPE_UNSET, snd_t = TYPE_UNSET, scr_t = TYPE_UNSET, prg_t = TYPE_NONE;
-
-char *inp_name = NULL;
-char *out_name = NULL;
-char *snd_name = NULL;
-
-char out_tmpl[16];		/* multiple out filename number template */
-char *out_orig = NULL;		/* multiple out original filename/template */
-char *out_pfix = NULL;		/* after number */
-char *out_nmbr = NULL;		/* start of number */
-char *out_next = NULL;		/* multiple out filename next name */
-
-unsigned long long int cut_frm = 0, cut__to = 0;
-type_t cut_f_t, cut_t_t, cut_cmd = TYPE_NONE;
-char *out_cut = NULL;
-
-int inp_ftell = 0;
-
-unsigned long long int input_no = 0;		/* current file (input) no */
-unsigned long long int input_last_no = 0;	/* number of files (input) - 1 */
-
-
-int inp_fps = 50000;
-long int inp_drop_value = 0;
-
-int machine_timing[] = {                /* timing constants for different machines */
-  50080, 50021, 60115, 50000, 59651
-};
-
-int machine_ftime[] = {
-  19968, 19992, 16635, 20000, 16764
-};
-
-char *machine_name[] = {
- "ZX Spectrum 16K/48K, Timex TC2048/2068, Scorpion. Spectrum SE",
- "ZX Spectrum 128K/+2/+2A/+3/+3E",
- "Timex TS2068", "Pentagon 128K/256K/512K"
- "ZX Spectrum 48K (NTSC)"
-};
-
-#define SCR_PITCH 40
-libspectrum_byte zxscr[9600 * 2];	/* 2x 40x240 bitmap1 bitmap2 */
-libspectrum_byte attrs[9600];		/* 40x240 attrib */
-
-#define SOUND_CHUNK_LEN 8192
-libspectrum_signed_byte *sound8;	/* sound buffer for x-law */
-libspectrum_signed_word *sound16;	/* sound buffer for pcm */
-size_t sound_buf_len = 0;
-
-libspectrum_byte yuv_pal[] = {
-  0, 128, 128,  22, 224, 112,  57, 96, 224,   79, 191, 208,
-  112, 65, 48,  134, 160, 32,  169, 32, 144,  191, 128, 128,
-  0, 128, 128,  29, 255, 107,  76, 85, 255,   105, 212, 235,
-  150, 44, 21,  179, 171, 0,   226, 0, 149,   255, 128, 128,
-};
-
-libspectrum_byte rgb_pal[] = {
-  0, 0, 0,    0, 0, 192,    192, 0, 0,    192, 0, 192,
-  0, 192, 0,  0, 192, 192,  192, 192, 0,  192, 192, 192,
-  0, 0, 0,    0, 0, 255,    255, 0, 0,    255, 0, 255,
-  0, 255, 0,  0, 255, 255,  255, 255, 0,  255, 255, 255,
-};
-
-type_t yuv_t = TYPE_420M;
-
-#define OUT_PITCH 320
-libspectrum_byte pix_rgb[3 * 40 * 8 * 240 * 4];	/* bpp = 3; w = 40*8 h = 240 timex = 2*2 */
-
-libspectrum_byte *pix_yuv[3] = {		/* other view of data */
-  pix_rgb, NULL, NULL
-};
-
-unsigned long long int frame_no = 0;	/* current frame (input) no */
-unsigned long long int time_sec = 0, time_frm = 0;	/* current time (input) no */
-unsigned long long int drop_no = 0;	/* dropped frame no */
-unsigned long long int dupl_no = 0;	/* duplicated frame no */
-unsigned long long int output_no = 0;	/* output frame no */
-int frm_scr = 0, frm_rte = 0, frm_mch = 0; /* screen type, frame rate, machine type (A/B/C/D) */
-int frm_slice_x, frm_slice_y, frm_slice_w, frm_slice_h;
-int frm_w = -1, frm_h = -1;
-int frm_fps = 0;
-
-int out_w, out_h;
-int out_fps = 0;			/* desired output frame rate */
-int out_header_ok = 0;			/* output header ok? */
-
-int out_chn = -1, out_rte = -1, out_fsz, out_len;
-
-/* fmf variables */
-int fmf_compr = 0;			/* fmf compressed or not */
-int fmf_little_endian = 0;		/* little endian PCM */
-int snd_little_endian = -1;			/* little endian PCM */
-unsigned long long int fmf_slice_no = 0;
-unsigned long long int fmf_sound_no = 0;
-
-/* sound variables */
-#define SOUND_BUFF_MAX_SIZE 65536	/* soft max size of collected sound samples */
-type_t snd_enc;				/* sound type (pcm/alaw/ulaw) */
-int snd_rte, snd_chn, snd_fsz, snd_len;	/* sound rate (Hz), sound channels (1/2), sound length in byte  */
-int snd_header_ok = 0;			/* sound header ok? */
-
-int sound_pcm = 1;			/* by default always convert sound to PCM */
-
-libspectrum_signed_word ulaw_table[256] = { ULAW_TAB };
-libspectrum_signed_word alaw_table[256] = { ALAW_TAB };
-
-libspectrum_byte fhead[32];		/* fmf file/frame/slice header */
-
-void close_out( void );
-
-#define FBUFF_SIZE 32
-libspectrum_byte fbuff[FBUFF_SIZE];		/* file buffer used for check file type... */
-int fbuff_size = 0;
-
-#define INTO_BUFF 0
-#define FROM_BUFF 1
-
-size_t
-fread_buff( void *ptr, size_t size, int how )	/* read from inp, how -> into buff or buff + file */
-{
-  size_t s;
-  size_t n;
-
-  if( how == INTO_BUFF ) {
-    n = size > FBUFF_SIZE ? FBUFF_SIZE : size;
-
-    s = fread( fbuff, n, 1, inp );
-    if( s != 1 ) return s;
-    fbuff_size = n;
-    memcpy( ptr, fbuff, n );
-    if( size > FBUFF_SIZE ) {
-      ptr += n;
-      n = size - FBUFF_SIZE;
-      return fread( ptr, n, 1, inp );
-    }
-  } else {
-    n = size <= fbuff_size ? size : fbuff_size;
-
-    if( n > 0 ) {
-      memcpy( ptr, fbuff, n );
-      if( n < fbuff_size )
-        memmove( fbuff, fbuff + n, fbuff_size - n );
-      fbuff_size -= n;
-      size -= n;
-      ptr += n;
-    }
-    if( size > 0 ) {
-      return fread( ptr, size, 1, inp );
-    }
-  }
-  return 1;
-}
-
-#ifdef USE_ZLIB
-int
-feof_compr( FILE *f )
-{
-  if( fmf_compr ) {
-    if( fmf_compr_feof )
-      return 1;
-    if( zstream.avail_in > 0 || zstream.avail_out != ZBUF_SIZE )
-      return 0;
-    fmf_compr_feof = feof( f );
-    return fmf_compr_feof;
-  } else {
-    return feof( f );
-  }
-}
-
-int fget_read = 0;
-
-int
-fgetc_compr( FILE *f )
-{
-  int s;
-
-  if( fmf_compr ) {
-    if( zstream.avail_out == ZBUF_SIZE ) {
-      fget_read++;
-      zstream.next_out = zbuf_o;
-      do {
-	if( zstream.avail_in == 0 && !fmf_compr_feof ) {
-	  zstream.avail_in = fread( zbuf_i, 1, ZBUF_INP_SIZE, inp );
-	  zstream.next_in = zbuf_i;
-	  if( zstream.avail_in == 0 )
-	    fmf_compr_feof = 1;
-	}
-	s = inflate( &zstream, fmf_compr_feof ? Z_FINISH : Z_SYNC_FLUSH );
-      } while ( zstream.avail_out != 0 && s == Z_OK );
-      zstream.next_out = zbuf_o;
-    }
-    if( zstream.avail_out == ZBUF_SIZE )	/* end of file */
-      return -1;
-    zstream.avail_out++;
-    return *( zstream.next_out++ );    /* !!! we use it for own purpose */
-  } else {
-    return fgetc( f );
-  }
-}
-
-int
-fread_compr( void *buff, size_t n, size_t m, FILE *f )
-{
-  size_t i;
-  int d;
-  char *b = buff;
-
-  if( fmf_compr ) {
-    for( i = n * m; i > 0; i-- ) {
-      if( ( d = fgetc_compr( f ) ) == -1 )	/****FIXME may too slow */
-        return ( n * m - i ) / n;
-      *b++ = d;
-    }
-    return m;
-  } else {
-    return fread( b, n, m, f );
-  }
-}
-#else	/* USE_ZLIB */
-#define fgetc_compr fgetc
-#define fread_compr fread
-#define feof_compr feof
-#endif	/* USE_ZLIB */
-
-libspectrum_dword
-swap_endian_dword( libspectrum_dword d )
-{
-  return ( ( d & 0x000000ff ) << 24 ) |
-	    ( ( d & 0x0000ff00 ) << 8 ) |
-	      ( ( d & 0x00ff0000 ) >> 8 ) |
-	        ( d >> 24 );
-}
-
-int
-alloc_sound_buff( size_t len )
-{
-  if( sound_buf_len < len ) {
-    len = ( ( len * 3 / 2 ) / SOUND_CHUNK_LEN + 1 ) * SOUND_CHUNK_LEN;
-
-    if( sound_buf_len == 0 ) {
-      sound8 = malloc( len );
-    } else {
-      sound8 = realloc( sound8, len );
-    }
-    if( sound8 == NULL ) {
-      printe( "\n\nMemory (re)allocation error.\n" );
-      return ERR_OUTOFMEM;
-    }
-    sound16 = (void *)sound8;
-    sound_buf_len = len;
-    printi( 3, "fmf_alloc_sound(): sound buffer length: %lu\n", (unsigned long)sound_buf_len );
-  }
-  return 0;
-}
-
-int
-law_2_pcm()
-{
-  int err;
-  libspectrum_signed_byte *s;
-  libspectrum_signed_word *t;
-  libspectrum_signed_word *table = snd_enc == TYPE_ALW ? alaw_table : ulaw_table;
-
-  if( ( err = alloc_sound_buff( snd_len * 2 ) ) ) return err;
-
-  for( s = sound8 + snd_len - 1, t = sound16 + snd_len - 1 ;
-		s >= sound8; s--, t-- ) {
-    *t = table[*(libspectrum_byte*)s];
-  }
-#ifdef WORDS_BIGENDIAN
-  snd_little_endian = 0;
-#else
-  snd_little_endian = 1;
-#endif
-  snd_enc = TYPE_PCM;
-  snd_fsz <<= 1;		/* 1byte -> 2byte */
-  snd_len <<= 1;		/* 1byte -> 2byte */
-
-  printi( 3, "law_2_pcm(): %d sample converted\n", snd_len / 2 );
-
-  return 0;
-}
-
-void
-pcm_swap_endian()	/* buff == sound */
-{
-  libspectrum_word *s;
-  int len = snd_len / 2;
-
-  for( s = (void *)sound16; len > 0; len-- ) {
-    *s = ( ( *s & 0x00ff ) << 8 ) | ( *s >> 8 );
-    s++;
-  }
-  printi( 3, "pcm_swap_endian(): %d sample converted\n", snd_len / 2 );
-}
-
-char *
-find_filename_ext( char *filename )
-{
-  char *extension = NULL;
-
-  /* Get the filename extension, if it exists */
-  if( filename ) {
-    extension = strrchr( filename, '.' ); if( extension ) extension++;
-  }
-  return extension;
-}
-
-int
-inp_get_cut_value( char *s, unsigned long long int *value, type_t *type )
-{
-  int n = 0;
-  unsigned long long int frm = 0;
-
-  char *tmp = strchr( s, ':' );
-  if( tmp ) {		/*OK, min:sec */
-    unsigned int sec = 0;
-    if( ( sscanf( s, "%llu:%n%u", &frm, &n, &sec) != 2 ) || sec > 59 ) {	/* OK, unknown value.. */
-      printe( "Bad intervall definition in a -C/--cut option\n" );
-      return 6;
-    }
-    frm = frm * 60 + sec;
-    *value = frm;
-    *type = TYPE_TIME;
-    return 0;
-  }
-  if( ( sscanf( s, "%llu", &frm) != 1 ) ) {	/* OK, unknown value.. */
-      printe( "Bad intervall definition in a -C/--cut option\n" );
-      return 6;
-  }
-  *value = frm;
-  *type = TYPE_FRAME;
-  return 0;
-}
-
-int
-inp_get_next_cut( void )
-{
-  char *mns, *tmp;
-  int err;
-
-  if( !out_cut || *out_cut == '\0' ) {	/* End of cut!!! */
-    cut_cmd = TYPE_NONE;
-    return 0;
-  }
-
-  tmp = strchr( out_cut, ',' );
-  if( tmp )
-    *(tmp++) = '\0';	/*Ok, we start the first intervall */
-
-  mns = strchr( out_cut, '-' );	/* ff[:ss] */
-  if( !mns ) {	/* there is no '-' one frame/sec cut out*/
-    if( ( err = inp_get_cut_value( out_cut, &cut_frm, &cut_f_t ) ) ) return err;
-    cut__to = cut_frm; cut_t_t = cut_f_t;
-    cut_cmd = TYPE_CUT;
-  } else if( out_cut == mns )	{ /* -ff[:ss]*/
-    cut_frm = 0; cut_f_t = TYPE_FRAME;
-    if( ( err = inp_get_cut_value( out_cut + 1, &cut__to, &cut_t_t ) ) ) return err;
-    cut_cmd = TYPE_CUT;
-  } else {	/* xx-xx or xx- */
-    mns++;
-    if( ( err = inp_get_cut_value( out_cut, &cut_frm, &cut_f_t ) ) ) return err;
-    if( *mns == '\0' ) {	/* xxx- */
-/*      if( ( err = inp_get_cut_value( out_cut + 1, &cut_frm, &cut_f_t ) ) ) return err; */
-      cut__to = 0;
-      cut_cmd = TYPE_CUTFROM;
-    } else {
-      if( ( err = inp_get_cut_value( mns, &cut__to, &cut_t_t ) ) ) return err;		/* xxx-yyy */
-      cut_cmd = TYPE_CUT;
-    }
-  }
-  out_cut = tmp;
-  return 0;
-}
-
-
-/*
-%[flags] [width] [.precision] [{h | l | ll | I | I32 | I64}]type
-%[0 ][0-9]*<d|x|o|u>
-%08d -> %08llu
-*/
-
-int
-parse_outname()
-{
-  char *f = out_name, *perc;
-  char c1[2], c2[2];
-  int n, len;
-
-  perc = f;
-  out_orig = out_name;
-  while( f && *f ) {
-    while( ( perc = strchr( f, '%' ) ) != NULL && 
-           *( perc + 1 ) == '%' ) {
-      f = perc + 1;
-    }
-    f = perc;
-    if( !f ) break;
-    if( sscanf( perc, "%%%1[0 ]%2u%1[dxXou]%n", c1, &n, c2, &len ) == 3 ) {
-      break;
-    } else if( sscanf( perc, "%%%2u%1[dxXou]%n", &n, c2, &len ) == 2 ) {
-      c1[0] = '\0';
-      break;
-    } else if( sscanf( perc, "%%%1[dxXou]%n", c2, &len ) == 1 ) {
-      n = 0; c1[0] = '\0';
-      break;
-    } else {
-      f++;
-    }
-  }
-
-  out_next = malloc( strlen( out_name ) + 24 );
-
-  if( f == NULL ) {	/* there is no number template */
-    char *ext;
-
-    ext = find_filename_ext( out_name );
-    if( ext == NULL ) {
-      strcpy( out_tmpl, "-%08u" );
-      out_nmbr = out_next + strlen( out_name );
-      out_pfix = NULL;
-    } else {
-      strcpy( out_tmpl, "-%08u" );
-      out_nmbr = out_next + ( ext - out_name - 1 );
-      out_pfix = ext - 1;
-    }
-  } else {
-    if( n > 20 ) n = 20;
-    if( c2[0] == 'd' ) c2[0] = 'u';
-
-    if( n )
-      sprintf( out_tmpl, "%%%s%ull%c", c1, n, c2[0] );
-    else
-      sprintf( out_tmpl, "%%%sll%c", c1, c2[0] );
-
-    out_nmbr = out_next + ( perc - out_name );
-    out_pfix = perc + len;
-  }
-  printi( 2, "parse_outname(): Multiple output file No. template: %s.\n", out_tmpl );
-
-  return 0;
-}
-
-int
-next_outname()
-{
-  int err;
-
-  if( !out_orig && ( err = parse_outname() ) ) return err;
-  strcpy( out_next, out_orig );
-  sprintf( out_nmbr, out_tmpl, output_no );
-  if( out_pfix )
-    strcat( out_next, out_pfix );
-  out_name = out_next;
-  printi( 3, "next_outname(): Next generated output filename: %s.", out_name );
-
-  return 0;
-}
-
-int
-open_out()
-{
-  char *ext;
-  typedef struct {
-    type_t type;
-    char *extension;
-  } ext_t;
-
-  int i, err;
-  ext_t out_ext_tab[] = {
-    { TYPE_YUV,  "yuv" },
-    { TYPE_YUV,  "y4m" },
-    { TYPE_SCR,  "scr"  },
-    { TYPE_PPM,  "ppm"  },
-    { TYPE_PPM,  "pnm"  },
-    { TYPE_PNG,  "png" },
-    { TYPE_JPEG, "jpg" },
-    { TYPE_JPEG, "jpeg" },
-    { TYPE_FFMPEG,"mpeg" },
-    { TYPE_FFMPEG,"mpg" },
-    { TYPE_FFMPEG,"avi" },
-    { TYPE_FFMPEG,"mkv" },
-    { 0, NULL }
-  };
-  char *out_tstr[] = {
-    "SCR - ZX Spectrum screenshot file",
-    "PPM - Portable PixMap", "PNG - Portable Network Graphics",
-    "JPEG - Joint Photographic Experts Group file format",
-    "YUV4MPEG2 - uncompressed video stream format",
-    "FFMPEG - ffmpeg file format"
-  };
-
-  if( do_info ) return 0;
-
-  if( out_t == TYPE_UNSET ) {	/* try to identify the file type */
-#ifdef USE_FFMPEG
-    out_t = TYPE_FFMPEG;	/* default to FFMPEG */
-#else
-    out_t = TYPE_YUV;		/* default to YUV */
-#endif
-    ext = find_filename_ext( out_name );
-    for( i = 0; ext != NULL && out_ext_tab[i].extension != NULL; i++ ) {
-      if( !strcasecmp( ext, out_ext_tab[i].extension ) ) {
-        out_t = out_ext_tab[i].type;
-        break;
-      }
-    }
-  }
-  if( out_name && ( out_t >= TYPE_SCR && out_t <= TYPE_JPEG ) && 
-      ( err = next_outname() ) > 0 ) return err;
-
-  if( out_name
-#ifdef USE_FFMPEG
-		&& out_t != TYPE_FFMPEG
-#endif
-  ) {
-    if( ( out = fopen( out_name, "wb" ) ) == NULL ) {
-      printe( "Cannot open output file '%s'...\n", out_name );
-      return ERR_OPEN_SND;
-    }
-  } else
-#ifdef USE_FFMPEG
-	 if( out_t != TYPE_FFMPEG )
-#endif
-  {
-    out = stdout;
-    out_name = "(-=stdout=-)";
-  }
-
-  if( !( out_t >= TYPE_SCR && out_t <= TYPE_JPEG ) ) {
-    printi( 0, "open_out(): Output file (%s) opened as %s file.\n", out_name,
-		out_tstr[out_t - TYPE_SCR] );
-  } else {
-    if( !output_no )
-      printi( 0, "open_out(): Multiple output file (%s) as %s.\n", out_next,
-		out_tstr[out_t - TYPE_SCR] );
-    printi( 2, "open_out(): Output file (%s) opened as %s file.\n", out_name,
-		out_tstr[out_t - TYPE_SCR] );
-  }
-  return 0;
-}
-
-int
-open_snd()
-{
-  char *ext;
-  typedef struct {
-    type_t type;
-    char *extension;
-  } ext_t;
-
-  int i;
-  ext_t snd_ext_tab[] = {
-    { TYPE_WAV,  "wav" },
-    { TYPE_AU,   "au"  },
-    { TYPE_AU,   "snd" },
-    { TYPE_AIFF, "aif" },
-    { TYPE_AIFF, "aiff" },
-    { TYPE_FFMPEG, "mp2" },
-    { TYPE_FFMPEG, "mp3" },
-    { TYPE_FFMPEG, "ogg" },
-    { TYPE_FFMPEG, "aac" },
-    { TYPE_FFMPEG, "ac3" },
-    { TYPE_FFMPEG, "m4a" },
-    { 0, NULL }
-  };
-
-  char *snd_tstr[] = {
-    "FFMPEG - ffmpeg file format",
-    "WAV - MS Wave format",
-    "AU - SUN OS audio file format",
-    "AIF - MAC/OS audio file"
-  };
-
-  if( do_info ) return 0;
-
-  if( snd_name ) {
-    if( ( snd = fopen( snd_name, "wb" ) ) == NULL ) {
-      printe( "Cannot open sound file '%s'...\n", snd_name );
-      return ERR_OPEN_SND;
-    }
-  } else {
-    return 0;
-  }
-  if( snd_t == TYPE_UNSET ) {	/* try to identify the file type */
-    snd_t = TYPE_WAV;		/* default to WAV */
-    ext = find_filename_ext( snd_name );
-    for( i = 0; ext != NULL && snd_ext_tab[i].extension != NULL; i++ ) {
-      if( !strcasecmp( ext, snd_ext_tab[i].extension ) ) {
-        snd_t = snd_ext_tab[i].type;
-        break;
-      }
-    }
-  }
-  printi( 0, "open_snd(): Sound file (%s) opened as %s file.\n", snd_name, snd_tstr[snd_t - TYPE_FFMPEG] );
-  return 0;
-}
-
-int
-open_inp()
-{
-  if( inp ) {				/* we have to close before last */
-    if( inp != stdin ) {
-      fclose( inp );
-    } else {			/* reopen stdin???? */
-      do_now = DO_EOP;
-      return 0;
-    }
-  }
-  if( inp_name ) {
-    if( ( inp = fopen( inp_name, "rb" ) ) == NULL ) {
-      printe( "Cannot open input file '%s'...\n", inp_name );
-      return ERR_OPEN_INP;
-    }
-  } else {
-    inp = stdin;
-    inp_name = "(-=stdin=-)";
-  }
-  if( fseek( inp, 0, SEEK_END ) == -1 ) {
-    printi( 4, "open_inp(): cannot seek to the end of the input file (not seekable).\n" );
-    inp_ftell = 0;
-  } else if( ( inp_ftell = ftell( inp ) ) == -1 ) {
-    printi( 4, "open_inp(): cannot ftell input file??.\n" );
-    fseek( inp, 0, SEEK_SET );
-    inp_ftell = 0;
-  } else {
-    fseek( inp, 0, SEEK_SET );
-  }
-
-  if( inp_t == TYPE_UNSET ) {	/* try to identify the file type */
-    fread_buff( fhead, 4, INTO_BUFF );		/* check file type */
-    if( memcmp( fhead, "FMF_", 4 ) == 0 )
-      inp_t = TYPE_FMF;
-    else
-      inp_t = TYPE_SCR;
-  }
-  do_now = inp_t == TYPE_FMF ? DO_HEAD : DO_SLICE;
-  printi( 0, "open_inp(): Input file (%s) opened as %s file.\n", inp_name, inp_t == TYPE_FMF ? "FMF" : "SCR" );
-  return 0;
-}
-
-void
-setup_frame_wh()
-{
-  if( ( scr_t = fhead[5] ) == TYPE_HRE ) {	/* screen type => $ R C X */
-    if( frm_w != 640 ) {
-      frm_w = 640; frm_h = 480;
-      pix_yuv[1] = &pix_rgb[ 640 * 480 ];
-      pix_yuv[2] = &pix_rgb[ 640 * 480 * 2 ];
-    }
-  } else {
-    if( frm_w != 320 ) {
-      frm_w = 320; frm_h = 240;
-      pix_yuv[1] = &pix_rgb[ 320 * 240 ];
-      pix_yuv[2] = &pix_rgb[ 320 * 240 * 2 ];
-    }
-  }
-  yuv_uvlen = yuv_ylen = frm_w * frm_h;
-}
-
-int
-check_fmf_head()
-{
-  if( memcmp( fhead, "FMF_", 4 ) ) {
-      printe( "Not a Fuse Movie File '%s'\n", inp_name );
-      return ERR_CORRUPT_INP;
-  }
-  if( fread_buff( fhead, 12, FROM_BUFF ) != 1 ||
-	fhead[0] != 'V' ||
-	fhead[1] != '1' ||	/* V1 */
-	( fhead[2] != 'e' && fhead[2] != 'E' ) ||		/* endianness */
-	( fhead[3] != 'U' && fhead[3] != 'Z' ) )		/* compressed? */
-  {
-    printe("This version of Fuse Movie File not supported, sorry...\n");
-    return ERR_VERSION_INP;
-  }
-  fmf_little_endian = fhead[2] == 'e' ? 1 : 0;
-  fmf_compr = fhead[3] == 'Z' ? 1 : 0;
-
-#ifndef USE_ZLIB
-  if( fmf_compr ) {				/* error, if no zlib */
-    printe( "Sorry, no zlib compressed FMF file support in this binary!\n" );
-    return ERR_NO_ZLIB;
-  }
-#endif	/* USE_ZLIB */
-/* Check initial frame parameters */
-  if( fhead[4] < 1 ) {
-    printe( "Wrong Frame rate '%d', sorry...\n", fhead[4] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[5] != TYPE_ZXS && fhead[5] != TYPE_TXS && fhead[5] != TYPE_HRE && fhead[5] != TYPE_HCO ) {
-    printe( "Unknown Screen$ type '%d', sorry...\n", fhead[5] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[6] < 'A' || fhead[6] > 'E' ) {
-    printe( "Unknown Machine type '%d', sorry...\n", fhead[6] );
-    return ERR_CORRUPT_INP;
-  }
-  frm_rte = fhead[4];				/* frame rate (1:#) */
-  setup_frame_wh();
-  frm_mch = fhead[6];				/* machine type */
-
-  inp_fps = machine_timing[frm_mch - 'A'] / frm_rte;	/* real input fps * 1000 frame / 1000s */
-  if( out_fps == 0 ) out_fps = inp_fps;	/* later may change */
-
-/* Check initial sound parameters */
-  if( fhead[7] != 'P' && fhead[7] != 'U' && fhead[0] != 'A' ) {
-    printe( "Unknown FMF sound encoding type '%d', sorry...\n", fhead[7] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[8] + ( fhead[9] << 8 ) < 1 ) {
-    printe( "Wrong FMF sound rate '%d', sorry...\n", fhead[8] + ( fhead[9] << 8 ) );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[10] != 'M' && fhead[10] != 'S' ) {
-    printe( "Unknown FMF sound channels type '%d', sorry...\n", fhead[10] );
-    return ERR_CORRUPT_INP;
-  }
-
-  snd_enc = fhead[7];		/* P U A */
-  snd_rte = fhead[8] + ( fhead[9] << 8 );
-  snd_chn = fhead[10] == TYPE_STEREO ? 2 : 1;
-  snd_fsz = ( snd_enc == TYPE_PCM ? 2 : 1 ) * snd_chn;
-  if( snd_enc == TYPE_PCM ) snd_little_endian = fmf_little_endian;
-
-  if( out_rte == -1 ) out_rte = snd_rte;
-  if( out_chn == -1 ) out_chn = snd_chn;
-  do_now = DO_SLICE;
-  printi( 1, "check_fmf_head(): file:  FMF V1 %s endian %scompressed.\n", fmf_little_endian ? "little" : "big",
-							fmf_compr ? "" : "un" );
-  printi( 1, "check_fmf_head(): video: frame rate = 1:%d frame time: %dus %s machine timing.\n", frm_rte, machine_ftime[frm_mch - 'A'],
-								machine_name[frm_mch - 'A'] );
-  printi( 1, "check_fmf_head(): audio: sampling rate %dHz %c encoded %s sound.\n", snd_rte, snd_enc,
-		 snd_chn == 2 ? "stereo" : "mono" );
-  return 0;
-}
-
-int
-fmf_read_head()
-{
-  fread_buff( fhead, 4, FROM_BUFF );
-  return check_fmf_head();
-}
-
-int
-fmf_read_frame_head()
-{
-  if( fread_compr( fhead, 3, 1, inp ) != 1 ) {
-    printe( "\n\nfmf_read_frame_head(): Corrupt input file (N) @0x%08lx.\n", (unsigned long)ftell( inp ) );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[0] < 1 ) {
-    printe( "Wrong Frame rate '%d', sorry...\n", fhead[0] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[1] != TYPE_ZXS && fhead[1] != TYPE_TXS && fhead[1] != TYPE_HRE && fhead[1] != TYPE_HCO ) {
-    printe( "Unknown Screen$ type '%d', sorry...\n", fhead[1] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[2] < 'A' || fhead[2] > 'E' ) {
-    printe( "Unknown Machine type '%d', sorry...\n", fhead[2] );
-    return ERR_CORRUPT_INP;
-  }
-
-  setup_frame_wh();
-
-  if( frm_rte != fhead[0] || frm_mch != fhead[2] ) {	/* recalculate timings */
-    frm_rte = fhead[0];				/* frame rate (1:#) */
-    frm_mch = fhead[2];				/* machine type */
-    inp_fps = machine_timing[frm_mch - 'A'] / frm_rte;	/* real input fps * 1000 frame / 1000s */
-    if( out_fps == 0 ) out_fps = inp_fps;	/* later may change */
-  }
-  do_now = DO_SLICE;
-  frame_no++;
-  time_frm += machine_ftime[frm_mch - 'A'] * frm_rte;
-  while( time_frm >= 1000000 ) {
-    time_frm -= 1000000;
-    time_sec++;
-  }
-  printi( 2, "fmf_read_frame_head(): rate = 1:%d frame time: %dus %s machine.\n", frm_rte, machine_ftime[frm_mch - 'A'],
-								machine_name[frm_mch - 'A'] );
-  return 0;
-}
-
-int
-fmf_read_chunk_head()
-{
-  if( fread_compr( fhead, 1, 1, inp ) != 1 ) {	/* */
-    printe( "Unexpected end of input file @0x%08lx.\n", (unsigned long)ftell( inp )  );
-    return ERR_ENDOFFILE;
-  }
-  if( fhead[0] != 'N' && fhead[0] != '$' && fhead[0] != 'S' && fhead[0] != 'X' ) {
-    printe( "Unknown FMF chunk type '%d', sorry...\n", fhead[0] );
-    return ERR_CORRUPT_INP;
-  }
-  printi( 2, "fmf_read_chunk_head(): Chunk: %c - %s\n", fhead[0], fhead[0] == 'N' ? "(N)ew frame" :
-				( fhead[0] == '$' ? "($)lice": ( fhead[0] == 'S' ? "(S)ound" : 
-				  ( fhead[0] == 'X' ? "End of recording" : "\???" ) ) ) );
-  return 0;
-}
-
-int
-fmf_read_init()		/* read first N */
-{
-  int err;
-  if( ( err = fmf_read_chunk_head() ) ) return err;
-
-  if( fhead[0] != 'N' ) {				/* end of record... */
-    printe( "\n\nfmf_read_init(): Corrupt input file (N) @0x%08lx.\n", (unsigned long)ftell( inp ) );
-    return ERR_CORRUPT_INP;
-  }
-  return fmf_read_frame_head();
-}
-
-int
-fmf_read_sound()
-{
-  int err;
-  int len;
-  static int fmf_snd_head_read = 0;
-
-  if( !fmf_snd_head_read && fread_compr( fhead, 6, 1, inp ) != 1 ) {
-    printe( "\n\nCorrupt input file (S) @0x%08lx.\n", (unsigned long)ftell( inp ) );
-    return ERR_CORRUPT_INP;
-  }
-
-  fmf_snd_head_read = 1;
-  if( fhead[0] != 'P' && fhead[0] != 'U' && fhead[0] != 'A' ) {
-    printe( "Unknown FMF sound encoding type '%d', sorry...\n", fhead[0] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[1] + ( fhead[2] << 8 ) < 1 ) {
-    printe( "Wrong FMF sound rate '%d', sorry...\n", fhead[1] + ( fhead[2] << 8 ) );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[3] != 'M' && fhead[3] != 'S' ) {
-    printe( "Unknown FMF sound channels type '%d', sorry...\n", fhead[3] );
-    return ERR_CORRUPT_INP;
-  }
-
-  if( snd_len && ( snd_enc != fhead[0] ||		/* P U A */
-		snd_rte != fhead[1] + ( fhead[2] << 8 ) ||
-		snd_chn != ( fhead[3] == TYPE_STEREO ? 2 : 1 ) ) ) {
-    printi( 3, "fmf_read_sound(): sound parameters changed flush sound buffer\n" );
-    do_now = DO_SOUND_FLUSH;
-    return 0;
-  }
-
-  fmf_snd_head_read = 0;
-  snd_enc = fhead[0];		/* P U A */
-  snd_rte = fhead[1] + ( fhead[2] << 8 );
-  snd_chn = fhead[3] == TYPE_STEREO ? 2 : 1;
-  snd_fsz = ( snd_enc == TYPE_PCM ? 2 : 1 ) * snd_chn;
-  len = ( fhead[4] + ( fhead[5] << 8 ) + 1 ) * snd_fsz;
-
-  if( ( err = alloc_sound_buff( snd_len + len ) ) ) return err;
-  if( fread_compr( (void *)( sound8 + snd_len ), len, 1, inp ) != 1 ) {
-    printe( "\n\nCorrupt input file (S) @0x%08lx.\n", (unsigned long)ftell( inp ) );
-    return ERR_CORRUPT_INP;
-  }
-  fmf_sound_no++;
-  snd_len += len;
-  if( snd_len >= SOUND_BUFF_MAX_SIZE ) {
-    printi( 3, "fmf_read_sound(): flush sound buffer because full\n" );
-    do_now = DO_SOUND;
-    return 0;
-  }
-  printi( 3, "fmf_read_sound(): store %dHz %c encoded %s %d samples (%d bytes) sound\n", snd_rte, snd_enc,
-		 snd_chn == 2 ? "stereo" : "mono", len/snd_fsz, len );
-  return 0;
-}
-
-int
-snd_write_sound()
-{
-  int err;
-
-  if( snd_len <= 0 ) return 0;
-
-  if( snd_enc != TYPE_PCM && sound_pcm && ( err = law_2_pcm() ) ) return err;
-
-  if( snd_t == TYPE_WAV )
-    err = snd_write_wav();
-  else if( snd_t == TYPE_AU )
-    err = snd_write_au();
-  else if( snd_t == TYPE_AIFF )
-    err = snd_write_aiff();
-#ifdef USE_FFMPEG
-  else if( snd_t == TYPE_FFMPEG )
-    err = snd_write_ffmpeg();
-#endif
-  snd_len = 0;
-  if( err ) return err;
-
-  return 0;
-}
-
-void
-close_snd()
-{
-  if( snd_t == TYPE_WAV )
-    snd_finalize_wav();
-  else if( snd_t == TYPE_AU )
-    snd_finalize_au();
-  else if( snd_t == TYPE_AIFF )
-    snd_finalize_aiff();
-
-  if( !snd ) return;
-  fclose( snd );
-  snd = NULL;
-}
-
-int
-fmf_read_slice_blokk( libspectrum_byte *scrl, int w, int h )
-{
-  int last = -1, d = -1, width = w, len = 0, i;
-  libspectrum_byte *scrp;
-
-  for( ; h > 0; h--, scrl += SCR_PITCH ) {	/* every line  */
-    scrp = scrl;
-    w = width;			/* restore width */
-    while( w > 0 ) {
-      if( len == 0 ) {
-        if( ( d = fgetc_compr( inp ) ) == -1 ) {
-          printe( "\n\nCorrupt input file ($) @0x%08lx.\n", (unsigned long)ftell( inp ) );
-          return ERR_CORRUPT_INP;	/* read a byte */
-        }
-        if( d == last ) {	/* compressed chunk... */
-	  if( ( len = fgetc_compr( inp ) ) == -1 ) {
-	    printe( "\n\nCorrupt input file ($) @0x%08lx.\n", (unsigned long)ftell( inp ) );
-	    return ERR_CORRUPT_INP;	/* read a byte */
-	  }
-	  len++;
-	  last = -1;	/* 0 - 255 */
-        } else {
-	  len = 1, last = d;
-        }
-      }
-      if( len > w ) i = w; else i = len;
-      len -= i;
-      w -= i;
-      for(; i > 0; i-- )
-        *scrp++ = d;		/* save data */
-    }
-  }
-  return 0;
-}
-
-int
-fmf_read_screen()
-{
-  int err;
-
-  if( fread_compr( fhead, 6, 1, inp ) != 1 ) {
-    printe( "\n\nCorrupt input file ($) @0x%08lx.\n", (unsigned long)ftell( inp ) );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[0] > 39 ) {
-    printe( "Wrong FMF slice X position '%d', sorry...\n", fhead[0] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[1] + ( fhead[2] << 8 ) > 239 ) {
-    printe( "Wrong FMF slice Y position '%d', sorry...\n", fhead[1] + ( fhead[2] << 8 ) );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[3] - 1 > 39 ) {
-    printe( "Wrong FMF slice Width '%d', sorry...\n", fhead[3] );
-    return ERR_CORRUPT_INP;
-  }
-  if( fhead[4] + ( fhead[5] << 8 ) - 1 > 239 ) {
-    printe( "Wrong FMF slice Height '%d', sorry...\n", fhead[4] + ( fhead[5] << 8 ) );
-    return ERR_CORRUPT_INP;
-  }
-
-  frm_slice_x = fhead[0];
-  frm_slice_y = fhead[1] + ( fhead[2] << 8 );
-  frm_slice_w = fhead[3];
-  frm_slice_h = fhead[4] + ( fhead[5] << 8 );
-
-/* read bitmap1 */
-/*	fprintf( stderr, "$0 0x%08x: %d,%d %dx%d\n", (unsigned int) ftell( scr ) - 7, fmf_x, fmf_y ,fmf_w, fmf_h ); */
-  if( ( err = fmf_read_slice_blokk( zxscr + frm_slice_y * SCR_PITCH + frm_slice_x,
-			       frm_slice_w, frm_slice_h ) ) ) return err;	/* we store it with cont. */
-/* read bitmap2 if HighResolution Timex */
-  if( scr_t == TYPE_HRE && ( err = fmf_read_slice_blokk( zxscr + 9600 +
-			     frm_slice_y * SCR_PITCH + frm_slice_x,
-			     frm_slice_w, frm_slice_h ) ) ) return err;	/* we store it with cont. */
-/*read attrib */
-/*	fprintf( stderr, "Attr 0x%08x: %d,%d %dx%d\n", (unsigned int) ftell( scr ) - 7, fmf_x, fmf_y ,fmf_w, fmf_h ); */
-  if( ( err = fmf_read_slice_blokk( attrs + frm_slice_y * SCR_PITCH + frm_slice_x,
-			       frm_slice_w, frm_slice_h ) ) ) return err;
-/*	fprintf(stderr, "next slice@...", (unsigned int)ftell(scr)); */
-  fmf_slice_no++;
-  printi( 3, "fmf_read_screen(): x=%d, y=%d, w=%d, h=%d\n", frm_slice_x, frm_slice_y, frm_slice_w, frm_slice_h );
-  return 0;
-}
-
-int
-fmf_read_slice()
-{
-  int err;
-  if( ( err = fmf_read_chunk_head() ) ) return err;
-
-  if( fhead[0] == 'N' ) {		/* end of frame, start new frame! */
-    do_now = DO_FRAME;
-  } else if( fhead[0] == 'X' ) {
-    do_now = DO_LAST_FRAME;
-  } else if( fhead[0] == 'S' ) {
-    return fmf_read_sound();
-  } else {				/* read screen */
-    return fmf_read_screen();
-  }
-  return 0;
-}
-
-int
-scr_read_scr()
-{
-/* fmf_slice_x = 0; fmf_slice_y = 0; fmf_slice_w = 40; fmf_slice_h = 240; */
-  return 0;
-}
-
-void
-out_2_yuv()
-{
-
-  libspectrum_byte *bitmap, *attr;
-  int i, w, idx;
-  int Y, U, V;
-  int x = frm_slice_x, y = frm_slice_y, h = frm_slice_h;
-  int inv = ( frame_no * frm_rte % 32 ) > 15 ? 1 : 0;
-
-  w = frm_slice_w;
-  for( h = frm_slice_h; h > 0; h--, y++, w = frm_slice_w ) {
-    if( scr_t != TYPE_HRE )
-      idx = y * OUT_PITCH + x * 8 ;		/* 8pixel/data */
-    else
-      idx = y * OUT_PITCH * 2 + x * 16 ;	/* 16 pixel/data*/
-    bitmap = &zxscr[SCR_PITCH * y + x];
-    attr   = &attrs[SCR_PITCH * y + x];
-    for( ; w > 0; w--, bitmap++, attr++ ) {
-      int px, fx, ix = *attr;
-      int bits = scr_t == TYPE_HRE ? ( *bitmap << 8 ) + *(bitmap + 9600) : *bitmap;
-
-      fx = ( ix & 0x80 ) * inv;
-      px = ( ( ix & 0x38 ) >> 3 ) + ( ( ix & 0x40 ) ? 8 : 0 );
-      ix = ( ix & 0x07 ) + ( ( ix & 0x40 ) ? 8 : 0 );
-      for( i = ( scr_t == TYPE_HRE ? 16 : 8 ); i > 0; i-- ) {
-        if( ( bits ^ fx ) & 128 ) {	/* ink */
-          Y = yuv_pal[ ix * 3 + 0 ];
-          U = yuv_pal[ ix * 3 + 1 ];
-          V = yuv_pal[ ix * 3 + 2 ];
-        } else {			/* paper */
-          Y = yuv_pal[ px * 3 + 0 ];
-          U = yuv_pal[ px * 3 + 1 ];
-          V = yuv_pal[ px * 3 + 2 ];
-        }
-        pix_yuv[0][idx]   = Y;
-        pix_yuv[1][idx]   = U;
-        pix_yuv[2][idx++] = V;
-        bits <<= 1;
-      }
-    }
-  }
-}
-
-void
-out_2_rgb()
-{
-
-  libspectrum_byte *bitmap, *attr;
-  int i, w, idx;
-  int R, G, B;
-  int x = frm_slice_x, y = frm_slice_y, h = frm_slice_h;
-  int inv = ( frame_no * frm_rte % 32 ) > 15 ? 1 : 0;
-
-  w = frm_slice_w;
-  for( h = frm_slice_h; h > 0; h--, y++, w = frm_slice_w ) {
-    if( scr_t != TYPE_HRE )
-      idx = y * OUT_PITCH + x * 8 ;		/* 8pixel/data */
-    else
-      idx = y * OUT_PITCH * 2 + x * 16 ;	/* 16 pixel/data*/
-
-    idx *= 3;
-
-    bitmap = &zxscr[SCR_PITCH * y + x];
-    attr   = &attrs[SCR_PITCH * y + x];
-    for( ; w > 0; w--, bitmap++, attr++ ) {
-      int px, fx, ix = *attr;
-      int bits = scr_t == TYPE_HRE ? ( *bitmap << 8 ) + *(bitmap + 9600) : *bitmap;
-
-      fx = ( ix & 0x80 ) * inv;
-      px = ( ( ix & 0x38 ) >> 3 ) + ( ( ix & 0x40 ) ? 8 : 0 );
-      ix = ( ix & 0x07 ) + ( ( ix & 0x40 ) ? 8 : 0 );
-      for( i = scr_t == TYPE_HRE ? 16 : 8; i > 0; i-- ) {
-        if( ( bits ^ fx ) & 128 ) {	/* ink */
-          R = rgb_pal[ ix * 3 + 0 ];
-          G = rgb_pal[ ix * 3 + 1 ];
-          B = rgb_pal[ ix * 3 + 2 ];
-        } else {			/* paper */
-          R = rgb_pal[ px * 3 + 0 ];
-          G = rgb_pal[ px * 3 + 1 ];
-          B = rgb_pal[ px * 3 + 2 ];
-        }
-        pix_rgb[idx++] = R;
-        pix_rgb[idx++] = G;
-        pix_rgb[idx++] = B;
-        bits <<= 1;
-      }
-    }
-  }
-}
-
-int
-out_write_frame()
-{
-  int err;
-  int add_frame = 0;
-  int n = -frm_fps / inp_fps;
-
-  if( frm_fps > 0 ) {
-    drop_no++;
-    printi( 2, "out_write_frame(): drop this frame.\n" );
-  }
-
-  if( cut_cmd != TYPE_NONE ) {
-    if( cut_cmd == TYPE_CUT && ( cut_t_t == TYPE_FRAME ? frame_no > cut__to : time_sec > cut__to ) )
-      inp_get_next_cut();
-    if( ( cut_f_t == TYPE_FRAME ? frame_no >= cut_frm : time_sec >= cut_frm ) &&
-	( cut_cmd == TYPE_CUTFROM || ( cut_t_t == TYPE_FRAME ? frame_no <= cut__to : time_sec <= cut__to ) ) ) {
-      drop_no++;
-      printi( 2, "out_write_frame(): cut this frame.\n" );
-      return 0;
-    }
-  }
-
-  while( frm_fps <= 0 ) {
-    if( n > 1 ) {		/* we have to add sound in more part */
-    } else {
-      snd_write_sound();
-    }
-    if( add_frame ) {
-      printi( 2, "out_write_frame(): add this frame again.\n" );
-      dupl_no++;
-    } else {
-      printi( 2, "out_write_frame(): add frame.\n" );
-      add_frame = 1;
-    }
-    if( out_t == TYPE_YUV ) {
-      if( ( err = out_write_yuv() ) ) return err;
-#ifdef USE_FFMPEG
-    } else if( out_t == TYPE_FFMPEG ) {
-      if( ( err = out_write_ffmpeg() ) ) return err;
-#endif
-    } else if( out_t == TYPE_SCR ) {
-      if( ( err = out_write_scr() ) ) return err;
-    } else if( out_t == TYPE_PPM ) {
-      if( ( err = out_write_ppm() ) ) return err;
-    }
-    frm_fps += inp_fps;
-    output_no++;
-    if( ( out_t >= TYPE_SCR && out_t <= TYPE_JPEG ) ) {
-      close_out();
-      open_out();
-    }
-  }
-  frm_fps -= out_fps;
-
-  return 0;
-}
-
-void
-close_out()
-{
-#ifdef USE_FFMPEG
-  if( out_t == TYPE_FFMPEG )
-    out_finalize_ffmpeg();
-#endif
-
-  if( !out ) return;
-  fclose( out );
-  out = NULL;
-}
-
-
-int
-prepare_next_file()		/* multiple input file */
-{
-  if( input_no > input_last_no )
-    do_now = DO_EOP;		/* no more file */
-  else
-    input_no++;
-  return 0;
-}
-
-void
-print_help ()
-{
-  printf ("\n"
-	  "Usage: fmfconv [options] [infile [outfile [soundfile]]]\n"
-	  "\n"
-	  "Options:\n"
-	  "\n"
-	  "  -i --input <filename>        Input file\n"
-	  "  -o --output <filename>       Output file\n"
-	  "  -s --sound <filename>        Output sound file\n"
-	  "     --raw-sound               Do not convert sound to 16 bit signed PCM\n"
-	  "  -w --wav                     Save sound to Microsoft audio (wav) file\n"
-	  "  -u --au                      Save sound to Sun Audio (au) file\n"
-	  "  -m --aiff                    Save sound to Apple Computer audio (aiff/aiff-c) file\n"
-	  "     --aifc                    Force AIFF-C output if sound format is AIFF\n"
-	  "     --sound-only              Process only the sound from an 'fmf' file\n"
-	  "  -Y --yuv                     Save video as yuv4mpeg2.\n"
-	  "     --yuv-format <frm>        Set yuv4mpeg2 file frame format to 'frm',\n"
-	  "                                 where 'frm' is one of '444', '422',\n"
-	  "                                 '420j', '420m', '420' or '410'.\n"
-	  "  -S --scr                     Save video as SCR screenshots\n"
-	  "  -P --ppm                     Save video as PPM screenshots\n"
-	  "  -f --frate <timing>          Set output frame rate. 'timing' is 'pal',\n"
-	  "                                 'ntsc', 'movie' or a number with maximum\n"
-	  "                                 3 digit after decimal point, or a #/#\n"
-	  "                                 (e.g.: -f 29.97 or -f 30000/1001)\n"
-	  "  -g --progress <form>         Show progress, where <form> is one of '%%', 'bar'\n"
-	  "                                 'frame' or 'time'. frame and time similar to bar\n"
-	  "                                 just show movie seconds or frame number too.\n"
-	  "  -C --out-cut <cut>           Leave out the comma delimited 'cut' ranges\n"
-	  "                                 e.g.: 100-200,300,500,1:11-2:22 cut the frames\n"
-	  "                                 100-200, 300, 500 and frames from 1min 11sec to\n"
-	  "                                 2min 22sec (in the given timing see:\n"
-	  "                                 -f/--frate\n"
-#ifdef USE_FFMPEG
-	  "  -X --ffmpeg                  Save video and audio as FFMPEG file (default)\n"
-	  "  -p --profile <profile>       Select profile for FFMPEG output where <profile> is\n"
-	  "                                 'youtube', 'dvd' or 'ipod'\n"
-	  "  -F --format <format>         Select file format for FFMPEG output (by default\n"
-	  "                                 filename extension used to determine)\n"
-	  "  -c --vcodec <codec>          Select video codec for FFMPEG output (by default\n"
-	  "                                 file format determine)\n"
-	  "  -a --acodec <codec>          Select audio codec for FFMPEG output (by default\n"
-	  "                                 file format determine)\n"
-	  "  -A --arate <rate>            Select audio bitrate for FFMPEG output (by default\n"
-	  "                                 audio codec determine) where <rate> is 'default'\n"
-	  "                                 or a number\n"
-	  "  -r --vrate <rate>            Select video bitrate for FFMPEG output (by default\n"
-	  "                                 video codec determine) where <rate> is 'default'\n"
-	  "                                 or 'ffdefault' or a number\n"
-	  "  -R --resize <res>            Resize video frame where <res> is 'vga' for 640x480,\n"
-	  "                                 'hvga' for 480x360, 'qvga' for 320x240, 'pal' for\n"
-	  "                                 768x576 (this set frame rate to 25 also) or\n"
-	  "                                 WxH, Sx, N/Mx or W\n"
-	  "  -E --srate <rate>            Resample audio to <rate> sampling rate where <rate> is\n"
-	  "                                 'cd' for 44100 or 'dat' for 48000 or a number.\n"
-	  "                                 ('cd' and 'dat' set 'stereo' also)\n"
-	  "     --mono                    Convert sound to mono\n"
-	  "     --stereo                  Convert sound to stereo\n"
-	  "     --formats                 List available FFMPEG formats (see -F/--format)\n"
-	  "     --vcodecs                 List available FFMPEG video codecs (see -c/--vcodec)\n"
-	  "     --acodecs                 List available FFMPEG audio codecs (see -a/--acodec)\n"
-#endif
-	  "     --info                    Scan input file(s) an print information.\n"
-	  "  -v --verbose                 Increase the verbosity level by one.\n"
-	  "  -q --quiet                   Decrease the verbosity level by one.\n"
-	  "  -V --version                 Print the version number and exit.\n"
-	  "  -h --help                    Print this help\n\n"
-  );
-}
-
-void
-print_progress( int force )
-{
-  static long int fpos = 0;
-  long int npos;
-  int perc;
-  static int last_perc = -1;
-  char *bar = "##############################################################################";
-  char *spc = "                                                                              ";
-
-  if( !inp_ftell ) return;
-
-  npos = ftell( inp );
-  if( npos <= fpos ) return;
-
-  perc = (long long int)npos * 1009 / inp_ftell / 10;
-
-  if( !force && last_perc == perc ) return;
-  if( perc > 100 ) perc = 100;
-
-  if( prg_t == TYPE_PERC )
-    fprintf( stderr, "Percent: %4d%%\r", perc );
-  else if( prg_t == TYPE_BAR )
-    fprintf( stderr, "[%s%s]\r", bar + 78 - 78 * perc / 100, spc + 78 * perc / 100 );
-  else if( prg_t == TYPE_FRAME )
-    fprintf( stderr, "[%s%s]%8llu\r", bar + 78 - 70 * perc / 100, spc + 8 + 70 * perc / 100, frame_no );
-  else if( prg_t == TYPE_TIME )
-    fprintf( stderr, "[%s%s]%8llu\r", bar + 78 - 70 * perc / 100, spc + 8 + 70 * perc / 100, time_sec );
-  last_perc = perc;
-}
-
-int
-parse_args( int argc, char *argv[] )
-{
-  struct option long_options[] = {
-    {"input", 1, NULL, 'i'},
-    {"output", 1, NULL, 'o'},
-    {"sound", 1, NULL, 's'},
-/*
-    {"no-video", 0, &sound_only, 1},
-    {"no-sound", 0, &video_only, 1},
-*/
-    {"wav",    0, NULL, 'w'},		/* save .wav sound */
-    {"au",     0, NULL, 'u'},		/* save .au sound */
-    {"aiff",   0, NULL, 'm'},		/* save .aiff sound */
-    {"aifc",   0, NULL, 0x102},		/* force aifc */
-
-    {"raw-sound",0, &sound_pcm, 0},		/* do not convert fmf sound to PCM_S16LE */
-/*
-    {"simple-height", 0, &simple_height, 1},
-    {"no-aspect", 0, &simple_height, -1},
-*/
-    {"scr",    0, NULL, 'S'},		/* extract as SCR */
-    {"ppm",    0, NULL, 'P'},		/* extract as PPM */
-    {"yuv",    0, NULL, 'Y'},		/* YUV output */
-    {"yuv-format", 1, NULL, 0x101},
-    {"frate",  1, NULL, 'f'},		/* video frame rate */
-    {"progress",1,NULL, 'g'},		/* progress 'bar' */
-    {"cut",    1, NULL, 'C'},		/*TODO cut */
-#ifdef USE_FFMPEG
-    {"ffmpeg", 0, NULL, 'X'},		/* select FFMPEG output */
-    {"profile",1 ,NULL, 'p'},		/* output profile */
-    {"format", 1, NULL, 'F'},		/* file format */
-    {"acodec", 1, NULL, 'a'},		/* audio codec */
-    {"vcodec", 1, NULL, 'c'},		/* video codec */
-    {"arate",  1, NULL, 'A'},		/* audio bitrate */
-    {"vrate",  1, NULL, 'r'},		/* video bitrate */
-    {"resize", 1, NULL, 'R'},		/* resize video */
-    {"srate",  1, NULL, 'E'},		/* audio new samplerate cd/dat set 'stereo' also */
-    {"stereo", 0, &out_chn, 2},		/* set stereo */
-    {"mono",   0, &out_chn, 1},		/* set mono */
-    {"formats",0, &ffmpeg_list, 0},	/* list formats */
-    {"acodecs",0, &ffmpeg_list, 1},	/* list formats */
-    {"vcodecs",0, &ffmpeg_list, 2},	/* list formats */
-#endif
-    {"info", 0, &do_info, 1},
-
-    {"help", 0, NULL, 'h'},
-    {"version", 0, NULL, 'V'},
-    {"verbose", 0, NULL, 'v'},
-    {"quiet", 0, NULL, 'q'},
-    {0, 0, 0, 0}		/* End marker: DO NOT REMOVE */
-  };
-
-/*
-  atexit( &cleanup );
-*/
-
-  while( 1 ) {
-    int  c;
-    char t;
-    int  i;
-
-    c = getopt_long (argc, argv, "i:o:s:f:g:C:wumSPY"
-#ifdef USE_FFMPEG
-				"p:F:a:c:A:r:R:E:X"
-#endif
-				"hVvq", long_options, NULL);
-
-    if( c == -1 )
-      break;			/* End of option list */
-
-    switch( c ) {
-    case 0:
-      break;		/* Used for long option returns */
-    case 'i':
-      inp_name = optarg;	/* strdup( optarg ); ?? */
-      break;
-    case 'o':
-      out_name = optarg;	/* strdup( optarg ); ?? */
-      break;
-    case 's':
-      snd_name = optarg;	/* strdup( optarg ); ?? */
-      break;
-    case 'w':
-      snd_t = TYPE_WAV;	/* audio container WAV */
-      break;
-    case 'u':
-      snd_t = TYPE_AU;		/* audio container AU */
-      break;
-    case 'm':
-      snd_t = TYPE_AIFF;	/* audio container AIFF */
-      break;
-    case 0x102:
-      force_aifc = 1;
-      break;
-    case 'S':		/* SCR output */
-      out_t = TYPE_SCR;
-      break;
-    case 'P':		/* PPM  output */
-      out_t = TYPE_PPM;
-      break;
-    case 'Y':		/* YUV output */
-      out_t = TYPE_YUV;
-      break;
-    case 0x101:		/* YUV FORMAT */
-      if( !strcmp( optarg, "444" ) )
-        yuv_t = TYPE_444;
-      else if( !strcmp( optarg, "422" ) )
-        yuv_t = TYPE_422;
-      else if( !strcmp( optarg, "420j" ) ||
-		!strcmp( optarg, "420jpeg" ) || !strcmp( optarg, "420mpeg1" ) )
-        yuv_t = TYPE_420J;
-      else if( !strcmp( optarg, "420m" ) || !strcmp( optarg, "420mpeg2" ) )
-        yuv_t = TYPE_420M;
-      else if( !strcmp( optarg, "420" ) )
-        yuv_t = TYPE_420;
-/*
-      else if( !strcmp( optarg, "410" ) )
-        yuv_t = TYPE_410;
-*/
-      else {
-	printe( "Bad value for --yuv-format ...\n");
-	return ERR_BAD_PARAM;
-      }
-
-	break;
-    case 'f':				/* output frame rate */
-      if( !strcmp( optarg, "pal" ) )
-	out_fps = 25000;	/* 25.000 1/s */
-      else if( !strcmp( optarg, "ntsc" ) )
-	out_fps = 29970;	/* 29.970 1/s */
-      else if( !strcmp( optarg, "movie" ) )
-	out_fps = 24000;	/* 24.000 1/s */
-      else if( sscanf( optarg, "%d.%1d%c", &out_fps, &i, &t ) == 2 )
-	out_fps = out_fps * 1000 + i * 100;
-      else if( sscanf( optarg, "%d.%2d%c", &out_fps, &i, &t ) == 2 )
-	out_fps = out_fps * 1000 + i * 10;
-      else if( sscanf( optarg, "%d.%3d%c", &out_fps, &i, &t ) == 2 )
-	out_fps = out_fps * 1000 + i;
-      else if( sscanf( optarg, "%d/%d%c", &out_fps, &i, &t ) == 2 )
-	out_fps = out_fps * 1000 / i;
-      else if( sscanf( optarg, "%d%c", &out_fps, &t ) == 1 )
-	out_fps *= 1000;
-      else {
-	printe( "Unknow value for '-f/--frate' ...\n");
-	return ERR_BAD_PARAM;
-      }
-      if( out_fps < 1 ) {
-	printe( "Bad value for '-f/--frate' ...\n");
-	return ERR_BAD_PARAM;
-      }
-      break;
-    case 'C':
-	out_cut = optarg;
-	inp_get_next_cut();
-	break;
-#ifdef USE_FFMPEG
-    case 'X':		/* FFMPEG output */
-      out_t = TYPE_FFMPEG;
-      snd_t = TYPE_FFMPEG;
-      break;
-    case 'p':		/* profile */
-      if( !strcmp( optarg, "youtube" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 480; out_h = 360; out_fps = 25000;
-	ffmpeg_format = "mov"; ffmpeg_arate = 128000; ffmpeg_vrate = 600000;
-      } else if( !strcmp( optarg, "dvd" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 720; out_h = 576; out_fps = 25000;
-	ffmpeg_format = "vob"; ffmpeg_arate = 192000; ffmpeg_vrate = 5000000;
-	ffmpeg_aspect.num = 48; ffmpeg_aspect.den = 45;
-	out_rte = 48000; out_chn = 2;
-      } else if( !strcmp( optarg, "svcd" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 480; out_h = 576; out_fps = 25000;
-	ffmpeg_format = "svcd"; ffmpeg_arate = 192000; ffmpeg_vrate = 2600000;
-	ffmpeg_aspect.num = 48; ffmpeg_aspect.den = 45;
-	out_rte = 48000; out_chn = 2;
-      } else if( !strcmp( optarg, "ipod" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 320; out_h = 240; out_fps = 30000;
-	ffmpeg_acodec = "aac"; ffmpeg_vcodec = "libx264";
-	ffmpeg_format = "ipod"; ffmpeg_arate = 128000;ffmpeg_vrate = 256000;
-	out_rte = 44100; out_chn = 2; ffmpeg_libx264 = 1;
-      } else {
-	printe( "Unknow value for '-p/--profile' ...\n");
-	return ERR_BAD_PARAM;
-      }
-	break;
-    case 'F':
-      ffmpeg_format = optarg;
-      break;
-    case 'a':
-      ffmpeg_acodec = optarg;
-      break;
-    case 'c':
-      ffmpeg_vcodec = optarg;
-      break;
-    case 'A':
-      if( !strcmp( optarg, "default" ) )
-        ffmpeg_arate = 0;
-      else
-        ffmpeg_arate = atoi( optarg );
-      break;
-    case 'r':
-      if( !strcmp( optarg, "default" ) )
-        ffmpeg_vrate = 0;
-      else if( !strcmp( optarg, "ffdefault" ) )
-        ffmpeg_vrate = -1;
-      else
-        ffmpeg_vrate = atoi( optarg );
-      break;
-    case 'R':
-      if( !strcmp( optarg, "vga" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 640; out_h = 320;
-      } else if( !strcmp( optarg, "hvga" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 480; out_h = 360;
-      } else if( !strcmp( optarg, "qvga" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 320; out_h = 240;
-      } else if( !strcmp( optarg, "pal" ) ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_w = 768; out_h = 576; out_fps = 25000;
-      } else if( sscanf( optarg, "%dx%d%c", &out_w, &out_h, &t ) == 2 ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-      } else if( sscanf( optarg, "%d/%d%c%c", &out_w, &out_h, &t, &t ) == 3 && t == 'x' ) {
-	ffmpeg_rescale = TYPE_RESCALE_X;
-      } else if( sscanf( optarg, "%d%c%c", &out_w, &t, &t ) == 2 && t == 'x' ) {
-	ffmpeg_rescale = TYPE_RESCALE_X, out_h = 1;
-      } else if( sscanf( optarg, "%d%c", &out_w, &t ) == 1 ) {
-	ffmpeg_rescale = TYPE_RESCALE_WH;
-	out_h = out_w * 3 / 4;
-      } else {
-	printe( "Unknow value for '-R/--resize' ...\n");
-	return ERR_BAD_PARAM;
-      }
-      break;
-    case 'E':
-      if( !strcmp( optarg, "cd" ) )
-        out_rte = 44100, out_chn = 2;
-      else if( !strcmp( optarg, "dat" ) )
-        out_rte = 48000, out_chn = 2;
-      else
-        out_rte = atoi( optarg );
-
-      if( out_rte < 1000 ) {
-	printe( "Wrong value for '-E/--srate' ...\n");
-	return ERR_BAD_PARAM;
-      }
-      break;
-#endif
-    case 'h':
-	print_help();
-#ifdef USE_FFMPEG
-	ffmpeg_list = 99;
-#endif
-	break;
-    case 'V':
-	break;
-    case 'v':
-	if( verbose < VERBOSE_MAX )
-	  verbose++;
-	break;
-    case 'q':
-      if( verbose > VERBOSE_MIN )
-	verbose--;
-      break;
-    case 'g':		/* progress 'bar' */
-      if( !strcmp( optarg, "%" ) )
-        prg_t = TYPE_PERC;
-      else if( !strcmp( optarg, "bar" ) )
-        prg_t = TYPE_BAR;
-      else if( !strcmp( optarg, "frame" ) )
-        prg_t = TYPE_FRAME;
-      else if( !strcmp( optarg, "time" ) )
-        prg_t = TYPE_TIME;
-      break;
-    case ':':
-    case '?':
-      break;
-
-    default:
-      printe ("%s: getopt_long returned `%c'\n",
-		  "scrconv", (char) c);
-      break;
-
-    }
-  }
-
-  if( optind < argc )
-    inp_name = argv[optind++];
-  if( optind < argc )
-    out_name = argv[optind++];
-  if( optind < argc )
-    snd_name = argv[optind++];
-  if( optind < argc ) {
-    printe ("Too many filename...\n");
-    return ERR_BAD_PARAM;
-  }
-  return 0;
-}
-
-int
-main( int argc, char *argv[] )
-{
-  int err, eop = 0;
-
-  if( ( err = parse_args( argc, argv ) ) ) return err;
-#ifdef USE_FFMPEG
-  if( ffmpeg_list >= 99 ) return 0;
-  if( ffmpeg_list >= 0 ) {
-    ffmpeg_list_ffmpeg( ffmpeg_list );
-    return 0;
-  }
-#endif
-  if( do_info ) {
-    snd_t = TYPE_NONE;
-    out_t = TYPE_NONE;
-    if( verbose < 1 ) verbose = 1;
-  }
-  if( ( err = open_out() ) ) return err;
-  if( ( err = open_snd() ) ) return err;
-
-  if( snd_t == TYPE_UNSET && out_t == TYPE_FFMPEG ) {
-    snd_t = TYPE_FFMPEG;
-    sound_pcm = 1;			/* ffmpeg always use PCM sound */
-  }
-
-#ifdef USE_ZLIB
-  zstream.zalloc = Z_NULL;
-  zstream.zfree = Z_NULL;
-  zstream.opaque = Z_NULL;
-  zstream.avail_in = 0;
-  zstream.next_in = Z_NULL;
-  inflateInit( &zstream );
-  zstream.avail_out = ZBUF_SIZE;
-#endif	/* USE_ZLIB */
-
-  while( !eop ) {
-    switch ( do_now ) {
-    case DO_FILE:
-      if( ( err = prepare_next_file() ) ) eop = 1;	/* if we read from multiple file... */
-      if( do_now != DO_EOP && ( err = open_inp() ) ) eop = 1;		/* open (next) input file */
-      break;
-    case DO_HEAD:					/* read (next) file header */
-      if( ( err = fmf_read_head() ) ) eop = 1;
-#ifdef USE_FFMPEG
-      if( out_t == TYPE_FFMPEG && !out_header_ok && ( err = out_write_ffmpegheader() ) ) return err;
-#endif
-      break;
-    case DO_FRAME_HEAD:
-      if( ( err = fmf_read_frame_head() ) ) eop = 1;	/* after finish a frame read next settings */
-      break;
-    case DO_SLICE:					/* read next fmf slice or 'N' or 'S' or 'X' */
-      if( inp_t == TYPE_FMF ) {
-        if( ( err = fmf_read_slice() ) ) eop = 1;
-      } else {						/* read SCR file */
-        if( ( err = scr_read_scr() ) ) eop = 1;
-      }
-      if( out_t != TYPE_NONE ) {			/* convert slice to RGB or YUV if needed */
-        if( out_t >= TYPE_YUV )
-          out_2_yuv();
-        else if( out_t >= TYPE_PPM )
-          out_2_rgb();
-      }
-      break;
-    case DO_SOUND:
-    case DO_SOUND_FLUSH:
-      if( snd_t != TYPE_NONE && ( err = snd_write_sound() ) ) eop = 1;
-      if( do_info ) snd_len = 0;			/* anyhow, we have to empty sound buffer */
-      if( do_now == DO_SOUND_FLUSH ) fmf_read_sound();
-      do_now = DO_SLICE;
-      break;
-    case DO_FRAME:
-      if( out_t != TYPE_NONE ) {
-        out_write_frame();
-      }
-    case DO_LAST_FRAME:
-      if( inp_t == TYPE_FMF ) {
-        if( do_now == DO_LAST_FRAME ) {
-          fread_buff( fhead, 1, INTO_BUFF );	/* check concatenation */
-          if( feof_compr( inp ) )
-            do_now = DO_FILE;
-          else
-            do_now = DO_HEAD;
-        } else {
-          do_now = DO_FRAME_HEAD;
-        }
-      } else {
-        do_now = DO_FILE;
-      }
-      break;
-    case DO_EOP:
-    default:
-      eop = 1;
-      break;
-    }
-    if( prg_t != TYPE_NONE && frame_no % 11 == 0 ) print_progress( 0 );
-  }
-  if( prg_t != TYPE_NONE ) print_progress( 1 ); /* update progress */
-  if( ( out_t >= TYPE_SCR && out_t <= TYPE_JPEG ) && out_name ) unlink( out_name );
-  close_snd();				/* close snd file */
-  close_out();				/* close out file */
-  if( prg_t != TYPE_NONE ) fprintf( stderr, "\n" );
-  printi( 0, "main(): read %llu frame (%llusec) and %llu fmf slice and %llu fmf sound chunk\n",
-		frame_no, time_sec, fmf_slice_no, fmf_sound_no );
-  if( !do_info )
-    printi( 0, "main(): wrote %llu frame dropped %llu frame and inserted %llu frame\n",
-		output_no, drop_no, dupl_no );
-
-#ifdef USE_ZLIB
-  inflateEnd( &zstream );
-#endif	/* USE_ZLIB */
-
-  return 0;
-}

Deleted: branches/fmfx-2010-09-14/fuse/fmfconv.h
===================================================================
--- branches/fmfx-2010-09-14/fuse/fmfconv.h	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/fmfconv.h	2010-10-05 11:20:02 UTC (rev 4174)
@@ -1,183 +0,0 @@
-/* fmfconv.h: Convert .fmf movie files
-   Copyright (c) 2004-2005 Gergely Szasz
-
-   $Id: fmfconv.h,v 1.2 2010/09/27 11:44:50 gergely 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: szaszg@...
-
-*/
-
-#ifdef USE_FFMPEG
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-#endif
-
-#define printe(format...) \
-    fprintf (stderr, "*ERR " format)
-
-#define printw(format...) \
-    fprintf (stderr, "*WRN " format)
-
-#define printi(lvl,format...) \
-    if( lvl <= verbose ) fprintf( stderr, "*INF " format )
-
-enum {
-  ERR_OPEN_INP = 1,
-  ERR_OPEN_OUT,
-  ERR_OPEN_SND,
-  ERR_CORRUPT_INP,
-  ERR_VERSION_INP,
-  ERR_NO_ZLIB,
-  ERR_ENDOFFILE,
-  ERR_OUTOFMEM,
-  ERR_CORRUPT_SND,
-  ERR_BAD_PARAM,
-  ERR_WRITE_OUT,
-  ERR_WRITE_SND,
-};
-
-
-typedef enum {
-  TYPE_UNSET = -1,
-
-  TYPE_NONE = 0,
-
-  TYPE_FMF,	/* i */
-
-  TYPE_SCR,	/* io (no conv) */
-
-  TYPE_PPM,	/* o (conv to RGB) */
-  TYPE_PNG,
-  TYPE_JPEG,
-
-  TYPE_YUV,	/* o (conv to YUV) */
-  TYPE_FFMPEG,	/* os */
-
-  TYPE_WAV,	/* s */
-  TYPE_AU,	/* s */
-  TYPE_AIFF,	/* s */
-
-  TYPE_444,
-  TYPE_422,
-  TYPE_420J,
-  TYPE_420M,
-  TYPE_420,
-  TYPE_410,
-
-  TYPE_RESCALE_WH,
-  TYPE_RESCALE_X,
-
-  TYPE_PERC,
-  TYPE_BAR,
-  TYPE_FRAME,
-  TYPE_TIME,
-
-  TYPE_NOCUT,
-  TYPE_CUTFROM,
-  TYPE_CUT,
-
-  TYPE_ZXS = '$',	/* screen type $ -> normal Spectrum */
-  TYPE_TXS = 'X',	/* X -> Timex normal */
-  TYPE_HRE = 'R',	/* R -> Timex HighRes */
-  TYPE_HCO = 'C',	/* C -> Timex HiColor */
-
-  TYPE_PCM = 'P',	/* 16 bit signed PCM */
-  TYPE_ALW = 'A',	/* 8 bit signed A-Law */
-  TYPE_ULW = 'U',	/* 8 bit signed u-Law */
-
-  TYPE_MONO= 'M',
-  TYPE_STEREO='S',
-
-
-} type_t;
-
-extern int verbose;
-
-extern FILE *out, *snd;
-
-extern int frm_slice_x, frm_slice_y, frm_slice_w, frm_slice_h;
-extern int frm_w, frm_h;
-extern int frm_fps, frm_mch;
-
-extern type_t scr_t, yuv_t, out_t, snd_t;
-
-extern char *out_name;
-extern int out_w, out_h;
-extern int out_fps;			/* desired output frame rate */
-extern int out_header_ok;			/* output header ok? */
-
-extern int out_chn, out_rte, out_fsz, out_len;
-
-extern libspectrum_signed_byte *sound8;	/* sound buffer for x-law */
-extern libspectrum_signed_word *sound16;	/* sound buffer for pcm */
-
-extern type_t snd_enc;				/* sound type (pcm/alaw/ulaw) */
-extern int snd_rte, snd_chn, snd_fsz, snd_len;	/* sound rate (Hz), sound channels (1/2), sound length in byte  */
-extern int snd_header_ok;			/* sound header ok? */
-extern int snd_little_endian;
-
-extern libspectrum_byte zxscr[];		/* 2x 40x240 bitmap1 bitmap2 */
-extern libspectrum_byte attrs[];		/* 40x240 attrib */
-extern libspectrum_byte pix_rgb[];		/* other view of data */
-extern libspectrum_byte *pix_yuv[];		/* other view of data */
-extern int yuv_ylen, yuv_uvlen;
-extern int machine_timing[];
-
-extern int force_aifc;			/* record aifc file even PCM sound */
-
-libspectrum_dword swap_endian_dword( libspectrum_dword d );
-void pcm_swap_endian( void );	/* buff == sound */
-
-int out_write_yuv( void );
-
-int out_write_scr( void );
-int out_write_ppm( void );
-
-int snd_write_wav( void );
-void snd_finalize_wav( void );
-
-int snd_write_au( void );
-void snd_finalize_au( void );
-
-int snd_write_aiff( void );
-void snd_finalize_aiff( void );
-
-#ifdef USE_FFMPEG
-extern int ffmpeg_arate;		/* audio bitrate */
-extern int ffmpeg_vrate;		/* video bitrate */
-extern AVRational ffmpeg_aspect;
-extern int ffmpeg_libx264;
-extern char *ffmpeg_frate;
-extern char *ffmpeg_format;
-extern char *ffmpeg_vcodec;
-extern char *ffmpeg_acodec;
-extern type_t ffmpeg_rescale;
-extern int ffmpeg_list;
-
-int snd_write_ffmpeg( void );
-int out_write_ffmpegheader( void );
-int out_write_ffmpeg( void );
-void out_finalize_ffmpeg( void );
-
-int ffmpeg_resample_audio( void );
-int ffmpeg_rescale_video( void );
-
-void ffmpeg_list_ffmpeg( int what );
-
-#endif

Deleted: branches/fmfx-2010-09-14/fuse/fmfconv_aiff.c
===================================================================
--- branches/fmfx-2010-09-14/fuse/fmfconv_aiff.c	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/fmfconv_aiff.c	2010-10-05 11:20:02 UTC (rev 4174)
@@ -1,186 +0,0 @@
-/* fmfconv_aiff.c: aiff output routine included into fmfconv.c
-   Copyright (c) 2010 Gergely Szasz
-
-   $Id: $
-
-   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: szaszg@...
-
-*/
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "libspectrum.h"
-#include "fmfconv.h"
-
-
-/*
-Byte order: Big-endian
-
-Offset   Length   Contents
-  0      4 bytes  "FORM"
-  4      4 bytes  <File length - 8>
-  8      4 bytes  "AIFF"
-
- 12      4 bytes  "COMM"
- 16      4 bytes  <Length of the COMM data> // (=18)
- 20      2 bytes  <Channels>     // Channels: 1 = mono, 2 = stereo
- 22      4 bytes  <No of frames>
- 26      2 bytes  <bits/sample>  // 8 or 16
- 36     10 bytes  <Frame rate>  // Frameses per second: e.g., 44100
-.................................................... PCM
- 38      4 bytes  "SSND"
- 42      4 bytes  <No of bytes - 46>
- 46      4 bytes  <Offset>	// (=0)
- 50      4 bytes  <Block>	// (=0)
- 54     (n)bytes  <Sample data>
-..................................................... Law!!!
-
-
-AIFF 80bit FLOAT
-
-if exp = 16383 --> *2^0
-[sign1][exp15][1][mant63]
-0 exp-16383
-*/
-#define AIFF_POS_FILELEN  4L
-#define AIFF_POS_NOFRAME 22L
-#define AIFF_POS_SSNDLEN 42L
-
-#define AIFF_POS_SSNCLEN 62L
-
-int force_aifc = 0;			/* record aifc file even PCM sound */
-static int aifc = 0;
-
-/* save float to head[0..9] */
-static void
-aiff_int_2_80bitfloat( libspectrum_byte head[], libspectrum_word num )
-{
-  uint64_t frac = num;
-  uint64_t max = (uint64_t)1 << 63;
-  uint16_t exp = 16382;
-
-  if( num < 1 ) return;
-
-  while( frac < max ) {
-    frac <<= 1;
-  }
-  while( num ) {
-    exp++;
-    num >>= 1;
-  }
-  head[0] = exp >> 8;              head[1] = exp & 0xff;
-  head[2] = frac >> 56;            head[3] = ( frac >> 48 ) & 0xff;
-  head[4] = ( frac >> 40 ) & 0xff; head[5] = ( frac >> 32 ) & 0xff;
-  head[6] = ( frac >> 24 ) & 0xff; head[7] = ( frac >> 16 ) & 0xff;
-  head[8] = ( frac >>  8 ) & 0xff; head[9] = frac & 0xff;
-}
-
-int
-snd_write_aiffheader()
-{
-  libspectrum_byte buff[10];
-
-  if( force_aifc || snd_enc != TYPE_PCM ) aifc = 1;		/* AIFF or AIFC */
-
-  if( aifc )
-    fwrite( "FORM\377\377\377\377AIFCCOMM\000\000\000\046", 20, 1, snd );
-  else
-    fwrite( "FORM\377\377\377\377AIFFCOMM\000\000\000\022", 20, 1, snd );
-
-  if( snd_chn == 2 )
-    fwrite( "\000\002", 2, 1, snd );			/* Stereo */
-  else
-    fwrite( "\000\001", 2, 1, snd );			/* Mono */
-
-  fwrite( "\377\377\377\377", 4, 1, snd );			/* Stereo */
-  if( snd_enc == TYPE_PCM )
-    fwrite( "\000\020", 2, 1, snd );/* 16 bit/ sample */
-  else
-    fwrite( "\000\010", 2, 1, snd );/* 8 bit/ sample */
-
-  aiff_int_2_80bitfloat( buff, out_rte );
-  fwrite( buff, 10, 1, snd );			/* sampling rate in Hz */
-
-/* NONE not compressed.
-   ulaw uLaw 2:1.......
-   alaw aLaw 2:1....... */
-  if( aifc ) {
-    if( snd_enc == TYPE_PCM )
-      fwrite( "NONE\020not compressed ", 20, 1, snd );	/* PCM */
-    else if( snd_enc == TYPE_ALW )
-      fwrite( "alaw\020aLaw 2:1       ", 20, 1, snd );	/* A-Law */
-    else
-      fwrite( "ulaw\020uLaw 2:1       ", 20, 1, snd );	/* u-Law */
-  }
-
-  fwrite( "SSND\377\377\377\377\000\000\000\000\000\000\000\000", 16, 1, snd );/* data Chunk header */
-  snd_header_ok = 1;
-  printi( 1, "snd_write_aif%cheader(): %dHz %c encoded %s\n", aifc ? 'c' : 'f', snd_rte, snd_enc,
-		 snd_chn == 2 ? "stereo" : "mono" );
-  return 0;
-}
-
-int
-snd_write_aiff()
-{
-  int err;
-
-  if( !snd_header_ok && ( err = snd_write_aiffheader() ) ) return err;
-  if( snd_enc == TYPE_PCM && snd_little_endian ) {	/* we have to swap all sample */
-    pcm_swap_endian();
-  }
-
-  if( fwrite( sound8, snd_len, 1, snd ) != 1 ) return ERR_WRITE_SND;
-  printi( 2, "snd_write_aif%c(): %d samples (%d bytes) sound\n", aifc ? 'c' : 'f', snd_len/snd_fsz, snd_len );
-
-  return 0;
-}
-
-void
-snd_finalize_aiff()
-{
-  libspectrum_byte buff[4];
-  long pos = ftell( snd );
-  long dsz = pos;
-
-  if( fseek( snd, AIFF_POS_FILELEN, SEEK_SET ) == -1 ) {
-    printw( "snd_finalize_aif%c(): cannot finalize sound output file (not seekable).\n", aifc ? 'c' : 'f' );
-  } else {
-    pos -= 8;
-    buff[3] = pos & 0xff;           buff[2] = ( pos >> 8 ) & 0xff;
-    buff[1] = ( pos >> 16 ) & 0xff; buff[0] = pos >> 24;
-    fwrite( buff, 4, 1, snd );			/* set file length - 8 */
-
-    fseek( snd, aifc ? AIFF_POS_SSNCLEN : AIFF_POS_SSNDLEN, SEEK_SET );
-    pos -= aifc ? 52 : 32;
-    buff[3] = pos & 0xff;           buff[2] = ( pos >> 8 ) & 0xff;
-    buff[1] = ( pos >> 16 ) & 0xff; buff[0] = pos >> 24;
-    fwrite( buff, 4, 1, snd );			/* set file length - 8 */
-
-    fseek( snd, AIFF_POS_NOFRAME, SEEK_SET );
-    dsz = pos - 8; dsz /= snd_fsz;
-    buff[3] = dsz & 0xff;           buff[2] = ( dsz >> 8 ) & 0xff;
-    buff[1] = ( dsz >> 16 ) & 0xff; buff[0] = dsz >> 24;
-    fwrite( buff, 4, 1, snd );			/* set file length - 8 */
-
-    printi( 1, "snd_finalize_aif%c(): FORM size: %ldbyte COMM frames: %ldbyte SSND size: %ld\n", aifc ? 'c' : 'f', pos + 32, dsz, pos );
-  }
-}

Deleted: branches/fmfx-2010-09-14/fuse/fmfconv_au.c
===================================================================
--- branches/fmfx-2010-09-14/fuse/fmfconv_au.c	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/fmfconv_au.c	2010-10-05 11:20:02 UTC (rev 4174)
@@ -1,95 +0,0 @@
-/* fmfconv_wav.c: wav output routine included into fmfconv.c
-   Copyright (c) 2004-2005 Gergely Szasz
-
-   $Id: $
-
-   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: szaszg@...
-
-*/
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "libspectrum.h"
-#include "fmfconv.h"
-
-
-int
-snd_write_auheader()
-{
-  libspectrum_dword buff[6];
-
-#ifdef WORDS_BIGENDIAN
-  buff[0] = 0x2e736e64UL;		/* magic id */
-  buff[1] = 24 + 64;
-  buff[2] = ~0UL;
-  buff[3] = snd_enc == TYPE_PCM ? 3 : ( snd_enc == TYPE_ULW ? 1 : 27 );
-  buff[4] = snd_rte;
-  buff[5] = snd_chn;
-#else
-  buff[0] = swap_endian_dword( 0x2e736e64UL );		/* magic id */
-  buff[1] = swap_endian_dword( 24 + 64 );
-  buff[2] = swap_endian_dword( ~0UL );
-  buff[3] = swap_endian_dword( snd_enc == TYPE_PCM ? 3 : ( snd_enc == TYPE_ULW ? 1 : 27 ) );
-  buff[4] = swap_endian_dword( snd_rte );
-  buff[5] = swap_endian_dword( snd_chn );
-#endif
-  fwrite( buff, 24, 1, snd );
-  fwrite( "fmfconv created AU file (http://fuse-emulator.sourceforge.net)\n", 64, 1, snd );
-  snd_header_ok = 1;
-  printi( 1, "snd_write_auheader(): %dHz %c encoded %s\n", snd_rte, snd_enc,
-		 snd_chn == 2 ? "stereo" : "mono" );
-  return 0;
-}
-
-int
-snd_write_au()
-{
-  int err;
-
-  if( !snd_header_ok && ( err = snd_write_auheader() ) ) return err;
-
-  if( snd_enc == TYPE_PCM && snd_little_endian ) {	/* we have to swap all sample */
-    pcm_swap_endian();
-  }
-  if( fwrite( sound8, snd_len, 1, snd ) != 1 ) return ERR_WRITE_SND;
-  printi( 2, "snd_write_au(): %d samples (%d bytes) sound\n", snd_len/snd_fsz, snd_len );
-
-  return 0;
-}
-
-void
-snd_finalize_au()
-{
-  libspectrum_dword len;
-  long pos = ftell( snd );
-
-  if( fseek( snd, 8, SEEK_SET ) == -1 ) {
-    printi( 2, "snd_finalize_au(): cannot finalize sound output file (not seekable).\n" );
-  } else {
-#ifdef WORDS_BIGENDIAN
-    len = pos - 24 - 64;
-#else
-    len = swap_endian_dword( pos - 24 - 64 );
-#endif
-    fwrite( &len, 4, 1, snd );			/* data length */
-    printi( 1, "snd_finalize_au(): DATA size: %ldbyte\n", pos - 24 - 64 );
-  }
-}

Deleted: branches/fmfx-2010-09-14/fuse/fmfconv_ff.c
===================================================================
--- branches/fmfx-2010-09-14/fuse/fmfconv_ff.c	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/fmfconv_ff.c	2010-10-05 11:20:02 UTC (rev 4174)
@@ -1,903 +0,0 @@
-/* fmfconv_ff.c: Routines for converting movie with ffmpeg libs
-   Copyright (c) 2010 Gergely Szasz
-
-   $Id:$
-
-   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.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Author contact information:
-
-   szaszg@...
-
-*/
-
-/* Most of the ffmpeg part of the code deduced from FFMPEG's output-example.c.
-   Here is the original copyright note:
-*/
-
-/*
- * Libavformat API example: Output a media file in any supported
- * libavformat format. The default codecs are used.
- *
- * Copyright (c) 2003 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <config.h>
-
-#ifdef USE_FFMPEG
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-
-#include "libspectrum.h"
-#include "fmfconv.h"
-
-#define VRATE_MULT 2
-static int sws_flags = SWS_BICUBIC | SWS_CPU_CAPS_3DNOW | SWS_CPU_CAPS_MMX2;
-
-int ffmpeg_arate = 0;		/* audio bitrate */
-int ffmpeg_vrate = 0;		/* video bitrate */
-AVRational ffmpeg_aspect = { 0, 0 };
-int ffmpeg_libx264 = 0;
-char *ffmpeg_frate = NULL;
-char *ffmpeg_format = NULL;
-char *ffmpeg_vcodec = NULL;
-char *ffmpeg_acodec = NULL;
-type_t ffmpeg_rescale = TYPE_NONE;
-int ffmpeg_list = -1;
-
-static AVOutputFormat *fmt;
-static AVFormatContext *oc;
-static AVStream *audio_st, *video_st;
-
-static uint8_t *audio_outbuf;
-static uint8_t *audio_tmp_inpbuf;
-static int16_t *audio_inpbuf;
-static int audio_outbuf_size;
-static int audio_tmp_inpbuf_size;		/* if resampling */
-static int audio_iframe_size;			/* size of an input audio frame in bytes */
-static int audio_oframe_size;			/* size of an output audio frame in bytes */
-static int audio_input_frames;			/* number of required audio frames for a packet */
-static int audio_inpbuf_len;			/* actual number of audio frames */
-
-static AVFrame *ff_picture, *ff_tmp_picture, *ffmpeg_pict;
-static struct SwsContext *video_resize_ctx;
-
-static ReSampleContext *audio_resample_ctx;
-static int16_t **ffmpeg_sound;
-
-static uint8_t *video_outbuf;
-static int video_outbuf_size;
-
-static AVFrame *alloc_picture( enum PixelFormat pix_fmt, int width, int height, void *fmf_pict );
-
-static enum PixelFormat out_pix_fmt = PIX_FMT_NONE;
-/* FFMPEG utility functions */
-
-static int res_chn = -1, res_rte;
-
-int
-ffmpeg_resample_audio()
-{
-  int len;
-
-  if( audio_resample_ctx && ( res_chn != out_chn || res_rte != out_rte ) ) {
-    audio_resample_close( audio_resample_ctx );
-    audio_resample_ctx = NULL;
-    av_free( audio_tmp_inpbuf );
-    res_chn = -1;
-    ffmpeg_sound = &sound16;
-    printi( 2, "ffmpeg_resample_audio(): reinit resample %d,%d -> %d,%d\n", res_chn, res_rte, out_chn, out_rte );
-  }
-  if( res_chn == -1 ) {
-    res_chn = out_chn;
-    res_rte = out_rte;
-    out_fsz = 2 * out_chn;
-  }
-  if( !audio_resample_ctx ) {
-    audio_resample_ctx = av_audio_resample_init( out_chn, snd_chn,
-						 out_rte, snd_rte,
-						 SAMPLE_FMT_S16, SAMPLE_FMT_S16,
-						 16, 10, 0, 0.8 );
-    audio_tmp_inpbuf_size = (float)audio_outbuf_size * out_rte / snd_rte * (float)out_chn / snd_chn + 1.0;
-    audio_tmp_inpbuf = av_malloc( audio_tmp_inpbuf_size );
-    ffmpeg_sound = (void *)(&audio_tmp_inpbuf);
-    printi( 2, "ffmpeg_resample_audio(): alloc resample context %d,%d %d byte len\n", out_chn, out_rte, audio_tmp_inpbuf_size );
-  }
-  if( !audio_resample_ctx ) {
-    printe( "FFMPEG: Could not allocate audio resample context\n" );
-    return 1;
-  }
-  len = audio_resample( audio_resample_ctx,
-                  (short *)audio_tmp_inpbuf, (short *)sound16,
-                  snd_len / snd_fsz );
-  if( !len ) {
-    printe( "FFMPEG: Error during audio resampling\n" );
-    return 1;
-  }
-  out_len = len * out_fsz;
-  printi( 3, "ffmpeg_resample_audio(): resample %d samples to %d samples\n", snd_len / snd_fsz, out_len / out_fsz );
-  return 0;
-
-}
-
-static int res_w = -1, res_h;
-
-int
-ffmpeg_rescale_video()
-{
-  if( video_resize_ctx && ( frm_w != res_w || frm_h != res_h ) ) {
-    sws_freeContext( video_resize_ctx );
-    video_resize_ctx = NULL;
-    res_w = -1;
-    ffmpeg_pict = ff_picture;
-  }
-
-  if( res_w == -1 ) {
-    ff_tmp_picture = alloc_picture( out_pix_fmt, out_w, out_h, NULL );
-    if( !ff_tmp_picture ) {
-      printe( "FFMPEG: Could not allocate temporary picture\n" );
-      avcodec_close( video_st->codec );
-      av_free( ff_picture );
-      return 1;
-    }
-    res_w = frm_w;
-    res_h = frm_h;
-  }
-  if( video_resize_ctx == NULL ) {
-    video_resize_ctx = sws_getContext( res_w, res_h,
-                                      PIX_FMT_YUV444P,
-                                      out_w, out_h,
-                                      out_pix_fmt,
-                                      sws_flags, NULL, NULL, NULL );
-    if( !video_resize_ctx ) {
-      printe( "Cannot initialize the conversion context\n" );
-      avcodec_close( video_st->codec );
-      av_free( ff_picture );
-      return 1;
-    }
-    ffmpeg_pict = ff_tmp_picture;
-  }
-  sws_scale( video_resize_ctx, 
-		(const uint8_t * const*)ff_picture->data, ff_picture->linesize,
-		0, res_h, ff_tmp_picture->data, ff_tmp_picture->linesize );
-  printi( 3, "ffmpeg_rescale_frame(): resize %dx%d -> %dx%d pix format %d->%d\n", frm_w, frm_h, out_w, out_h, PIX_FMT_YUV444P, out_pix_fmt );
-  return 0;
-}
-
-/**************************************************************/
-/* audio output */
-/*
- * add an audio output stream
- */
-
-static int
-add_audio_stream( enum CodecID codec_id, int freq, int stereo )
-{
-  AVCodecContext *c;
-
-  audio_st = av_new_stream( oc, 1 );
-  if( !audio_st ) {
-    printe( "FFMPEG: Could not allocate audio stream stream\n" );
-    return 1;
-  }
-
-  c = audio_st->codec;
-  c->codec_id = codec_id;
-  c->codec_type = AVMEDIA_TYPE_AUDIO;
-
-    /* put sample parameters */
-  c->sample_fmt = SAMPLE_FMT_S16;
-  if( ffmpeg_arate > 0 )
-    c->bit_rate = ffmpeg_arate;
-  audio_resample_ctx = NULL;
-
-  c->sample_rate = out_rte;
-  c->channels = out_chn;
-
-    /* some formats want stream headers to be separate */
-  if( oc->oformat->flags & AVFMT_GLOBALHEADER )
-    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
-  return 0;
-}
-
-static int
-open_audio()
-{
-  AVCodecContext *c;
-  AVCodec *codec;
-
-  c = audio_st->codec;
-
-    /* find the audio encoder */
-  codec = avcodec_find_encoder( c->codec_id );
-  if( !codec ) {
-    printe( "FFMPEG: audio codec not found\n" );
-    return 1;
-  }
-
-    /* open it */
-  if( avcodec_open( c, codec ) < 0 ) {
-    printe( "FFMPEG: could not open audio codec\n" );
-    return 1;
-  }
-
-  if( codec->sample_fmts != NULL )
-    c->sample_fmt = codec->sample_fmts[0];
-
-  audio_oframe_size = ( av_get_bits_per_sample_format( c->sample_fmt ) + 7 ) / 8 * out_chn;
-  audio_input_frames = c->frame_size;
-
-  if( audio_input_frames <= 1 ) {
-    audio_outbuf_size = out_rte * 1250 * audio_oframe_size / out_fps;
-  } else {
-    audio_outbuf_size = audio_input_frames * audio_oframe_size * 125 / 100;
-    if( audio_outbuf_size < FF_MIN_BUFFER_SIZE ) audio_outbuf_size = FF_MIN_BUFFER_SIZE;
-    audio_inpbuf = av_malloc( audio_input_frames * audio_iframe_size );
-    audio_inpbuf_len = 0;
-  }
-  audio_outbuf = av_malloc( audio_outbuf_size );
-  ffmpeg_sound = &sound16;
-
-  return 0;
-}
-
-/* add an audio frame to the stream */
-void
-ffmpeg_add_sound_ffmpeg( int len )
-{
-  AVCodecContext *c;
-  int coded_bps;
-  int16_t *buf;
-
-  if( !audio_st ) return;
-
-  buf = *ffmpeg_sound;
-  c = audio_st->codec;
-  coded_bps = av_get_bits_per_sample( c->codec_id );
-
-  if( audio_input_frames > 1 && audio_inpbuf_len + len < audio_input_frames ) {
-  /* store the full sound buffer and wait for more...*/
-    memcpy( (char *)audio_inpbuf + ( audio_inpbuf_len * audio_iframe_size ), buf, len * audio_iframe_size );
-    audio_inpbuf_len += len;
-    printi( 3, "ffmpeg_add_sound_ffmpeg(): store %d samples\n", audio_input_frames );
-    return;
-  }
-
-  printi( 3, "ffmpeg_add_sound_ffmpeg(): %d -> %d\n", audio_iframe_size, audio_oframe_size );
-  if( audio_input_frames > 1 ) {
-     while( audio_inpbuf_len + len >= audio_input_frames ) {
-      int copy_len = ( audio_input_frames - audio_inpbuf_len ) * audio_iframe_size;
-      AVPacket pkt;
-      av_init_packet( &pkt );
-
-      memcpy( (char *)audio_inpbuf + ( audio_inpbuf_len * audio_iframe_size ), buf, copy_len );
-      len -= audio_input_frames - audio_inpbuf_len;
-      buf = (void *)( (char *)buf + copy_len );
-
-      pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, audio_inpbuf );
-
-      if( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
-	pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, audio_st->time_base );
-      pkt.flags |= AV_PKT_FLAG_KEY;
-      pkt.stream_index = audio_st->index;
-      pkt.data = audio_outbuf;
-
-    /* write the compressed frame in the media file */
-      if( av_interleaved_write_frame( oc, &pkt ) != 0 ) {
-        fprintf( stderr, "Error while writing audio frame\n" );
-    /*    exit( 1 ); */
-      }
-      audio_inpbuf_len = 0;
-      printi( 3, "ffmpeg_add_sound_ffmpeg(): write sound packet %d samples (remain: %d) pkt.size = %dbyte\n", audio_input_frames, len, pkt.size );
-    }
-    /* store the remaind bytes */
-    memcpy( audio_inpbuf, buf, len * audio_iframe_size );
-    audio_inpbuf_len = len;
-
-
-  } else {			/* with PCM output */
-    AVPacket pkt;
-    av_init_packet( &pkt );
-
-    pkt.size = avcodec_encode_audio( c, audio_outbuf, coded_bps ? len * out_chn * coded_bps / 8 : len * out_chn, buf );
-
-    if( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
-      pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, audio_st->time_base );
-    pkt.flags |= AV_PKT_FLAG_KEY;
-    pkt.stream_index = audio_st->index;
-    pkt.data = audio_outbuf;
-
-    /* write */
-    if( av_interleaved_write_frame( oc, &pkt ) != 0 ) {
-      fprintf( stderr, "Error while writing audio frame\n" );
-/*      exit( 1 ); */
-    }
-    printi( 3, "ffmpeg_add_sound_ffmpeg(): write sound packet %d samples pkt.size = %dbyte\n", len, pkt.size );
-  }
-}
-
-int
-snd_write_ffmpeg()
-{
-
-/*  if( !snd_header_ok && ( err = snd_write_ffmpegheader() ) ) return err; */
-  if( !audio_st ) return 0;
-
-  if( snd_enc == TYPE_PCM && 
-#ifndef WORDS_BIGENDIAN
-	!snd_little_endian
-#else
-	snd_little_endian
-#endif
-  ) {	/* we have to swap all sample */
-    pcm_swap_endian();
-  }
-  if( snd_len > 0 && ( out_rte != snd_rte || out_chn != snd_chn ) ) {
-    printi( 3, "snd_write_ffmpeg(): got %d samples sound\n", snd_len / snd_fsz );
-    ffmpeg_resample_audio();
-    ffmpeg_add_sound_ffmpeg( out_len / out_fsz );
-    printi( 2, "snd_write_ffmpeg(): %d samples sound\n", out_len / out_fsz );
-  } else if( snd_len > 0 ) {
-    ffmpeg_add_sound_ffmpeg( snd_len / snd_fsz );
-    printi( 2, "snd_write_ffmpeg(): %d samples sound\n", snd_len / snd_fsz );
-  }
-
-  return 0;
-}
-
-static void
-close_audio()
-{
-  if( audio_st ) avcodec_close( audio_st->codec );
-  if( audio_outbuf ) av_free( audio_outbuf );
-}
-
-/**************************************************************/
-/*   pix_yuv --> [ tmp_picture ] --> [encode] */
-/* video output */
-
-static int
-check_framerate( const AVRational *frates, int timing )
-{
-  if( frates == NULL ) return -1;
-  while( frates->den != 0 || frates->num != 0 ) {
-    if( ( frates->num * 1000 / frates->den ) == timing ) {
-      return 1;
-    }
-    frates++;
-  }
-  return 0;
-}
-
-/* add a video output stream */
-static int
-add_video_stream( enum CodecID codec_id, int w, int h, int timing )
-{
-  AVCodecContext *c;
-
-  video_st = av_new_stream( oc, 0 );
-  if( !video_st ) {
-    printe( "FFMPEG: Could not allocate video stream\n" );
-    return 1;
-  }
-
-  c = video_st->codec;
-  c->codec_id = codec_id;
-  c->codec_type = AVMEDIA_TYPE_VIDEO;
-
-    /* put sample parameters */
-  if( ffmpeg_vrate > 0 )
-    c->bit_rate = ffmpeg_vrate;
-  else if( ffmpeg_vrate == 0 )
-    c->bit_rate = c->bit_rate * VRATE_MULT;
-
-    /* resolution must be a multiple of two */
-  c->width  = w;
-  c->height = h;
-    /* time base: this is the fundamental unit of time (in seconds) in terms
-       of which frame timestamps are represented. for fixed-fps content,
-       timebase should be 1/framerate and timestamp increments should be
-       identically 1. */
-  c->gop_size = 25; /* emit one intra frame every twelve frames at most */
-  video_st->sample_aspect_ratio = c->sample_aspect_ratio = ffmpeg_aspect;
-  if( ffmpeg_libx264 ) {
-	c->profile = FF_PROFILE_H264_HIGH;
-        c->me_range = 16;
-        c->max_qdiff = 4;
-        c->qmin = 10;
-        c->qmax = 51;
-        c->qcompress = 0.0;
-        c->crf = 0;
-        c->cqp = -1;
-        c->me_method = 8;
-        c->trellis = 1;
-/*
-        c->partitions = X264_PART_I4X4 | X264_PART_I8X8 | X264_PART_P8X8 | X264_PART_P4X4 | X264_PART_B8X8;
-*/
-        c->flags2 |= CODEC_FLAG2_WPRED | CODEC_FLAG2_MIXED_REFS |
-			CODEC_FLAG2_8X8DCT | CODEC_FLAG2_FASTPSKIP;
-  }
-    /* some formats want stream headers to be separate */
-  if( oc->oformat->flags & AVFMT_GLOBALHEADER )
-    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-  return 0;
-}
-
-static AVFrame *
-alloc_picture( enum PixelFormat pix_fmt, int width, int height, void *fmf_pict )
-{
-  AVFrame *picture;
-  uint8_t *picture_buf;
-  int size;
-
-  picture = avcodec_alloc_frame();
-  if( !picture ) return NULL;
-  if( !fmf_pict ) {
-    size = avpicture_get_size( pix_fmt, width, height );
-    picture_buf = av_malloc( size );
-    if( !picture_buf ) {
-      av_free( picture );
-      return NULL;
-    }
-    avpicture_fill( (AVPicture *)picture, picture_buf,
-                    pix_fmt, width, height );
-  } else {
-    avpicture_fill( (AVPicture *)picture, fmf_pict,
-                    pix_fmt, width, height );
-  }
-  return picture;
-}
-
-static int
-open_video()
-{
-  AVCodec *codec;
-  AVCodecContext *c;
-
-  c = video_st->codec;
-
-    /* find the video encoder */
-  codec = avcodec_find_encoder( c->codec_id );
-  if( !codec ) {
-    printe( "FFMPEG: video codec not found\n" );
-    return 1;
-  }
-
-  if( codec->pix_fmts == NULL )
-     c->pix_fmt = PIX_FMT_YUV420P;
-  else
-    c->pix_fmt = codec->pix_fmts[0];
-
-  out_pix_fmt = c->pix_fmt;
-  if( out_fps == 0 ) {		/* we use 24 1/s default framerate */
-    out_fps = 24000;
-    c->time_base.den = 24000;
-    c->time_base.num = 1000;
-  } else {
-    if( codec->supported_framerates == NULL ||
-        check_framerate( codec->supported_framerates, out_fps ) ) {	/* codec support the selected frate */
-      c->time_base.den = out_fps;
-      c->time_base.num = 1000;
-    } else {
-      printe( "FFMPEG: The selected video codec cannot use the required frame rate!" );
-      return 1;
-    }
-  }
-
-    /* open the codec */
-  if( avcodec_open( c, codec ) < 0 ) {
-    printe( "FFMPEG: could not open video codec\n" );
-    return 1;
-  }
-
-  if( !( oc->oformat->flags & AVFMT_RAWPICTURE ) ) {
-        /* allocate output buffer */
-        /* XXX: API change will be done */
-        /* buffers passed into lav* can be allocated any way you prefer,
-           as long as they're aligned enough for the architecture, and
-           they're freed appropriately (such as using av_free for buffers
-           allocated with av_malloc) */
-    video_outbuf_size = 200000;
-    video_outbuf = av_malloc( video_outbuf_size );
-  }
-
-  /* allocate the encoded raw picture */
-  ff_picture = alloc_picture( PIX_FMT_YUV444P, frm_w, frm_h, pix_yuv[0] );
-  ff_tmp_picture = NULL;
-
-  if( !ff_picture ) {
-    printe( "FFMPEG: Could not allocate picture\n" );
-    avcodec_close(video_st->codec);
-    return 1;
-  }
-  ffmpeg_pict = ff_picture;
-
-  return 0;
-}
-
-void
-ffmpeg_add_frame_ffmpeg()
-{
-  int out_size, ret;
-  AVCodecContext *c;
-
-  if( !video_st ) return;
-
-  c = video_st->codec;
-
-  if( oc->oformat->flags & AVFMT_RAWPICTURE ) {
-        /* raw video case. The API will change slightly in the near
-           future for that */
-    AVPacket pkt;
-    av_init_packet( &pkt );
-
-    pkt.flags |= AV_PKT_FLAG_KEY;
-    pkt.stream_index= video_st->index;
-    pkt.data= (uint8_t *)ffmpeg_pict;
-    pkt.size= sizeof( AVPicture );
-
-    ret = av_interleaved_write_frame( oc, &pkt );
-  } else {
-        /* encode the image */
-    out_size = avcodec_encode_video( c, video_outbuf, video_outbuf_size, ffmpeg_pict );
-        /* if zero size, it means the image was buffered */
-    if( out_size > 0 ) {
-      AVPacket pkt;
-      av_init_packet( &pkt );
-
-      if( c->coded_frame->pts != AV_NOPTS_VALUE )
-        pkt.pts = av_rescale_q( c->coded_frame->pts, c->time_base, video_st->time_base );
-      if( c->coded_frame->key_frame )
-        pkt.flags |= AV_PKT_FLAG_KEY;
-      pkt.stream_index= video_st->index;
-      pkt.data = video_outbuf;
-      pkt.size = out_size;
-
-            /* write the compressed frame in the media file */
-      ret = av_interleaved_write_frame( oc, &pkt );
-    } else {
-      ret = 0;
-    }
-  }
-  if( ret != 0 ) {
-    fprintf(stderr, "Error while writing video frame\n");
-/*      exit( 1 ); */
-  }
-}
-
-static void
-close_video()
-{
-  if( video_st )
-    avcodec_close( video_st->codec );
-  if( ff_picture ) {
-    /* av_free( ff_picture->data[0] ); */
-    av_free( ff_picture );
-  }
-  if( ff_tmp_picture ) {
-    av_free( ff_tmp_picture->data[0] );
-    av_free( ff_tmp_picture );
-  }
-  if( video_outbuf ) av_free( video_outbuf );
-}
-
-/**************************************************************/
-/* media file output */
-
-/* init lavc and open output file... */
-
-int
-out_write_ffmpegheader()
-{
-
-  AVCodec *c;
-  enum CodecID acodec, vcodec;
-
-  ff_picture = NULL;
-  ff_tmp_picture = NULL;
-  video_outbuf = NULL;
-  audio_outbuf = NULL;
-
-    /* initialize libavcodec, and register all codecs and formats */
-  av_register_all();
-
-    /* auto detect the output format from the name. default is
-       mpeg. */
-  if( ffmpeg_format != NULL && *ffmpeg_format != 0 ) {
-    fmt = av_guess_format( NULL, NULL, ffmpeg_format );		/* MIME */
-    if( !fmt )
-      fmt = av_guess_format( ffmpeg_format, NULL, NULL );	/* Name */
-    if( !fmt ) {
-      printe( "FFMPEG: Unknown output format '%s'.\n", ffmpeg_format );
-      return 1;
-    }
-  }
-
-  if( !fmt )
-    fmt = av_guess_format( NULL, out_name, NULL );
-  if( !fmt ) {
-/*    printf( "Could not deduce output format from file extension: using AVI.\n" ); */
-    fmt = av_guess_format( "avi", NULL, NULL );
-  }
-  if( !fmt ) {
-    printe( "FFMPEG: Could not find suitable output format\n" );
-    return 1;
-  }
-
-    /* allocate the output media context */
-  oc = avformat_alloc_context();
-  if( !oc ) {
-    printe( "FFMPEG: Memory error\n" );
-    return 1;
-  }
-  oc->oformat = fmt;
-  snprintf( oc->filename, sizeof( oc->filename ), "%s", out_name );
-
-    /* add the audio and video streams using the default format codecs
-       and initialize the codecs */
-  video_st = NULL;
-  audio_st = NULL;
-  vcodec = fmt->video_codec;
-  acodec = fmt->audio_codec;
-  if( out_t == TYPE_FFMPEG && vcodec != CODEC_ID_NONE ) {
-    AVCodec *c;
-    if( ffmpeg_vcodec != NULL && *ffmpeg_vcodec != 0 ) {
-      c = avcodec_find_encoder_by_name( ffmpeg_vcodec );
-      if( c && c->type == AVMEDIA_TYPE_VIDEO ) {
-        vcodec = c->id;
-      } else {
-        printe( "FFMPEG: Unknown video encoder '%s'.\n", ffmpeg_vcodec );
-        return 1;
-      }
-    }
-    if( ffmpeg_rescale == TYPE_NONE ) {
-      out_w = frm_w; out_h = frm_h;
-    } else if( ffmpeg_rescale == TYPE_RESCALE_X ) {
-      int tmp = frm_h * out_w / out_h;
-      out_w = frm_w * out_w / out_h;
-      out_h = tmp;
-    }
-
-    if( add_video_stream( vcodec, out_w, out_h, machine_timing[frm_mch - 'A'] ) )
-      return 1;
-  }
-  if( snd_t == TYPE_FFMPEG && acodec != CODEC_ID_NONE ) {
-    if( ffmpeg_acodec != NULL && *ffmpeg_acodec != 0 ) {
-      c = avcodec_find_encoder_by_name( ffmpeg_acodec );
-      if( c && c->type == AVMEDIA_TYPE_AUDIO ) {
-        acodec = c->id;
-      } else {
-        printe( "FFMPEG: Unknown audio encoder '%s'.\n", ffmpeg_acodec );
-      }
-    }
-    if( add_audio_stream( acodec, snd_rte, snd_chn > 1 ? 1 : 0 ) ) {
-      close_video();
-      return 1;
-    }
-    audio_iframe_size = out_chn > 1 ? 4 : 2;
-  }
-
-    /* set the output parameters (must be done even if no
-       parameters). */
-  if( av_set_parameters( oc, NULL ) < 0 ) {
-    printe( "FFMPEG: Invalid output format parameters\n" );
-    close_video();
-    close_audio();
-    return 1;
-  }
-
-/* dump_format( oc, 0, out_name, 1 ); */
-
-    /* now that all the parameters are set, we can open the audio and
-       video codecs and allocate the necessary encode buffers */
-  if( video_st && open_video() ) {
-    close_video();
-    close_audio();
-    return 1;
-  }
-  if( audio_st && open_audio() ) {
-    close_video();
-    close_audio();
-    return 1;
-  }
-
-    /* open the output file, if needed */
-  if( !( fmt->flags & AVFMT_NOFILE ) ) {
-    if( url_fopen( &oc->pb, out_name, URL_WRONLY ) < 0 ) {
-      printe( "FFMPEG: Could not open '%s'\n", out_name );
-      return 1;
-    }
-  }
-    /* write the stream header, if any */
-  av_write_header( oc );
-
-  out_header_ok = 1;
-
-  return 0;
-}
-
-int
-out_write_ffmpeg()
-{
-  int err;
-
-  if( !video_st ) return 0;
-
-  if( ( out_w != frm_w || out_h != frm_h || out_pix_fmt != PIX_FMT_YUV444P ) && 
-	( err = ffmpeg_rescale_video() ) ) return err;
-  ffmpeg_add_frame_ffmpeg();
-  printi( 2, "out_write_ffmpeg(): add frame\n" );
-  return 0;
-}
-
-
-void
-out_finalize_ffmpeg()
-{
-  int i;
-    /* write the trailer, if any.  the trailer must be written
-     * before you close the CodecContexts open when you wrote the
-     * header; otherwise write_trailer may try to use memory that
-     * was freed on av_codec_close() */
-  av_write_trailer( oc );
-
-    /* close each codec */
-  if( video_st )
-    close_video();
-  if( audio_st )
-    close_audio();
-
-    /* free the streams */
-  for( i = 0; i < oc->nb_streams; i++ ) {
-    av_freep( &oc->streams[i]->codec );
-    av_freep( &oc->streams[i] );
-  }
-
-  if( !( fmt->flags & AVFMT_NOFILE ) ) {
-        /* close the output file */
-    url_fclose( oc->pb );
-  }
-
-    /* free the stream */
-  av_free( oc );
-  printi( 2, "out_finalize_ffmpeg(): FIN\n" );
-}
-
-/* util functions */
-static void
-show_formats()
-{
-  AVInputFormat *ifmt = NULL;
-  AVOutputFormat *ofmt = NULL;
-  const char *last_name, *mime_type;
-
-  printf( "List of available FFMPEG file formats:\n"
-          "  name       mime type        long name\n"
-          "-------------------------------------------------------------------------------\n" );
-  last_name= "000";
-  for(;;){
-    int encode=0;
-    const char *name=NULL;
-    const char *long_name=NULL;
-
-    while( ( ofmt = av_oformat_next( ofmt ) ) ) {
-      if( ( name == NULL || strcmp( ofmt->name, name ) < 0 ) &&
-            strcmp( ofmt->name, last_name ) > 0 ) {
-        name = ofmt->name;
-        long_name = ofmt->long_name;
-        mime_type = ofmt->mime_type;
-        encode = 1;
-      }
-    }
-
-    while( ( ifmt = av_iformat_next( ifmt ) ) ) {
-      if( ( name == NULL || strcmp( ifmt->name, name ) < 0 ) &&
-            strcmp( ifmt->name, last_name ) > 0 ) {
-        name = ifmt->name;
-        long_name = ifmt->long_name;
-        encode = 0;
-      }
-    }
-
-    if( name == NULL ) break;
-    last_name = name;
-
-    if( encode )
-      printf(
-            "  %-10s %-16s %s\n", name,
-            mime_type ? mime_type:"---",
-            long_name ? long_name:"---" );
-    }
-    printf( "-------------------------------------------------------------------------------\n\n" );
-}
-
-void
-show_codecs( int what )
-{
-  AVCodec *p = NULL, *p2;
-  const char *last_name;
-
-  printf( "List of available FFMPEG %s codecs:\n"
-          "  name             long name\n"
-          "-------------------------------------------------------------------------------\n", what ? "video" : "audio" );
-  last_name= "000";
-  for(;;){
-    int encode = 0;
-    int ok;
-
-    p2 = NULL;
-    while( ( p = av_codec_next( p ) ) ) {
-      if( ( p2 == NULL || strcmp( p->name, p2->name ) < 0 ) &&
-            strcmp( p->name, last_name ) > 0 ) {
-        p2 = p;
-        encode = 0;
-      }
-      if( p2 && strcmp( p->name, p2->name ) == 0 ) {
-        if( p->encode ) encode=1;
-      }
-    }
-    if( p2 == NULL ) break;
-    last_name = p2->name;
-
-    ok = 0;
-    switch( p2->type ) {
-    case AVMEDIA_TYPE_VIDEO:
-      if( encode && what ) ok = 1;
-      break;
-    case AVMEDIA_TYPE_AUDIO:
-      if( encode && !what ) ok = 1;
-      break;
-    default:
-      break;
-    }
-    if( ok )
-      printf( "  %-16s %s\n", p2->name,
-/*              p2->mime_type ? p2->mime_type : "---", */
-              p2->long_name ? p2->long_name : "---" );
-    }
-    printf( "-------------------------------------------------------------------------------\n\n" );
-}
-
-void
-ffmpeg_list_ffmpeg( int what )
-{
-  av_register_all();
-  if( what == 0 ) show_formats();
-  if( what == 1 ) show_codecs( 0 );
-  if( what == 2 ) show_codecs( 1 );
-}
-#endif	/* ifdef USE_FFMPEG */

Deleted: branches/fmfx-2010-09-14/fuse/fmfconv_ppm.c
===================================================================
--- branches/fmfx-2010-09-14/fuse/fmfconv_ppm.c	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/fmfconv_ppm.c	2010-10-05 11:20:02 UTC (rev 4174)
@@ -1,46 +0,0 @@
-/* fmfconv_ppm.c: ppm output routine included into fmfconv.c
-   Copyright (c) 2004-2005 Gergely Szasz
-
-   $Id: $
-
-   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: szaszg@...
-
-*/
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "libspectrum.h"
-#include "fmfconv.h"
-
-
-int
-out_write_ppm()
-{
-  fprintf( out, "P6\n#ZX Spectrum screenshot created by fmfconv "
-		"(http://fuse-emulator.sourceforge.net) "
-		"\n%u %u 255\n", frm_w, frm_h );
-
-  if( fwrite( pix_rgb, frm_w * frm_h * 3, 1, out ) != 1 ) return ERR_WRITE_OUT;
-
-  printi( 2, "out_write_ppm()\n" );
-
-  return 0;
-}

Deleted: branches/fmfx-2010-09-14/fuse/fmfconv_scr.c
===================================================================
--- branches/fmfx-2010-09-14/fuse/fmfconv_scr.c	2010-10-05 10:31:49 UTC (rev 4173)
+++ branches/fmfx-2010-09-14/fuse/fmfconv_scr.c	2010-10-05 11:20:02 UTC (rev 4174)
@@ -1,97 +0,0 @@
-/* fmfconv_scr.c: SCR output routine included into fmfconv.c
-   Copyright (c) 2004-2005 Gergely Szasz
-
-   $Id: fmfconv_scr.c,v 1.4 2010/09/27 11:47:14 gergely 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: szaszg@...
-
-*/
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "libspectrum.h"
-#include "fmfconv.h"
-
-/*
-  perl -e 'for $k (0..2) { for $j (0..7) { print "  "; for $i (0..7){printf "0x%04x, ", (4+3*8*40+$i*40*8+$j*40+$k*8*8*40);} print "\n";} print "\n"}'
-*/
-
-static int screl_start[192] = {
-
-  0x03c4, 0x0504, 0x0644, 0x0784, 0x08c4, 0x0a04, 0x0b44, 0x0c84, 
-  0x03ec, 0x052c, 0x066c, 0x07ac, 0x08ec, 0x0a2c, 0x0b6c, 0x0cac, 
-  0x0414, 0x0554, 0x0694, 0x07d4, 0x0914, 0x0a54, 0x0b94, 0x0cd4, 
-  0x043c, 0x057c, 0x06bc, 0x07fc, 0x093c, 0x0a7c, 0x0bbc, 0x0cfc, 
-  0x0464, 0x05a4, 0x06e4, 0x0824, 0x0964, 0x0aa4, 0x0be4, 0x0d24, 
-  0x048c, 0x05cc, 0x070c, 0x084c, 0x098c, 0x0acc, 0x0c0c, 0x0d4c, 
-  0x04b4, 0x05f4, 0x0734, 0x0874, 0x09b4, 0x0af4, 0x0c34, 0x0d74, 
-  0x04dc, 0x061c, 0x075c, 0x089c, 0x09dc, 0x0b1c, 0x0c5c, 0x0d9c, 
-
-  0x0dc4, 0x0f04, 0x1044, 0x1184, 0x12c4, 0x1404, 0x1544, 0x1684, 
-  0x0dec, 0x0f2c, 0x106c, 0x11ac, 0x12ec, 0x142c, 0x156c, 0x16ac, 

@@ Diff output truncated at 100000 characters. @@

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

Revision: 4170
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4170&view=rev
Author:   pak21
Date:     2010-10-03 17:49:30 +0000 (Sun, 03 Oct 2010)

Log Message:
-----------
We also need to swap A' and F'.

Modified Paths:
--------------
    trunk/libspectrum/hacking/ChangeLog
    trunk/libspectrum/szx.c
    trunk/libspectrum/test/empty.szx
    trunk/libspectrum/test/test.c

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2010-10-03 17:38:56 UTC (rev 4169)
+++ trunk/libspectrum/hacking/ChangeLog	2010-10-03 17:49:30 UTC (rev 4170)
@@ -784,3 +784,4 @@
          written with A and F swapped and read them in appropriately. Bump
          libspectrum version number so we know that new files are written
          without the bug.
+20101003 szx.c,test/{empty.szx,test.c}: we also need to swap A' and F'.

Modified: trunk/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/szx.c	2010-10-03 17:38:56 UTC (rev 4169)
+++ trunk/libspectrum/szx.c	2010-10-03 17:49:30 UTC (rev 4170)
@@ -1294,8 +1294,14 @@
   libspectrum_snap_set_de  ( snap, libspectrum_read_word( buffer ) );
   libspectrum_snap_set_hl  ( snap, libspectrum_read_word( buffer ) );
 
-  libspectrum_snap_set_f_  ( snap, **buffer ); (*buffer)++;
-  libspectrum_snap_set_a_  ( snap, **buffer ); (*buffer)++;
+  if( ctx->swap_af ) {
+    libspectrum_snap_set_a_( snap, **buffer ); (*buffer)++;
+    libspectrum_snap_set_f_( snap, **buffer ); (*buffer)++;
+  } else {
+    libspectrum_snap_set_f_( snap, **buffer ); (*buffer)++;
+    libspectrum_snap_set_a_( snap, **buffer ); (*buffer)++;
+  }
+
   libspectrum_snap_set_bc_ ( snap, libspectrum_read_word( buffer ) );
   libspectrum_snap_set_de_ ( snap, libspectrum_read_word( buffer ) );
   libspectrum_snap_set_hl_ ( snap, libspectrum_read_word( buffer ) );

Modified: trunk/libspectrum/test/empty.szx
===================================================================
(Binary files differ)

Modified: trunk/libspectrum/test/test.c
===================================================================
--- trunk/libspectrum/test/test.c	2010-10-03 17:38:56 UTC (rev 4169)
+++ trunk/libspectrum/test/test.c	2010-10-03 17:49:30 UTC (rev 4170)
@@ -714,9 +714,17 @@
              libspectrum_snap_a( snap ) );
     r = TEST_FAIL;
   } else if( libspectrum_snap_f( snap ) != 0x34 ) {
-    fprintf( stderr, "%s: F is 0x%04x, not the expected 0x34\n", progname,
+    fprintf( stderr, "%s: F is 0x%02x, not the expected 0x34\n", progname,
              libspectrum_snap_f( snap ) );
     r = TEST_FAIL;
+  } else if( libspectrum_snap_a_( snap ) != 0x56 ) {
+    fprintf( stderr, "%s: A' is 0x%02x, not the expected 0x56\n", progname,
+             libspectrum_snap_a_( snap ) );
+    r = TEST_FAIL;
+  } else if( libspectrum_snap_f_( snap ) != 0x78 ) {
+    fprintf( stderr, "%s: F' is 0x%02x, not the expected 0x78\n", progname,
+             libspectrum_snap_f( snap ) );
+    r = TEST_FAIL;
   } else {
     r = TEST_PASS;
   }


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