Changeset 549 in josm for trunk/src/org

Timestamp:

2008-02-18T21:41:29+01:00 (16 years ago)

Author:

david

Message:

remove redundant jump code - jumps always done by restarting audio

File:

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

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

@@ -29 +29 @@
         private enum State { INITIALIZING, NOTPLAYING, PLAYING, PAUSED, INTERRUPTED } 
         private State state;
-    private enum Command { PLAY, PAUSE, JUMP }
+    private enum Command { PLAY, PAUSE }
     private enum Result { WAITING, OK, FAILED }
     private URL playingUrl;
@@ -60 +60 @@
                         send();
                 }
-                protected void jump(double offset) throws Exception {
-                        this.offset = offset;
-                        command = Command.JUMP;
-                        send();
-                }
                 private void send() throws Exception {
                         result = Result.WAITING;
@@ -115 +110 @@
         public static void play(URL url, double seconds) throws Exception {
                 AudioPlayer.get().command.play(url, seconds);
-        }
-        
-        /**
-         * Fast Forward or Rewind the audio stream by the given number of seconds. 
-         * Terminates playing if would jump after the end
-         * Starts from the beginning if would jump before start 
-         * @param seconds fast forwards (positive) or rewinds (negative) by this number of seconds
-         * @throws audio fault exception, e.g. can't open stream,  unhandleable audio format
-         */
-        public static void jump(double seconds) throws Exception {
-                AudioPlayer.get().command.jump(seconds);
         }
         
@@ -292 +276 @@
                                                 stateChange = state.PAUSED;
                                                 break;
-                                        case JUMP:
-                                                stateChange = state.PAUSED; // for now
-                                                break;
                                         }
                                         command.ok(stateChange);