Fix up buffer and pad enums

Author: neilcsmith-net

src/org/freedesktop/gstreamer/Buffer.java

@@ -237,13 +237,13 @@ public void setOffsetEnd(long val) {
      *
      * Since GStreamer 1.10
      *
-     * @return an EnumSet of {@link BufferFlag}
+     * @return an EnumSet of {@link BufferFlags}
      */
     @Gst.Since(minor = 10)
-    public EnumSet<BufferFlag> getFlags() {
+    public EnumSet<BufferFlags> getFlags() {
         Gst.checkVersion(1, 10);
         int nativeInt = GstBufferAPI.GSTBUFFER_API.gst_buffer_get_flags(this);
-        return NativeFlags.fromInt(BufferFlag.class, nativeInt);
+        return NativeFlags.fromInt(BufferFlags.class, nativeInt);
     }
 
     /**
@@ -252,11 +252,11 @@ public EnumSet<BufferFlag> getFlags() {
      *
      * Since GStreamer 1.10
      *
-     * @param flags an EnumSet of {@link BufferFlag} to be set on the buffer.
+     * @param flags an EnumSet of {@link BufferFlags} to be set on the buffer.
      * @return true if flags were successfully set on this buffer
      */
     @Gst.Since(minor = 10)
-    public boolean setFlags(EnumSet<BufferFlag> flags) {
+    public boolean setFlags(EnumSet<BufferFlags> flags) {
         Gst.checkVersion(1, 10);
         return GstBufferAPI.GSTBUFFER_API.gst_buffer_set_flags(this, NativeFlags.toInt(flags));
     }
@@ -267,12 +267,12 @@ public boolean setFlags(EnumSet<BufferFlag> flags) {
      *
      * Since GStreamer 1.10
      *
-     * @param flags an EnumSet of {@link BufferFlag} to be cleared on the buffer.
+     * @param flags an EnumSet of {@link BufferFlags} to be cleared on the buffer.
      * @return true if flags were successfully cleared on this buffer
      *
      */
     @Gst.Since(minor = 10)
-    public boolean unsetFlags(EnumSet<BufferFlag> flags) {
+    public boolean unsetFlags(EnumSet<BufferFlags> flags) {
         Gst.checkVersion(1, 10);
         return GstBufferAPI.GSTBUFFER_API.gst_buffer_unset_flags(this, NativeFlags.toInt(flags));
     }

…rg/freedesktop/gstreamer/BufferFlag.java …g/freedesktop/gstreamer/BufferFlags.javasrc/org/freedesktop/gstreamer/BufferFlag.java renamed to src/org/freedesktop/gstreamer/BufferFlags.java src/org/freedesktop/gstreamer/BufferFlag.java renamed to src/org/freedesktop/gstreamer/BufferFlags.java

@@ -26,7 +26,7 @@
 /**
  * A set of buffer flags used to describe properties of a {@link Buffer}.
  */
-public enum BufferFlag implements NativeFlags<BufferFlag> {
+public enum BufferFlags implements NativeFlags<BufferFlags> {
 
     /**  
      * the {@link Buffer} is live data and should be discarded in the PAUSED state.
@@ -109,7 +109,7 @@ public enum BufferFlag implements NativeFlags<BufferFlag> {
 
     private final int value;
 
-    private BufferFlag(int value) {
+    private BufferFlags(int value) {
         this.value = value;
     }
     /**

src/org/freedesktop/gstreamer/PadDirection.java

@@ -19,14 +19,27 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.NativeEnum;
+
 /**
  * The direction of a {@link Pad}.
  */
-public enum PadDirection {
+public enum PadDirection implements NativeEnum<PadDirection> {
     /** The direction is unknown. */
-    UNKNOWN,
+    UNKNOWN(0),
     /** The {@link Pad} is a source pad. */
-    SRC,
+    SRC(1),
     /** The {@link Pad} is a sink pad. */
-    SINK;
+    SINK(2);
+
+    private final int value;
+    
+    private PadDirection(int value) {
+        this.value = value;
+    }
+    
+    @Override
+    public int intValue() {
+        return value;
+    }
 }

src/org/freedesktop/gstreamer/PadLinkReturn.java

@@ -1,4 +1,5 @@
 /* 
+ * Copyright (c) 2019 Neil C Smith
  * Copyright (c) 2007 Wayne Meissner
  * 
  * This file is part of gstreamer-java.
@@ -18,13 +19,13 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.NativeEnum;
 import org.freedesktop.gstreamer.lowlevel.annotations.DefaultEnumValue;
-import org.freedesktop.gstreamer.glib.NativeFlags;
 
 /**
  * Result values from {@link Pad#link(Pad)} and friends.
  */
-public enum PadLinkReturn implements NativeFlags {
+public enum PadLinkReturn implements NativeEnum<PadLinkReturn> {
     /** Link succeeded. */
     OK(0),
     /** Pads have no common grandparent. */
@@ -38,20 +39,21 @@ public enum PadLinkReturn implements NativeFlags {
     /** Pads cannot cooperate in scheduling. */
     NOSCHED(-5),
     /** Refused for some reason. */
-    REFUSED(-6),
+    @DefaultEnumValue
+    REFUSED(-6);
+    
+    private final int value;
 
-    /** The default enum value used when no other value matches the native value */
-    @DefaultEnumValue __UNKNOWN_NATIVE_VALUE(~0);
     PadLinkReturn(int value) {
         this.value = value;
     }
     /**
      * Gets the integer value of the enum.
      * @return The integer value for this enum.
      */
+    @Override
     public int intValue() {
         return value;
     }
 
-    private final int value;
 }

src/org/freedesktop/gstreamer/event/EventType.java

@@ -1,4 +1,5 @@
 /* 
+ * Copyright (c) 2019 Neil C Smith
  * Copyright (c) 2008 Wayne Meissner
  * Copyright (C) 1999,2000 Erik Walthinsen <[email protected]>
  *                    2000 Wim Taymans <[email protected]>