Ticket #2199: media.patch

src/main/java/org/sophie2/main/func/media/logic/MediaLogic.java

@@ -28 +28 @@
  * @author pav, peko
  */
 public enum MediaLogic implements OperationDef {
-        
+
         /**
          * Handles a user request to play/pauses the media.
          * 
@@ -43 +43 @@
                 }
 
                 public boolean handle(EventR3 event) {
-                        PlayPauseMediaManipulationView mediaManView = 
-                                event.getSource(PlayPauseMediaManipulationView.class);
+                        PlayPauseMediaManipulationView mediaManView = event
+                                        .getSource(PlayPauseMediaManipulationView.class);
 
                         MediaFrameView view = mediaManView.parent().get();
                         MediaFrameH model = view.model().get();
 
                         final TimePos time = view.getTime();
                         final MediaState oldState = model.getMediaState(view.getTime());
-                        final MediaState newState = oldState.setPlaying(!oldState.isPlaying());
-                        final MediaStateChannel oldChannel = view.model().get().get(MediaFrameR4.KEY_STATE);
+                        final MediaState newState = oldState.setPlaying(!oldState
+                                        .isPlaying());
+                        final MediaStateChannel oldChannel = view.model().get().get(
+                                        MediaFrameR4.KEY_STATE);
 
                         new AutoAction("Play/Pause", true) {
 
                                 @Override
                                 public void performAuto() {
-                                        MediaStateChannel newChannel = oldChannel.setInterval(time, TimePos.MAX,
-                                                        newState);
+                                        MediaStateChannel newChannel = oldChannel.setInterval(time,
+                                                        TimePos.MAX, newState);
                                         getChanger().setRaw(MediaFrameR4.KEY_STATE, newChannel);
                                 }
                         }.register(view.getAccess());
                         return true;
                 }
-
         },
 
         /**
@@ -82 +83 @@
                 }
 
                 public boolean handle(EventR3 event) {
-                        StopMediaManipulationView mediaManView = 
-                                event.getSource(StopMediaManipulationView.class);
+                        StopMediaManipulationView mediaManView = event
+                                        .getSource(StopMediaManipulationView.class);
 
                         MediaFrameView view = mediaManView.parent().get();
                         final TimePos time = view.getTime();
-                        final MediaStateChannel oldChannel = view.model().get().get(MediaFrameR4.KEY_STATE);
+                        final MediaStateChannel oldChannel = view.model().get().get(
+                                        MediaFrameR4.KEY_STATE);
 
                         new AutoAction("Stop", true) {
 
                                 @Override
                                 public void performAuto() {
-                                        MediaStateChannel newChannel = oldChannel.setInterval(time, TimePos.MAX,
-                                                        MediaState.DEFAULT_STOPPED);
+                                        MediaStateChannel newChannel = oldChannel.setInterval(time,
+                                                        TimePos.MAX, MediaState.DEFAULT_STOPPED);
                                         getChanger().setRaw(MediaFrameR4.KEY_STATE, newChannel);
                                 }
                         }.register(view.getAccess());
@@ -102 +104 @@
                 }
 
         },
-        
+
         /**
          * Retries media that has had binary source problems.
          * 
@@ -117 +119 @@
                 }
 
                 public boolean handle(EventR3 event) {
-                        MediaErrorManipulationView mediaManView = 
-                                event.getSource(MediaErrorManipulationView.class);
+                        MediaErrorManipulationView mediaManView = event
+                                        .getSource(MediaErrorManipulationView.class);
 
                         final MediaFrameView view = mediaManView.parent().get();
                         assert view != null : "The manipulation view can not be unattached!";
-                        
+
                         SwingUtilities.invokeLater(new Runnable() {
                                 public void run() {
                                         view.binSourceProblem().set(null);
                                 }
                         });
-                        
+
                         return true;
                 }
-                
+
         },
-        
+
         /**
-         * Handles a user request to seek the media.
+         * Handles a user request to seek the media (mouse pressed).
          * 
          * @author stefan
          */
         @SortKey("ffh-seek-media")
-        ON_SEEK_MEDIA {
+        ON_SEEK_MEDIA_MOUSE_PRESSED {
 
                 public void defineFilter(EventFilterBuilder filter) {
                         filter.setSourceClass(SeekMediaManipulationView.class);
@@ -149 +151 @@
                 }
 
                 public boolean handle(EventR3 event) {
+                        return handleMediaSeekEvent(event);
+                }
 
-                        SeekMediaManipulationView mediaManView = 
-                                event.getSource(SeekMediaManipulationView.class);
-                        MediaFrameView view = mediaManView.parent().get();
+        },
+        /**
+         * Handles a user request to seek the media (mouse dragged).
+         * 
+         * @author diana
+         */
+        ON_SEEK_MEDIA_MOUSE_DRAGGED {
 
-                        int width = SeekMediaManipulationView.SLIDER_WIDTH;
-                        int border = SeekMediaManipulationView.SLIDER_BORDER;
+                public void defineFilter(EventFilterBuilder filter) {
+                        filter.setSourceClass(SeekMediaManipulationView.class);
+                        filter.setEventId(InputEventR3.MOUSE_DRAGGED);
 
-                        ImmPoint point = event.getEventParam(
-                                        InputEventR3.POINT_PARAM_INDEX, ImmPoint.class);
-                        double x;
-                        if (point.getX() <= border) {
-                                x = 0f;
-                        } else if (point.getX() >= width + border) {
-                                x = width;
-                        } else {
-                                x = point.getX() - border;
+                }
+                public boolean handle(EventR3 event) {
+                        return handleMediaSeekEvent(event);
+                }
+        };
+
+        /**
+         * Handles the events coming from the SeekMediaManipulationView.
+         * 
+         * @param event - The event to handle.
+         * @return - True if handled, false - otherwise.
+         */
+        public boolean handleMediaSeekEvent(EventR3 event) {
+                SeekMediaManipulationView mediaManView = event
+                                .getSource(SeekMediaManipulationView.class);
+                MediaFrameView view = mediaManView.parent().get();
+
+                int width = SeekMediaManipulationView.SLIDER_WIDTH;
+                int border = SeekMediaManipulationView.SLIDER_BORDER;
+
+                ImmPoint point = event.getEventParam(InputEventR3.POINT_PARAM_INDEX,
+                                ImmPoint.class);
+                double x;
+                if (point.getX() <= border) {
+                        x = 0f;
+                } else if (point.getX() >= width + border) {
+                        x = width;
+                } else {
+                        x = point.getX() - border;
+                }
+                long millis = (long) ((x / width)
+                                * view.handler().get().getInfo().getDuration() * 1000);
+
+                long mod = millis % 10;
+                millis = (mod < 5) ? millis -= mod : millis + 10 - mod;
+
+                SophieLog.debug("point = " + point);
+                SophieLog.debug("x = " + x);
+                SophieLog.debug("millis = " + millis);
+
+                final TimePos time = view.getTime();
+                final MediaState oldState = view.model().get().getMediaState(
+                                view.getTime());
+                final MediaState newState = new MediaState(oldState.getVolume(),
+                                millis, oldState.isPlaying());
+
+                final MediaStateChannel oldChannel = view.model().get().get(
+                                MediaFrameR4.KEY_STATE);
+
+                new AutoAction("Seek", true) {
+
+                        @Override
+                        public void performAuto() {
+                                MediaStateChannel newChannel = oldChannel.setInterval(time,
+                                                TimePos.MAX, newState);
+                                getChanger().setRaw(MediaFrameR4.KEY_STATE, newChannel);
                         }
-                        
-                        long millis = (long) ((x / width) * 
-                                        view.handler().get().getInfo().getDuration() * 1000);
-                        
-                        long mod = millis % 10;
-                        millis = (mod < 5) ? millis -= mod : millis + 10 - mod; 
-                        
-                        SophieLog.debug("point = " + point);
-                        SophieLog.debug("x = " + x);
-                        SophieLog.debug("millis = " + millis);
-                        
-                        final TimePos time = view.getTime();
-                        final MediaState oldState = view.model().get().getMediaState(view.getTime());
-                        final MediaState newState = new MediaState(oldState.getVolume(), millis, oldState.isPlaying());
-                        
-                        final MediaStateChannel oldChannel = view.model().get().get(MediaFrameR4.KEY_STATE);
+                }.register(view.getAccess());
 
-                        new AutoAction("Seek", true) {
+                return true;
 
-                                @Override
-                                public void performAuto() {
-                                        MediaStateChannel newChannel = oldChannel.setInterval(time, TimePos.MAX,
-                                                        newState);
-                                        getChanger().setRaw(MediaFrameR4.KEY_STATE, newChannel);
-                                }
-                        }.register(view.getAccess());
-                        
-                        return true;
-                }
-                
-        };
+        }
+
 }