diff --git a/configure.ac b/configure.ac index a893f12b42..924236a651 100644 --- a/configure.ac +++ b/configure.ac @@ -92,14 +92,14 @@ AC_SUBST(GTKSHARP_REQUIRED_VERSION) PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) ## glib-sharp dependancy -GLIBSHARP_REQUIRED_VERSION=2.4.0 +GLIBSHARP_REQUIRED_VERSION=2.13.90 PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GLIBSHARP_REQUIRED_VERSION) AC_SUBST(GLIBSHARP_LIBS) ## probably should make gstreamer-plugins optional ## but generating conditionally the source is not really possible -GSTREAMER_REQUIRED_VERSION=0.10.3 -GSTREAMER_PLUGINS_REQUIRED_VERSION=0.10.3 +GSTREAMER_REQUIRED_VERSION=0.10.22 +GSTREAMER_PLUGINS_REQUIRED_VERSION=0.10.22 AC_SUBST(GSTREAMER_REQUIRED_VERSION) AC_SUBST(GSTREAMER_PLUGINS_REQUIRED_VERSION) PKG_CHECK_MODULES(GST, diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata index c46569ac91..06698cbb09 100644 --- a/gstreamer-sharp/Gstreamer.metadata +++ b/gstreamer-sharp/Gstreamer.metadata @@ -30,6 +30,9 @@ 1 1 + 1 + 1 + 1 HasNoMorePads @@ -84,8 +87,10 @@ 1 1 1 + 1 1 1 + 1 1 1 true @@ -100,6 +105,7 @@ 1 uint 0U + 0xffffffff @@ -126,6 +132,7 @@ 241 257 273 + 289 513 518 514 @@ -141,12 +148,15 @@ Qos Seek Navigation + Latency Upstream Downstream DownstreamOob Both BothOob Last + Last + ElementFlags.Last << 5 MiniObjectFlags.Readonly MiniObjectFlags.Last << 0 MiniObjectFlags.Last << 1 @@ -154,6 +164,7 @@ MiniObjectFlags.Last << 3 MiniObjectFlags.Last << 4 MiniObjectFlags.Last << 8 + Last MiniObjectFlags.Last << 0 MiniObjectFlags.Last << 1 MiniObjectFlags.Last << 0 @@ -167,14 +178,18 @@ ObjectFlags.Last << 1 ObjectFlags.Last << 2 ObjectFlags.Last << 16 + Last ObjectFlags.Last << 0 ObjectFlags.Last << 1 ObjectFlags.Last << 8 + Last ObjectFlags.Last << 0 ObjectFlags.Last << 1 ObjectFlags.Last << 2 ObjectFlags.Last << 3 + ObjectFlags.Last << 4 ObjectFlags.Last << 8 + Last ObjectFlags.Last << 0 ObjectFlags.Last << 4 BinFlags.Last << 0 diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am index 0913789d54..58d540a3d5 100644 --- a/gstreamer-sharp/Makefile.am +++ b/gstreamer-sharp/Makefile.am @@ -15,7 +15,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi gapi_DATA = $(APIS) -glue_includes="gst/gstbin.h gst/gstpipeline.h gst/gstsegment.h" +glue_includes="gst/gst.h" CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs glue/generated.c $(API) $(KEYFILE) DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs diff --git a/gstreamer-sharp/Message.custom b/gstreamer-sharp/Message.custom index 6517bb1660..ffeb0192b1 100644 --- a/gstreamer-sharp/Message.custom +++ b/gstreamer-sharp/Message.custom @@ -1,12 +1,12 @@ - [DllImport("gstreamersharpglue-0.10")] - private extern static IntPtr gstsharp_message_parse_error(IntPtr raw); - - public void ParseError(out string error) - { - IntPtr err = gstsharp_message_parse_error(Handle); - error = GLib.Marshaller.PtrToStringGFree(err); - } + [DllImport("gstreamersharpglue-0.10")] + private extern static IntPtr gstsharp_message_parse_error(IntPtr raw); + + public void ParseError(out string error) + { + IntPtr err = gstsharp_message_parse_error(Handle); + error = GLib.Marshaller.PtrToStringGFree(err); + } [DllImport("gstreamersharpglue-0.10")] private extern static IntPtr gstsharp_message_error_new(); diff --git a/gstreamer-sharp/gstreamer-api.raw b/gstreamer-sharp/gstreamer-api.raw index b940914ead..b3c755cae0 100644 --- a/gstreamer-sharp/gstreamer-api.raw +++ b/gstreamer-sharp/gstreamer-api.raw @@ -1,5 +1,5 @@ - + - gstreamer-0.10.3/gst - gstreamer-0.10.3/gst/gstinterface.h - gstreamer-0.10.3/gst/gsturi.h + gstreamer-0.10.22/gst + gstreamer-0.10.22/gst/gstinterface.h + gstreamer-0.10.22/gst/gsturi.h + gstreamer-0.10.22/gst/gstpreset.h