Changeset 150

Timestamp:

02/12/08 15:24:19 (1 year ago)

Author:

Stuart Thiel

Message:

-Fixed rest of #133
--The in and out times of a Clip are now stored in the movie itself. Previously, it was reconstituting this from the timeline panel... which was weird.

Files:

• MediAnnotate/trunk/src/org/mediannotate/app/PlayerPanel.java (modified) (2 diffs)
• MediAnnotate/trunk/src/org/mediannotate/dom/Movie.java (modified) (1 diff)
• MediAnnotate/trunk/src/org/mediannotate/dom/QTMovie.java (modified) (6 diffs)
• MediAnnotate/trunk/src/org/mediannotate/ui/listener/TimeLineListener.java (modified) (2 diffs)

MediAnnotate/trunk/src/org/mediannotate/app/PlayerPanel.java

@@ -200 +200 @@
-        public long getInTime() {
-                if(!getTimeLinePanel().isInActive()) return 0;
-(long)(getTimeLinePanel().getCurrentIn()*((float)durationTime.getAllInMilli())
+currentMovie.getIn(
-        }
-        
-        public long getOutTime() {
-                if(!getTimeLinePanel().isOutActive()) return durationTime.getAllInMilli();
-(long)(getTimeLinePanel().getCurrentOut()*durationTime.getAllInMilli()
+currentMovie.getOut(
-        }
-        
-        public void setInTime(long time) {
-                System.out.println("In Player Panel");
-                System.out.println(getTimeLinePanel());
-                System.out.println(durationTime);
-                getTimeLinePanel().setIn(time/(float)durationTime.getAllInMilli());
+                currentMovie.setIn(time);
-        }
-        
-        public void setOutTime(long time) {
-                getTimeLinePanel().setOut(time/(float)durationTime.getAllInMilli());
+                currentMovie.setOut(time);
-        }
-        
@@ -225 +224 @@
-
-        public void keyReleased(KeyEvent e) {
-                System.out.println(e.getKeyCode() + " " + e.toString());
-                if(e.getKeyCode() == KeyEvent.VK_I && e.getModifiers() == ActionEvent.CTRL_MASK) {
-                        getTimeLinePanel().setIn(getTime()/(float)durationTime.getAllInMilli());

MediAnnotate/trunk/src/org/mediannotate/dom/Movie.java

@@ -13 +13 @@
-        public long getTime();
-        public void setTime(long time);
+        public void setIn(long time);
+        public void setOut(long time);
+        public long getIn();
+        public long getOut();
+        public boolean shouldStopPlaying();
-        public long getDuration();
-        public void start();

MediAnnotate/trunk/src/org/mediannotate/dom/QTMovie.java

@@ -26 +26 @@
-        private quicktime.std.movies.Movie innerMovie;
-        private MoviePlayer innerMoviePlayer;
-
+
+
+
+
-        public QTMovie(String url) {
-
@@ -115 +118 @@
-
-        public void setTime(long time) {
+                if(time >= outTime) startedPlayingAfterOutTime = true;
+                else startedPlayingAfterOutTime = false;
-                try {
-                        (new MoviePlayer(innerMovie)).setTime((int)time*innerMovie.getTRTime().getScale()/1000);
@@ -137 +142 @@
-                        
-                } catch (QTException e) {
+                        e.printStackTrace();
+                }
+
+                innerMovie = null;
+                }
+        }
+
+        public void start() {
+                if(getTime() >= outTime) startedPlayingAfterOutTime = true;
+                else startedPlayingAfterOutTime = false;
+                try {
+                        innerMovie.start();
+                } catch (StdQTException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-
-                innerMovie = null;
-                }
-        }
-
-        public void start() {
-                try {
-                        innerMovie.start();
-                } catch (StdQTException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-        }
-
@@ -158 +164 @@
-                        innerMovie.stop();
-                } catch (StdQTException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
@@ -165 +170 @@
-        public boolean isPlaying() {
-                try {
-
-
-
+
+
-                        e.printStackTrace();
-                }
@@ -177 +181 @@
-        }
-
+        public long getIn() {
+                return inTime;
+        }
+
+        public long getOut() {
+                return outTime;
+        }
+
+        public void setIn(long time) {
+                this.inTime = time;
+        }
+
+        public void setOut(long time) {
+                this.outTime = time;
+        }
+
+        @Override
+        public boolean shouldStopPlaying() {
+                return (!startedPlayingAfterOutTime) && (getTime() >= outTime);
+        }
+
-}

MediAnnotate/trunk/src/org/mediannotate/ui/listener/TimeLineListener.java

@@ -65 +65 @@
-                public void actionPerformed(ActionEvent e) {
-                        myTimeLine.setIn(innerMovie.getTime()/(float)innerMovie.getDuration());
+                        innerMovie.setIn(innerMovie.getTime());
-                        myTimeLine.repaint();
-                }
@@ -74 +75 @@
-                public void actionPerformed(ActionEvent e) {
-                        myTimeLine.setOut(innerMovie.getTime()/(float)innerMovie.getDuration());
+                        innerMovie.setOut(innerMovie.getTime());
-                        myTimeLine.repaint();
-                }