[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4383] trunk/libspectrum

[<fr...@us...>]

Revision: 4383
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4383&view=rev
Author:   fredm
Date:     2011-04-27 06:00:26 +0000 (Wed, 27 Apr 2011)

Log Message:
-----------
Use more centralised methods for ms/tstate conversions.

Modified Paths:
--------------
    trunk/libspectrum/hacking/ChangeLog
    trunk/libspectrum/tape.c
    trunk/libspectrum/test/test15.c

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2011-04-27 03:06:03 UTC (rev 4382)
+++ trunk/libspectrum/hacking/ChangeLog	2011-04-27 06:00:26 UTC (rev 4383)
@@ -824,3 +824,5 @@
          LIBSPECTRUM_TAPE_FLAGS_LENGTH_LONG (Fred).
 20110427 tape.c,test/test15.c: use centralised methods for ms/tstate conversions
          (Fred).
+20110427 tape.c,test/test15.c: use more centralised methods for ms/tstate
+         conversions (Fred).

Modified: trunk/libspectrum/tape.c
===================================================================
--- trunk/libspectrum/tape.c	2011-04-27 03:06:03 UTC (rev 4382)
+++ trunk/libspectrum/tape.c	2011-04-27 06:00:26 UTC (rev 4383)
@@ -366,7 +366,8 @@
       break;
 
     case LIBSPECTRUM_TAPE_BLOCK_PAUSE:
-      *tstates = ( block->types.pause.length * 69888 ) / 20; end_of_block = 1;
+      *tstates = libspectrum_ms_to_tstates( block->types.pause.length );
+      end_of_block = 1;
       /* 0 ms pause => stop tape */
       if( *tstates == 0 ) { *flags |= LIBSPECTRUM_TAPE_FLAGS_STOP; }
       break;

Modified: trunk/libspectrum/test/test15.c
===================================================================
--- trunk/libspectrum/test/test15.c	2011-04-27 03:06:03 UTC (rev 4382)
+++ trunk/libspectrum/test/test15.c	2011-04-27 06:00:26 UTC (rev 4383)
@@ -58,7 +58,7 @@
   { 1939000, 1, 0 },	/* Pause */
 
   /* Pause block */
-  { 2159539, 1, 0 },
+  { 2163000, 1, 0 },
 
   /* Group start block */
   {    0,    1, 0 },


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