include new gstreamer message types; Pad.link() return result becomes an exception (#95)

* add a few new message types

* Pad.link() no longer returns a result.  Instead it throws an exception for abnormal results

* add javadoc; PadLinkException now derives from GstException

* fix testGetPackage() to not fail on a gentoo system

* Update PadLinkException with private linkResult and package private constructor for now; remove link_() method from Pad; fix formatting.

Author: mutantbob

src/org/freedesktop/gstreamer/MessageType.java

@@ -208,6 +208,22 @@ public enum MessageType implements IntegerEnum {
      * (Since 1.4)
      */
     DEVICE_REMOVED(EXTENDED.intValue() + 2),
+    /**
+     * Message indicating a {@link GObject} property has changed (Since 1.10)
+     */
+    PROPERTY_NOTIFY(EXTENDED.intValue() + 3),
+    /**
+     * Message indicating a new {@link GstStreamCollection} is available (Since 1.10)
+     */
+    STREAM_COLLECTION(EXTENDED.intValue()+4),
+    /**
+     * Message indicating the active selection of {@link GstStreams} has changed (Since 1.10)
+     */
+    STREAMS_SELECTED(EXTENDED.intValue() + 5),
+    /**
+     * Message indicating to request the application to try to play the given URL(s). Useful if for example a HTTP 302/303 response is received with a non-HTTP URL inside. (Since 1.10)
+     */
+    REDIRECT(EXTENDED.intValue() + 6),
     /**
      * mask for all of the above messages.
      */

src/org/freedesktop/gstreamer/Pad.java

@@ -203,16 +203,19 @@ public boolean peerAcceptCaps(Caps caps) {
     }
 
     /**
-     * Links this pad and a sink pad.
+     * Links this source pad and a sink pad.
      *
      * MT Safe.
-     * @param pad the sink Pad to link.
-     * @return A result code indicating if the connection worked or what went wrong.
+     * @param sink the sink Pad to link.
+     * @throws PadLinkException if pads cannot be linked.
      */
-    public PadLinkReturn link(Pad pad) {
-        return GSTPAD_API.gst_pad_link(this, pad);
+    public void link(Pad sink) throws PadLinkException {
+        PadLinkReturn result = GSTPAD_API.gst_pad_link(this, sink);
+        if (result != PadLinkReturn.OK) {
+            throw new PadLinkException(result);
+        }
     }
-    
+
     /**
      *
      * Unlinks the source pad from the sink pad. 

src/org/freedesktop/gstreamer/PadLinkException.java

@@ -0,0 +1,27 @@
+package org.freedesktop.gstreamer;
+
+/**
+ * The exception thrown when a pad link operation returns a non-OK result
+ */
+public class PadLinkException extends GstException {
+
+    private final PadLinkReturn linkResult;
+
+    PadLinkException(PadLinkReturn result) {
+        this("failed to link pads (" + result + ")", result);
+    }
+
+    PadLinkException(String message, PadLinkReturn result) {
+        super(message);
+        linkResult = result;
+    }
+
+    /**
+     * Get the PadLinkReturn result that caused this exception.
+     * @return PadLinkReturn
+     */
+    public PadLinkReturn getLinkResult() {
+        return linkResult;
+    }
+    
+}

test/org/freedesktop/gstreamer/BinTest.java

@@ -23,8 +23,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import java.lang.ref.WeakReference;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -143,7 +143,9 @@ public void elementAdded(Bin bin, Element elem) {
         assertEquals("Callback not called", 2, removed.get());
     }
     @Test 
-    public void addLinked() {
+    public void addLinked()
+        throws PadLinkException
+    {
         /* adding an element with linked pads to a bin unlinks the pads */
         Pipeline pipeline = new Pipeline((String) null);
         assertNotNull("Could not create pipeline", pipeline);
@@ -158,7 +160,7 @@ public void addLinked() {
         Pad sinkpad = sink.getStaticPad("sink");
         assertNotNull("Could not get sink pad", sinkpad);
 
-        assertEquals("Could not link src and sink pads", PadLinkReturn.OK, srcpad.link(sinkpad));
+        srcpad.link(sinkpad);
 
         /* pads are linked now */
         assertTrue("srcpad not linked", srcpad.isLinked());
@@ -172,14 +174,19 @@ public void addLinked() {
         assertFalse("sinkpad is still linked after being added to bin", sinkpad.isLinked());
 
         /* cannot link pads in wrong hierarchy */
-        assertEquals("Should not be able to link pads in different hierarchy", 
-                PadLinkReturn.WRONG_HIERARCHY, srcpad.link(sinkpad));
+        try {
+            srcpad.link(sinkpad);
+            fail("Should not be able to link pads in different hierarchy");
+        } catch (PadLinkException e) {
+            assertEquals("Should not be able to link pads in different hierarchy",
+                PadLinkReturn.WRONG_HIERARCHY, e.getLinkResult());
+        }
 
         /* adding other element to bin as well */
         pipeline.add(sink);
 
         /* now we can link again */
-        assertEquals("Could not link src and sink pads when in same bin", PadLinkReturn.OK, srcpad.link(sinkpad));
+        srcpad.link(sinkpad);
 
         /* check if pads really are linked */
         assertTrue("srcpad not linked", srcpad.isLinked());

test/org/freedesktop/gstreamer/PadTest.java

@@ -81,12 +81,14 @@ public void getPad() throws Exception {
         assertTrue("Sink pad not garbage collected", GCTracker.waitGC(sinkRef));
     }
     @Test
-    public void padLink() throws Exception {
+    public void padLink()
+        throws Exception
+    {
         Element src = ElementFactory.make("fakesrc", "src");
         Element sink = ElementFactory.make("fakesink", "src");
         Pad srcPad = src.getStaticPad("src");
         Pad sinkPad = sink.getStaticPad("sink");
-        assertEquals("Could not link pads", PadLinkReturn.OK, srcPad.link(sinkPad));
+        srcPad.link(sinkPad);
     }
 
     @Ignore("This seems to fail because gst1.0 doesn't actually send the event because pads " +