Changeset 557 in josm for trunk/src/org

Timestamp:

2008-02-24T15:33:15+01:00 (17 years ago)

Author:

david

Message:

implement calibration function for audio player

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/AudioPreference.java (modified) (3 diffs)
• tools/AudioPlayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java

@@ -40 +40 @@
         private JTextField audioLeadIn = new JTextField(8);
         private JTextField audioForwardBackAmount = new JTextField(8);
+        private JTextField audioCalibration = new JTextField(8);
 
         public void addGui(PreferenceDialog gui) {
@@ -110 +111 @@
                 gui.audio.add(audioLeadIn, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
+                audioCalibration.setText(Main.pref.get("audio.calibration", "1.0"));
+                audioCalibration.setToolTipText(tr("The ratio of voice recorder elapsed time to true elapsed time"));
+                gui.audio.add(new JLabel(tr("Voice recorder calibration")), GBC.std());
+                gui.audio.add(audioCalibration, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+
                 gui.audio.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
         }
@@ -122 +128 @@
                 Main.pref.put("audio.forwardbackamount", audioForwardBackAmount.getText());             
                 Main.pref.put("audio.leadin", audioLeadIn.getText());           
+                Main.pref.put("audio.calibration", audioCalibration.getText());         
     }
 }

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

@@ -33 +33 @@
     private URL playingUrl;
     private double leadIn; // seconds
+    private double calibration; // ratio of purported duration of samples to true duration
         private double position; // seconds
         private double bytesPerSecond; 
@@ -176 +177 @@
                 } catch (NumberFormatException e) {
                         leadIn = 1.0; // failed to parse
+                }
+                try {
+                        calibration = Double.parseDouble(Main.pref.get("audio.calibration", "1.0" /* default, ratio */));
+                } catch (NumberFormatException e) {
+                        calibration = 1.0; // failed to parse
                 }
                 start();
@@ -248 +254 @@
                                                         nBytesRead = 0;
                                                         position = 0.0;
-                                                        double adjustedOffset = offset - leadIn;
+                                                        double adjustedOffset = (offset - leadIn) * calibration;
                                                         bytesPerSecond = audioFormat.getFrameRate() /* frames per second */
                                                                 * audioFormat.getFrameSize() /* bytes per frame */;