Move GObject, GError, GInetSocketAddress, GSocket and Closure into GLib sub-package.

neilcsmith-net · neilcsmith-net · commit 48088e5bb7d5 · 2019-01-29T15:22:54.000Z
diff --git a/src/org/freedesktop/gstreamer/Bin.java b/src/org/freedesktop/gstreamer/Bin.java
@@ -23,6 +23,7 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.GError;
 import static org.freedesktop.gstreamer.lowlevel.GstBinAPI.GSTBIN_API;
 import static org.freedesktop.gstreamer.lowlevel.GstParseAPI.GSTPARSE_API;
 
diff --git a/src/org/freedesktop/gstreamer/Gst.java b/src/org/freedesktop/gstreamer/Gst.java
@@ -20,6 +20,9 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.GSocket;
+import org.freedesktop.gstreamer.glib.GInetSocketAddress;
+import org.freedesktop.gstreamer.glib.GError;
 import static org.freedesktop.gstreamer.lowlevel.GstAPI.GST_API;
 
 import java.lang.reflect.Field;
diff --git a/src/org/freedesktop/gstreamer/GstException.java b/src/org/freedesktop/gstreamer/GstException.java
@@ -19,6 +19,8 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.GError;
+
 /**
  * Thrown when a gstreamer error occurs.
  */
diff --git a/src/org/freedesktop/gstreamer/GstObject.java b/src/org/freedesktop/gstreamer/GstObject.java
@@ -21,6 +21,7 @@
  */
 
 package org.freedesktop.gstreamer;
+import org.freedesktop.gstreamer.glib.GObject;
 import java.util.EventListener;
 import java.util.EventListenerProxy;
 import java.util.HashMap;
diff --git a/src/org/freedesktop/gstreamer/Pipeline.java b/src/org/freedesktop/gstreamer/Pipeline.java
@@ -20,6 +20,7 @@
  */
 
 package org.freedesktop.gstreamer;
+import org.freedesktop.gstreamer.glib.GError;
 import java.util.concurrent.TimeUnit;
 
 import com.sun.jna.Pointer;
diff --git a/src/org/freedesktop/gstreamer/StreamInfo.java b/src/org/freedesktop/gstreamer/StreamInfo.java
@@ -19,6 +19,7 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.GObject;
 import com.sun.jna.Pointer;
 
 /**
diff --git a/src/org/freedesktop/gstreamer/controller/ControlSource.java b/src/org/freedesktop/gstreamer/controller/ControlSource.java
@@ -18,7 +18,7 @@
 
 package org.freedesktop.gstreamer.controller;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 
 import com.sun.jna.Pointer;
 
diff --git a/src/org/freedesktop/gstreamer/controller/LFOControlSource.java b/src/org/freedesktop/gstreamer/controller/LFOControlSource.java
@@ -18,7 +18,7 @@
 
 package org.freedesktop.gstreamer.controller;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 
 import com.sun.jna.Pointer;
 
diff --git a/src/org/freedesktop/gstreamer/glib/Closure.java b/src/org/freedesktop/gstreamer/glib/Closure.java
@@ -16,7 +16,7 @@
  * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.freedesktop.gstreamer;
+package org.freedesktop.gstreamer.glib;
 
 /**
  * A signal callback.
diff --git a/src/org/freedesktop/gstreamer/glib/GCancellable.java b/src/org/freedesktop/gstreamer/glib/GCancellable.java
@@ -1,6 +1,5 @@
 package org.freedesktop.gstreamer.glib;
 
-import org.freedesktop.gstreamer.GObject;
 import org.freedesktop.gstreamer.lowlevel.GioAPI;
 
 public class GCancellable extends GObject{
diff --git a/src/org/freedesktop/gstreamer/glib/GError.java b/src/org/freedesktop/gstreamer/glib/GError.java
@@ -16,7 +16,7 @@
  * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.freedesktop.gstreamer;
+package org.freedesktop.gstreamer.glib;
 
 import org.freedesktop.gstreamer.lowlevel.GstAPI.GErrorStruct;
 
@@ -32,7 +32,9 @@ public class GError {
      * <b> Note: </b> This takes ownership of the passed in GErrorStruct.
      * @param error 
      */
-    GError(GErrorStruct error) {
+    // rewrite to accept code and message - handle struct elsewhere
+    @Deprecated
+    public GError(GErrorStruct error) {
         code = error.getCode();
         message = error.getMessage();
         GLIB_API.g_error_free(error);
diff --git a/src/org/freedesktop/gstreamer/glib/GInetAddress.java b/src/org/freedesktop/gstreamer/glib/GInetAddress.java
@@ -1,6 +1,5 @@
 package org.freedesktop.gstreamer.glib;
 
-import org.freedesktop.gstreamer.GObject;
 import org.freedesktop.gstreamer.lowlevel.GioAPI;
 
 public class GInetAddress extends GObject{
diff --git a/src/org/freedesktop/gstreamer/glib/GInetSocketAddress.java b/src/org/freedesktop/gstreamer/glib/GInetSocketAddress.java
@@ -1,10 +1,11 @@
-package org.freedesktop.gstreamer;
+package org.freedesktop.gstreamer.glib;
 
 import org.freedesktop.gstreamer.glib.GInetAddress;
 import org.freedesktop.gstreamer.glib.GSocketAddress;
 import org.freedesktop.gstreamer.lowlevel.GioAPI;
 
 import com.sun.jna.Pointer;
+import org.freedesktop.gstreamer.GstException;
 
 public class GInetSocketAddress extends GSocketAddress{
 
diff --git a/src/org/freedesktop/gstreamer/glib/GObject.java b/src/org/freedesktop/gstreamer/glib/GObject.java
@@ -21,7 +21,7 @@
  * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.freedesktop.gstreamer;
+package org.freedesktop.gstreamer.glib;
 
 import static org.freedesktop.gstreamer.lowlevel.GObjectAPI.GOBJECT_API;
 import static org.freedesktop.gstreamer.lowlevel.GSignalAPI.GSIGNAL_API;
@@ -59,6 +59,7 @@
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.PointerByReference;
 import java.util.Arrays;
+import org.freedesktop.gstreamer.ClockTime;
 
 /**
  * This is an abstract class providing some GObject-like facilities in a common 
diff --git a/src/org/freedesktop/gstreamer/glib/GSocket.java b/src/org/freedesktop/gstreamer/glib/GSocket.java
@@ -1,5 +1,7 @@
-package org.freedesktop.gstreamer;
+package org.freedesktop.gstreamer.glib;
 
+import org.freedesktop.gstreamer.glib.GError;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.glib.GCancellable;
 import org.freedesktop.gstreamer.glib.GSocketFamily;
 import org.freedesktop.gstreamer.glib.GSocketProtocol;
@@ -8,6 +10,7 @@
 import org.freedesktop.gstreamer.lowlevel.GstAPI.GErrorStruct;
 
 import com.sun.jna.Pointer;
+import org.freedesktop.gstreamer.GstException;
 
 public class GSocket extends GObject{
 
diff --git a/src/org/freedesktop/gstreamer/glib/GSocketAddress.java b/src/org/freedesktop/gstreamer/glib/GSocketAddress.java
@@ -1,7 +1,5 @@
 package org.freedesktop.gstreamer.glib;
 
-import org.freedesktop.gstreamer.GObject;
-
 public class GSocketAddress extends GObject{
 
 	public static final String GTYPE_NAME = "GSocketAddress";
diff --git a/src/org/freedesktop/gstreamer/interfaces/ColorBalanceChannel.java b/src/org/freedesktop/gstreamer/interfaces/ColorBalanceChannel.java
@@ -21,7 +21,7 @@
 
 import static org.freedesktop.gstreamer.lowlevel.GstColorBalanceAPI.GSTCOLORBALANCE_API;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.lowlevel.GstColorBalanceAPI;
 
 import com.sun.jna.Pointer;
diff --git a/src/org/freedesktop/gstreamer/interfaces/GstInterface.java b/src/org/freedesktop/gstreamer/interfaces/GstInterface.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 import org.freedesktop.gstreamer.Element;
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.lowlevel.GlibAPI.GList;
 
 import com.sun.jna.Pointer;
diff --git a/src/org/freedesktop/gstreamer/interfaces/Property.java b/src/org/freedesktop/gstreamer/interfaces/Property.java
@@ -19,7 +19,7 @@
 
 package org.freedesktop.gstreamer.interfaces;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.lowlevel.GObjectAPI;
 
 import com.sun.jna.Pointer;
diff --git a/src/org/freedesktop/gstreamer/lowlevel/GObjectAPI.java b/src/org/freedesktop/gstreamer/lowlevel/GObjectAPI.java
@@ -25,7 +25,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.glib.GQuark;
 import org.freedesktop.gstreamer.lowlevel.GValueAPI.GValue;
 
diff --git a/src/org/freedesktop/gstreamer/lowlevel/GSignalAPI.java b/src/org/freedesktop/gstreamer/lowlevel/GSignalAPI.java
@@ -23,7 +23,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.glib.GQuark;
 import org.freedesktop.gstreamer.lowlevel.GObjectAPI.GClosureNotify;
 
diff --git a/src/org/freedesktop/gstreamer/lowlevel/GValueAPI.java b/src/org/freedesktop/gstreamer/lowlevel/GValueAPI.java
@@ -25,7 +25,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.lowlevel.annotations.CallerOwnsReturn;
 import org.freedesktop.gstreamer.lowlevel.annotations.Invalidate;
 
diff --git a/src/org/freedesktop/gstreamer/lowlevel/NativeObject.java b/src/org/freedesktop/gstreamer/lowlevel/NativeObject.java
@@ -27,7 +27,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.freedesktop.gstreamer.GObject;
+import org.freedesktop.gstreamer.glib.GObject;
 import org.freedesktop.gstreamer.Gst;
 import org.freedesktop.gstreamer.MiniObject;
 import org.freedesktop.gstreamer.lowlevel.annotations.HasSubtype;
diff --git a/test/org/freedesktop/gstreamer/BinTest.java b/test/org/freedesktop/gstreamer/BinTest.java
@@ -19,6 +19,7 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.GError;
 import java.util.ArrayList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/test/org/freedesktop/gstreamer/GCTracker.java b/test/org/freedesktop/gstreamer/GCTracker.java
@@ -19,6 +19,7 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.GObject;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicBoolean;
 
diff --git a/test/org/freedesktop/gstreamer/PipelineTest.java b/test/org/freedesktop/gstreamer/PipelineTest.java
@@ -20,6 +20,8 @@
 
 package org.freedesktop.gstreamer;
 
+import org.freedesktop.gstreamer.glib.GError;
+import org.freedesktop.gstreamer.glib.GObject;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
