diff --git a/.gitignore b/.gitignore
index eadac0c5ea..cde114e011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ ltmain.sh
missing
stamp-h
+# gedit temporary files
+*.*~
+
# glue binaries/objects (FIXME: kill the glue, kthxbye)
sources/glue/.deps/
sources/glue/*.o
diff --git a/Makefile.am b/Makefile.am
index 97924f7d3d..16c38f4d94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,4 +7,4 @@ EXTRA_DIST = gstreamer-sharp-1.0.pc.in out/gstreamer-sharp.dll.config
DISTCLEANFILES = gstreamer-sharp-1.0.pc
regenerate:
- bindinate --name=gstreamer --regenerate=true --merge-with=GstApp-1.0,GstAudio-1.0,GstBase-1.0,GstController-1.0,GstFft-1.0,GstInsertBin-1.0,GstMpegts-1.0,GstNet-1.0,GstPbutils-1.0,GstRiff-1.0,GstRtp-1.0,GstRtsp-1.0,GstSdp-1.0,GstTag-1.0,GstVideo-1.0 --gir=Gst-1.0
+ bindinate --name=gstreamer --regenerate=true --merge-with=GstApp-1.0,GstAudio-1.0,GstBase-1.0,GstController-1.0,GstFft-1.0,GstMpegts-1.0,GstNet-1.0,GstPbutils-1.0,GstRiff-1.0,GstRtp-1.0,GstRtsp-1.0,GstSdp-1.0,GstTag-1.0,GstVideo-1.0 --gir=Gst-1.0
diff --git a/sources/Gst-1.0-merged.metadata b/sources/Gst-1.0-merged.metadata
new file mode 100644
index 0000000000..be2fb18cc7
--- /dev/null
+++ b/sources/Gst-1.0-merged.metadata
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/sources/custom/MiniObject.cs b/sources/custom/MiniObject.cs
new file mode 100644
index 0000000000..b5cc636ef7
--- /dev/null
+++ b/sources/custom/MiniObject.cs
@@ -0,0 +1,45 @@
+// Copyright (C) 2014 Stephan Sundermann
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02110-1301 USA
+
+namespace Gst {
+
+ using System;
+ using System.Runtime.InteropServices;
+
+ partial class MiniObject
+ {
+ protected MiniObject () {}
+
+ [DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ static extern bool gst_mini_object_replace(IntPtr olddata, IntPtr newdata);
+
+ public static bool Replace(ref Gst.MiniObject olddata, Gst.MiniObject newdata) {
+ return gst_mini_object_replace(olddata.Handle, newdata == null ? IntPtr.Zero : newdata.Handle);
+ }
+
+ public static bool Replace(ref Gst.MiniObject olddata) {
+ return Replace (ref olddata, null);
+ }
+
+ [DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ static extern bool gst_mini_object_take(IntPtr olddata, IntPtr newdata);
+
+ public static bool Take(ref Gst.MiniObject olddata, Gst.MiniObject newdata) {
+ return gst_mini_object_take(olddata.Handle, newdata == null ? IntPtr.Zero : newdata.Handle);
+ }
+ }
+}
diff --git a/sources/custom/VideoGLUploadMeta.cs b/sources/custom/VideoGLUploadMeta.cs
new file mode 100644
index 0000000000..38502869dd
--- /dev/null
+++ b/sources/custom/VideoGLUploadMeta.cs
@@ -0,0 +1,29 @@
+// Copyright (C) 2014 Stephan Sundermann
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02110-1301 USA
+
+namespace Gst.Video {
+ using System;
+ using System.Runtime.InteropServices;
+
+ partial struct VideoGLTextureUploadMeta
+ {
+ public bool Equals (VideoGLTextureUploadMeta other)
+ {
+ return Meta.Equals (other.Meta) && TextureOrientation.Equals (other.TextureOrientation) && NTextures.Equals (other.NTextures) && TextureType.Equals (other.TextureType);
+ }
+ }
+}
diff --git a/sources/gstreamer-sharp-api.raw b/sources/gstreamer-sharp-api.raw
index 145ab3763a..88f169f76b 100644
--- a/sources/gstreamer-sharp-api.raw
+++ b/sources/gstreamer-sharp-api.raw
@@ -7602,6 +7602,12 @@
+
+
+ missing glib:type-name
+
+
+
@@ -10931,8 +10937,8 @@
-
-
+
+
@@ -16056,131 +16062,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -17447,7 +17328,7 @@
-
+
@@ -18946,8 +18827,8 @@
-
-
+
+
@@ -25487,7 +25368,7 @@
-
+ missing glib:type-name
diff --git a/sources/gstreamer-sharp.metadata b/sources/gstreamer-sharp.metadata
index 84cce8e371..4f77663ae2 100644
--- a/sources/gstreamer-sharp.metadata
+++ b/sources/gstreamer-sharp.metadata
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
true
+ truegpointergpointergpointer
@@ -46,14 +47,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
truetrue
- struct
- true
- struct
- true
+ true
+ GstMiniObject
+ true
+ truetrue
- struct
- true
- true
+ true
+ true1
@@ -82,10 +82,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
truetrue
-
- /api/namespace//boxed[field/@cname='mini_object']
- true
-
1
@@ -119,9 +115,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
/api/namespace/object[@cname='GstPad']
- true
- true
- true
+ true
+ true
+ truegpointer
@@ -192,6 +188,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ true
+ true
+ true
+ truetrue