MEDIA_ENGINE_IMPL_MAIN_R0: MEDIA_ENGINE_IMPL_MAIN_R0-28.04.2009.patch

src/main/java/org/sophie2/main/media/fobs/JMFVideoEngine.java

@@ -38 +38 @@
         /**
          * Default constructor
          */
-        public JMFVideoEngine() {
+        public JMFVideoEngine() {       
                 this.playerRegistry = new HashMap<Object, Player>();
         }
 
@@ -79 +79 @@
                         }
                         ImmSize imageSize = null;
                         if (currentFrame!=null){ 
-                                System.out.println("weeeee");
                                 imageSize= new ImmSize(currentFrame.getWidth(),currentFrame.getHeight());
                         }else imageSize = new ImmSize(160, 120);
                         player.stop();

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

@@ -50 +50 @@
                 }
 
                 @Override
-                @SuppressWarnings("cast")
                 public boolean handle(EventR3 event) {
                         InsertVideoItem source = event.getSource(InsertVideoItem.class);
                         AppMainWindow sourceAppMainWindow = AppMainWindow.findMainWindow(source);
                         BookView targetBDW = (BookView)sourceAppMainWindow.booksDesktop().get().currentWindow().get();
                         
-                        PageWorkArea targetSPWA = (PageWorkArea) targetBDW.workArea().get();                            
+                        PageWorkArea targetSPWA = targetBDW.workArea().get();                           
                         VideoBookResource res = createVideoResource(
                                         targetSPWA, targetBDW.book().get().get(Book.class));
                         if (res==null){
-                                System.out.println("The resourse is null");
+                                logger().error("The resource is null");
                                 return false;
-
                         }
                         
                         insertNewFrame(targetSPWA, res);

src/main/java/org/sophie2/main/func/media/view/VideoContentView.java

@@ -12 +12 @@
 import org.sophie2.main.func.media.model.resources.VideoBookResource;
 
 /**
- * Concrete implementation of MediaContentView for video. It constructs
- * an video scene element {@link VideoSceneElement} using the data from model
+ * Concrete implementation of MediaContentView for video. It constructs an video
+ * scene element {@link VideoSceneElement} using the data from model
  * {@link VideoFrameContent}.
  * 
  * @author alex
@@ -41 +41 @@
         /**
          * Concrete implementation of {@link VideoSceneElement}.
          */
-        class VideoContentSceneElement extends DefaultVideoSceneElement{
+        class VideoContentSceneElement extends DefaultVideoSceneElement {
                 @Override
                 protected void setupDynamic() {
                         if (model().get() != null
                                         && model().get().mainResource().get() != null) {
-                                VideoBookResource resource = 
-                                        model().get().mainResource().get().get(
-                                                        VideoBookResource.class, model().get());                                
+                                VideoBookResource resource = model().get().mainResource().get()
+                                                .get(VideoBookResource.class, model().get());
 
                                 // set MediaSource
                                 source().set((BinDataSource) resource.source().get());
                                 // set MediaInfo
                                 mediaInfo().set(resource.info().get());
-                                // request initial state - volume = 1, position = 0, playing = true
+                                // request initial state - volume = 1, position = 0, playing =
+                                // true
                                 requestedState().set(new MediaState(1, -1, true));
 
                         }
@@ -62 +62 @@
                         ImmSize dimensions = mediaInfo().get().getDimensions();
                         if (dimensions != null && parent().get() != null) {
 
-                                ImmSize contentSize = parent().get().model().get().contentSize().get();
+                                ImmSize contentSize = parent().get().model().get()
+                                                .contentSize().get();
                                 float x = contentSize.getWidth() / dimensions.getWidth();
                                 float y = contentSize.getHeight() / dimensions.getHeight();
                                 space().set(ImmMatrix.IDENTITY.scale(x, y));

src/main/java/org/sophie2/main/func/media/view/InsertVideoItem.java

@@ -13 +13 @@
 
 /**
  * The insert video item.
+ * 
  * @author milo
- *
+ * 
  */
 @SkinElementId("app.menus.insert.insert-video-menu-item")
 public class InsertVideoItem extends AppMenuItem {
@@ -22 +23 @@
         @SuppressWarnings("unused")
         @SkinPartDef
         private static void defineSkin(ElementSkinPart part) {
-                part.add(TITLE_PROP_ID, "Video");
+                part.add(TITLE_PROP_ID, "Video...");
                 part.add(TOOL_TIP_PROP_ID, "Add a video frame to the current page.");
                 part.add(MNEMONIC_PROP_ID, KeyEvent.VK_V);
         }
+
         @Override
         public void clicked() {
                 LogicR3.fire(new EventR3(this, null, null, null, Ids.ADD_VIDEO_FRAME));
@@ -39 +41 @@
         /**
          * The media operation supported by the video item.
          * 
-        */
-                public enum Ids {
-                        /**
-                         * A video frame should be added.
-                         */
-                        @EventParams( {})
-                        ADD_VIDEO_FRAME
+         */
+        public enum Ids {
+                /**
+                 * A video frame should be added.
+                 */
+                @EventParams( {})
+                ADD_VIDEO_FRAME
 
-                }
+        }
 
 }
-

src/main/java/org/sophie2/main/scene/simple/SimpleSceneVisual.java

@@ -5 +5 @@
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.geom.Area;
+import java.util.Date;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 
 import org.sophie2.base.commons.util.position.ImmRect;
 import org.sophie2.base.scene.SceneVisual;
 import org.sophie2.base.scene.helpers.ElementHelper;
 import org.sophie2.base.scene.helpers.SceneHelper;
+import org.sophie2.base.scene.interfaces.MediaSceneElement;
 import org.sophie2.base.scene.interfaces.Scene;
+import org.sophie2.base.scene.interfaces.SceneElement;
 import org.sophie2.base.skins.SkinElementId;
 import org.sophie2.base.visual.BaseVisualElement;
 import org.sophie2.base.visual.interaction.SwingEventAdapter;
@@ -55 +61 @@
                         protected ScenePanel create() {
                                 ScenePanel res = new ScenePanel();
                                 SwingEventAdapter.registerComponent(res,
-                                SimpleSceneVisual.this, null, res);
+                                                SimpleSceneVisual.this, null, res);
                                 return res;
                         }
 
@@ -101 +107 @@
                 return getBean().makeProp(swingComponent.class);
         }
 
+        @SuppressWarnings("unused")
+        private Prop<Timer> sceneTimer() {
+                class sceneTimer extends ResourceProperty<Timer> {
+
+                        final Runnable repaintScene = new Runnable() {
+
+                                @Override
+                                public void run() {
+                                        swingComponent().get().repaint();
+                                }
+
+                        };
+
+                        class MyTimerTask extends TimerTask {
+
+                                private boolean isRunning = false;
+
+                                @Override
+                                public void run() {
+                                        if (shouldRedraw(scene().get().rootElement().get())) {
+                                                this.isRunning = true;
+                                                 SwingUtilities
+                                                                .invokeLater(sceneTimer.this.repaintScene);
+                                        }
+                                }
+
+                                public boolean isRunning() {
+                                        return this.isRunning;
+                                }
+
+                        }
+
+                        final MyTimerTask timerTask = new MyTimerTask();
+                        
+                        final boolean shouldRedraw(SceneElement root) {
+                                for (SceneElement next : root.subElements().get()) {
+                                        if (MediaSceneElement.class.isInstance(next)) {
+                                                if (((MediaSceneElement) next).requestedState().get()
+                                                                .isPlaying()) {
+                                                        return true;
+                                                }
+                                        }
+
+                                        if (next != null && shouldRedraw(next)) {
+                                                return true;
+                                        }
+                                }
+
+                                return false;
+                        }
+
+                        @Override
+                        protected Timer create() {
+                                return new Timer("scene-repaint-timer", true);
+                        }
+
+                        @Override
+                        protected void destroy(Timer res) {
+                                // nothing... for now
+                        }
+
+                        @Override
+                        protected void setup(Timer res) {
+                                Scene scene = scene().get();
+                                if (swingComponent().get() != null && scene != null
+                                                && scene.rootElement().get() != null
+                                                && shouldRedraw(scene.rootElement().get())) {
+                                        if (this.timerTask.isRunning() == false) {
+                                                res.schedule(this.timerTask, new Date(), 1000 / 15);
+                                        }
+                                }
+                        }
+                }
+
+                return getBean().makeProp(sceneTimer.class);
+        }
+
         // /**
         // * @return property.
         // */