Changeset 577 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2008-03-06T13:50:13+01:00 (18 years ago)

Author:

david

Message:

when dragging play head (a) fix bug re extraneous rubber band rectangle (b) fix small calibration bug, (c) jump to interpolated point on track, not nearest track point.

File:

• trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -37 +37 @@
         private double position; // seconds
         private double bytesPerSecond; 
-        private static long chunk = 8000; /* bytes */
+        private static long chunk = 4000; /* bytes */
         private double speed = 1.0;
 
@@ -238 +238 @@
                                         break;
                                 case PLAYING:
+                                        command.possiblyInterrupt();
                                         for(;;) {
                                                 int nBytesRead = 0;
@@ -280 +281 @@
                                                         long nBytesRead = 0;
                                                         position = 0.0;
-                                                        double adjustedOffset = (offset - leadIn) * calibration;
+                                                        offset -= leadIn;
+                                                        double calibratedOffset = offset * calibration;
                                                         bytesPerSecond = audioFormat.getFrameRate() /* frames per second */
                                                                 * audioFormat.getFrameSize() /* bytes per frame */;
                                                         if (speed * bytesPerSecond > 256000.0)
                                                                 speed = 256000 / bytesPerSecond;
-                                                        if (offset != 0.0 && adjustedOffset > 0.0) {
+                                                        if (calibratedOffset > 0.0) {
                                                                 long bytesToSkip = (long)(
-                                                                        adjustedOffset /* seconds (double) */ * bytesPerSecond);
+                                                                                calibratedOffset /* seconds (double) */ * bytesPerSecond);
                                                                 /* skip doesn't seem to want to skip big chunks, so 
                                                                  * reduce it to smaller ones 
@@ -300 +302 @@
                                                                 if (bytesToSkip > 0)
                                                                         audioInputStream.skip(bytesToSkip);
-                                                                position = adjustedOffset;
+                                                                position = offset;
                                                         }
                                                         if (audioOutputLine != null)