gl: forward declare some enums

Specifically the GstGLTextureTarget enum

diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index 10a7d8e..97d0cbc 100644 (file)
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -63,6 +63,7 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
        gstglviewconvert.h \
        gstgloverlaycompositor.h \
        gstgl_fwd.h \
+       gstgl_enums.h \
        gl.h
 
 libgstgl_@GST_API_VERSION@_la_LIBADD = \

diff --git a/gst-libs/gst/gl/gl.h b/gst-libs/gst/gl/gl.h
index ce9fc42..8d8a045 100644 (file)
--- a/gst-libs/gst/gl/gl.h
+++ b/gst-libs/gst/gl/gl.h
@@ -27,6 +27,7 @@
 #endif
 
 #include <gst/gl/gstgl_fwd.h>
+#include <gst/gl/gstgl_enums.h>
 #include <gst/gl/gstglconfig.h>
 #include <gst/gl/gstglapi.h>
 #include <gst/gl/gstgldisplay.h>

diff --git a/gst-libs/gst/gl/gstgl_enums.h b/gst-libs/gst/gl/gstgl_enums.h
new file mode 100644 (file)
index 0000000..c4578e4
--- /dev/null
+++ b/gst-libs/gst/gl/gstgl_enums.h
@@ -0,0 +1,32 @@
+/*
+ * GStreamer
+ * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GST_GL_ENUMS_H_
+#define _GST_GL_ENUMS_H_
+
+typedef enum
+{
+  GST_GL_TEXTURE_TARGET_NONE,
+  GST_GL_TEXTURE_TARGET_2D,
+  GST_GL_TEXTURE_TARGET_RECTANGLE,
+  GST_GL_TEXTURE_TARGET_EXTERNAL_OES,
+} GstGLTextureTarget;
+
+#endif /* _GST_GL_ENUMS_H_ */

diff --git a/gst-libs/gst/gl/gstglmemory.h b/gst-libs/gst/gl/gstglmemory.h
index 2ac249c..fe8593d 100644 (file)
--- a/gst-libs/gst/gl/gstglmemory.h
+++ b/gst-libs/gst/gl/gstglmemory.h
@@ -50,14 +50,6 @@ typedef enum _GstGLMemoryTransfer
 
 #define GST_GL_MEMORY_ADD_TRANSFER(mem,state) ((GstGLMemory *)mem)->transfer_state |= state
 
-typedef enum
-{
-  GST_GL_TEXTURE_TARGET_NONE,
-  GST_GL_TEXTURE_TARGET_2D,
-  GST_GL_TEXTURE_TARGET_RECTANGLE,
-  GST_GL_TEXTURE_TARGET_EXTERNAL_OES,
-} GstGLTextureTarget;
-
 #define GST_GL_TEXTURE_TARGET_2D_STR "2D"
 #define GST_GL_TEXTURE_TARGET_RECTANGLE_STR "rectangle"
 #define GST_GL_TEXTURE_TARGET_EXTERNAL_OES_STR "external-oes"