additional video changes for Python Mode

benfry · benfry · commit d41c597c4156 · 2014-05-19T15:26:37.000-04:00
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
@@ -25,8 +25,9 @@ PDE X and other Modes and Tools.
 + Make "Archive Sketch" Tool force a .zip file extension
   https://github.com/processing/processing/issues/2526
 
-+ Modifications for captureEvent and Python
++ Modifications for capture and movie events with Python Mode
   https://github.com/processing/processing/pull/2527
+  https://github.com/processing/processing/pull/2528
 
 + Permit mouse PRESS to set mouseX/mouseY
   https://github.com/processing/processing/pull/2509
diff --git a/java/libraries/video/src/processing/video/Capture.java b/java/libraries/video/src/processing/video/Capture.java
@@ -112,7 +112,7 @@ public class Capture extends PImage implements PConstants {
   protected Method sinkCopyMethod;
   protected Method sinkSetMethod;
   protected Method sinkDisposeMethod;
-  protected Method sinkGetMethod;  
+  protected Method sinkGetMethod;
   protected String copyMask;
   protected Buffer natBuffer = null;
   protected BufferDataAppSink natSink = null;
@@ -239,7 +239,7 @@ public Capture(PApplet parent, int requestWidth, int requestHeight,
 
   /**
    * Disposes all the native resources associated to this capture device.
-   * 
+   *
    * NOTE: This is not official API and may/will be removed at any time.
    */
   public void dispose() {
@@ -271,10 +271,10 @@ public void dispose() {
 
       pipeline.dispose();
       pipeline = null;
-      
+
       parent.g.removeCache(this);
       parent.unregisterMethod("dispose", this);
-      parent.unregisterMethod("post", this);      
+      parent.unregisterMethod("post", this);
     }
   }
 
@@ -308,11 +308,11 @@ public boolean available() {
 
   /**
    * ( begin auto-generated from Capture_start.xml )
-   * 
+   *
    * Starts capturing frames from the selected device.
-   * 
+   *
    * ( end auto-generated )
-   * 
+   *
    * @webref capture
    * @brief Starts capturing frames from the selected device
    */
@@ -425,7 +425,7 @@ public synchronized void read() {
     newFrame = true;
   }
 
-  
+
   public synchronized void loadPixels() {
     super.loadPixels();
     if (useBufferSink) {
@@ -441,33 +441,33 @@ public synchronized void loadPixels() {
         try {
           // sinkGetMethod will copy the latest buffer to the pixels array,
           // and the pixels will be copied to the texture when the OpenGL
-          // renderer needs to draw it.          
-          sinkGetMethod.invoke(bufferSink, new Object[] { pixels });          
+          // renderer needs to draw it.
+          sinkGetMethod.invoke(bufferSink, new Object[] { pixels });
         } catch (Exception e) {
           e.printStackTrace();
-        }        
-      }      
+        }
+      }
 
-      outdatedPixels = false;      
+      outdatedPixels = false;
     }
   }
-  
-  
+
+
   public int get(int x, int y) {
     if (outdatedPixels) loadPixels();
     return super.get(x, y);
   }
-  
-  
+
+
   protected void getImpl(int sourceX, int sourceY,
                          int sourceWidth, int sourceHeight,
                          PImage target, int targetX, int targetY) {
     if (outdatedPixels) loadPixels();
     super.getImpl(sourceX, sourceY, sourceWidth, sourceHeight,
                   target, targetX, targetY);
   }
-  
- 
+
+
   ////////////////////////////////////////////////////////////
 
   // List methods.
@@ -1019,40 +1019,37 @@ protected synchronized void invokeEvent(int w, int h, IntBuffer buffer) {
     }
     fireCaptureEvent();
   }
-  
+
 
   protected synchronized void invokeEvent(int w, int h, Buffer buffer) {
     available = true;
     bufWidth = w;
     bufHeight = h;
     if (natBuffer != null) {
-      // To handle the situation where read() is not called in the sketch, so 
-      // that the native buffers are not being sent to the sinke, and therefore, not disposed
-      // by it.
-      natBuffer.dispose(); 
-    }    
+      // To handle the situation where read() is not called in the sketch,
+      // so that the native buffers are not being sent to the sink,
+      // and therefore, not disposed by it.
+      natBuffer.dispose();
+    }
     natBuffer = buffer;
     fireCaptureEvent();
   }
 
-  
-  // moved to separate method for Jython support
-  // https://github.com/processing/processing/pull/2527
+
   private void fireCaptureEvent() {
-    // Creates a captureEvent.
     if (captureEventMethod != null) {
       try {
         captureEventMethod.invoke(eventHandler, this);
+
       } catch (Exception e) {
-        System.err.println(
-          "error, disabling captureEvent() for capture object");
+        System.err.println("error, disabling captureEvent()");
         e.printStackTrace();
         captureEventMethod = null;
       }
     }
   }
 
-  
+
   ////////////////////////////////////////////////////////////
 
   // Stream query methods.
@@ -1134,7 +1131,7 @@ protected String getFrameRate(String config) {
    * copy the frames to OpenGL.
    *
    * NOTE: This is not official API and may/will be removed at any time.
-   * 
+   *
    * @param Object dest
    */
   public void setBufferSink(Object sink) {
@@ -1145,7 +1142,7 @@ public void setBufferSink(Object sink) {
 
   /**
    * Sets the object to use as destination for the frames read from the stream.
-   * 
+   *
    * NOTE: This is not official API and may/will be removed at any time.
    *
    * @param Object dest
@@ -1190,22 +1187,22 @@ protected void getSinkMethods() {
       throw new RuntimeException("Capture: provided sink object doesn't have "+
                                  "a setBufferSource method.");
     }
-    
+
     try {
-      sinkDisposeMethod = bufferSink.getClass().getMethod("disposeSourceBuffer", 
+      sinkDisposeMethod = bufferSink.getClass().getMethod("disposeSourceBuffer",
         new Class[] { });
     } catch (Exception e) {
       throw new RuntimeException("Capture: provided sink object doesn't have " +
                                  "a disposeSourceBuffer method.");
     }
-        
+
     try {
-      sinkGetMethod = bufferSink.getClass().getMethod("getBufferPixels", 
+      sinkGetMethod = bufferSink.getClass().getMethod("getBufferPixels",
         new Class[] { int[].class });
     } catch (Exception e) {
       throw new RuntimeException("Capture: provided sink object doesn't have " +
                                  "a getBufferPixels method.");
-    }    
+    }
   }
 
 
@@ -1216,8 +1213,8 @@ protected void initCopyMask() {
       copyMask = "red_mask=(int)0xFF, green_mask=(int)0xFF00, blue_mask=(int)0xFF0000";
     }
   }
-  
-  
+
+
   public synchronized void post() {
     if (useBufferSink && sinkDisposeMethod != null) {
       try {
@@ -1226,5 +1223,5 @@ public synchronized void post() {
         e.printStackTrace();
       }
     }
-  }  
-}
+  }
+}
diff --git a/todo.txt b/todo.txt
@@ -14,9 +14,12 @@ X why is the JDK path showing up as a ._ feller in OS X?
 X   https://github.com/processing/processing/issues/2520
 X "Archive Sketch" Tool doesn't force a .zip file extension
 X   https://github.com/processing/processing/issues/2526
-X modifications for captureEvent and Python
-X   https://github.com/processing/processing/pull/2527
 
+python
+J modifications for captureEvent and Python
+J   https://github.com/processing/processing/pull/2527
+J Permit implementing movieEvent without having to link to Movie at build time
+J   https://github.com/processing/processing/pull/2528
 
 medium
 _ possible to open a sketch multiple times 
