From 23f13ec0ae80c4cd15733ff7e80d20a31a4a2387 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Sun, 21 Aug 2011 17:31:25 +0000
Subject: [PATCH] Added printElements() method to Movie and Capture, updated
 dir structure

---
 .../video/src/processing/video/Capture.java        | 14 ++++++++++++++
 .../video/src/processing/video/Movie.java          | 14 ++++++++++++++
 .../video/src/processing/video/Video.java          | 12 ++++++------
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/java/libraries/video/src/processing/video/Capture.java b/java/libraries/video/src/processing/video/Capture.java
index f7ae595e7..091f42760 100644
--- a/java/libraries/video/src/processing/video/Capture.java
+++ b/java/libraries/video/src/processing/video/Capture.java
@@ -23,6 +23,7 @@ import processing.core.*;
 
 import java.nio.*;
 import java.util.ArrayList;
+import java.util.List;
 import java.lang.reflect.*;
 
 import org.gstreamer.*;
@@ -213,6 +214,19 @@ public class Capture extends PImage implements PConstants {
     delete();
   }    
   
+  /**
+   * Prints all the gstreamer elements currently used in the
+   * current pipeline instance.
+   * 
+   */    
+  public void printElements() {
+    List<Element> list = gpipeline.getElementsRecursive();
+    PApplet.println(list);
+    for (Element element : list) {
+      PApplet.println(element.toString());
+    }   
+  }  
+  
   /**
    * Sets the object to use as destination for the frames read from the stream.
    * The color conversion mask is automatically set to the one required to
diff --git a/java/libraries/video/src/processing/video/Movie.java b/java/libraries/video/src/processing/video/Movie.java
index 13cac0a1e..9fb53f009 100644
--- a/java/libraries/video/src/processing/video/Movie.java
+++ b/java/libraries/video/src/processing/video/Movie.java
@@ -25,6 +25,7 @@ import java.awt.Dimension;
 import java.io.*;
 import java.net.URI;
 import java.nio.*;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.lang.reflect.*;
 
@@ -125,6 +126,19 @@ public class Movie extends PImage implements PConstants {
     delete();
   }
   
+  /**
+   * Prints all the gstreamer elements currently used in the
+   * current player instance.
+   * 
+   */    
+  public void printElements() {
+    List<Element> list = gplayer.getElementsRecursive();
+    PApplet.println(list);
+    for (Element element : list) {
+      PApplet.println(element.toString());
+    }   
+  }
+  
   /**
    * Sets the object to use as destination for the frames read from the stream.
    * The color conversion mask is automatically set to the one required to
diff --git a/java/libraries/video/src/processing/video/Video.java b/java/libraries/video/src/processing/video/Video.java
index 0cb8ed7e2..26cda0221 100644
--- a/java/libraries/video/src/processing/video/Video.java
+++ b/java/libraries/video/src/processing/video/Video.java
@@ -156,8 +156,8 @@ public class Video implements PConstants {
       if (localGStreamerPath.equals("")) {
         LibraryPath libPath = new LibraryPath();
         String path = libPath.get();
-        gstreamerBinPath = path + "/gstreamer/linux";
-        gstreamerPluginsPath = path + "/gstreamer/linux/" + localPluginsFolder;
+        gstreamerBinPath = path + "/linux";
+        gstreamerPluginsPath = path + "/linux/" + localPluginsFolder;
       } else {
         gstreamerBinPath = localGStreamerPath;
         gstreamerPluginsPath = localGStreamerPath + "/" + localPluginsFolder;
@@ -174,8 +174,8 @@ public class Video implements PConstants {
       if (localGStreamerPath.equals("")) {
         LibraryPath libPath = new LibraryPath();
         String path = libPath.get();
-        gstreamerBinPath = path + "\\gstreamer\\win";
-        gstreamerPluginsPath = path + "\\gstreamer\\win\\" + localPluginsFolder;
+        gstreamerBinPath = path + "\\win";
+        gstreamerPluginsPath = path + "\\win\\" + localPluginsFolder;
       } else {
         gstreamerBinPath = localGStreamerPath;
         gstreamerPluginsPath = localGStreamerPath + "\\" + localPluginsFolder;
@@ -192,8 +192,8 @@ public class Video implements PConstants {
       if (localGStreamerPath.equals("")) {
         LibraryPath libPath = new LibraryPath();
         String path = libPath.get();
-        gstreamerBinPath = path + "/gstreamer/macosx";
-        gstreamerPluginsPath = path + "/gstreamer/macosx/" + localPluginsFolder;
+        gstreamerBinPath = path + "/macosx";
+        gstreamerPluginsPath = path + "/macosx/" + localPluginsFolder;
       } else {
         gstreamerBinPath = localGStreamerPath;
         gstreamerPluginsPath = localGStreamerPath + "/" + localPluginsFolder;