diff --git a/doc/en/Gst/DecodeBin.xml b/doc/en/Gst.BasePlugins/DecodeBin.xml similarity index 71% rename from doc/en/Gst/DecodeBin.xml rename to doc/en/Gst.BasePlugins/DecodeBin.xml index 31d1c0a6ff..007f861358 100644 --- a/doc/en/Gst/DecodeBin.xml +++ b/doc/en/Gst.BasePlugins/DecodeBin.xml @@ -1,4 +1,4 @@ - + gstreamer-sharp @@ -15,7 +15,7 @@ - + Constructor0.9.5.99To be added.To be added.To be added. Constructor @@ -24,12 +24,12 @@ To be added.To be added.To be added. - + Event 0.9.5.99 - Gst.NewDecodedPadHandler + Gst.BasePlugins.NewDecodedPadHandler To be added.To be added. diff --git a/doc/en/Gst/NewDecodedPadArgs.xml b/doc/en/Gst.BasePlugins/NewDecodedPadArgs.xml similarity index 95% rename from doc/en/Gst/NewDecodedPadArgs.xml rename to doc/en/Gst.BasePlugins/NewDecodedPadArgs.xml index 157332328b..4dfe306e66 100644 --- a/doc/en/Gst/NewDecodedPadArgs.xml +++ b/doc/en/Gst.BasePlugins/NewDecodedPadArgs.xml @@ -1,4 +1,4 @@ - + gstreamer-sharp diff --git a/doc/en/Gst/NewDecodedPadHandler.xml b/doc/en/Gst.BasePlugins/NewDecodedPadHandler.xml similarity index 80% rename from doc/en/Gst/NewDecodedPadHandler.xml rename to doc/en/Gst.BasePlugins/NewDecodedPadHandler.xml index 4e3e1f4269..9143006d4b 100644 --- a/doc/en/Gst/NewDecodedPadHandler.xml +++ b/doc/en/Gst.BasePlugins/NewDecodedPadHandler.xml @@ -1,4 +1,4 @@ - + gstreamer-sharp @@ -9,7 +9,7 @@ - + System.Void diff --git a/doc/en/Gst/PlayBin.xml b/doc/en/Gst.BasePlugins/PlayBin.xml similarity index 90% rename from doc/en/Gst/PlayBin.xml rename to doc/en/Gst.BasePlugins/PlayBin.xml index 50ae194f83..b0235cc895 100644 --- a/doc/en/Gst/PlayBin.xml +++ b/doc/en/Gst.BasePlugins/PlayBin.xml @@ -1,4 +1,4 @@ - + gstreamer-sharp @@ -20,7 +20,7 @@ - + Constructor0.9.5.99To be added.To be added.To be added. Constructor diff --git a/doc/en/Gst/HaveTypeArgs.xml b/doc/en/Gst.CorePlugins/HaveTypeArgs.xml similarity index 96% rename from doc/en/Gst/HaveTypeArgs.xml rename to doc/en/Gst.CorePlugins/HaveTypeArgs.xml index 97c221b990..0b72f5df6c 100644 --- a/doc/en/Gst/HaveTypeArgs.xml +++ b/doc/en/Gst.CorePlugins/HaveTypeArgs.xml @@ -1,4 +1,4 @@ - + gstreamer-sharp diff --git a/doc/en/Gst/HaveTypeHandler.xml b/doc/en/Gst.CorePlugins/HaveTypeHandler.xml similarity index 82% rename from doc/en/Gst/HaveTypeHandler.xml rename to doc/en/Gst.CorePlugins/HaveTypeHandler.xml index c79328cade..ba5d16e237 100644 --- a/doc/en/Gst/HaveTypeHandler.xml +++ b/doc/en/Gst.CorePlugins/HaveTypeHandler.xml @@ -1,4 +1,4 @@ - + gstreamer-sharp @@ -9,7 +9,7 @@ - + System.Void diff --git a/doc/en/Gst/TypeFindElement.xml b/doc/en/Gst.CorePlugins/TypeFindElement.xml similarity index 80% rename from doc/en/Gst/TypeFindElement.xml rename to doc/en/Gst.CorePlugins/TypeFindElement.xml index 0794593c84..f825be5d72 100644 --- a/doc/en/Gst/TypeFindElement.xml +++ b/doc/en/Gst.CorePlugins/TypeFindElement.xml @@ -1,4 +1,4 @@ - + gstreamer-sharp @@ -19,7 +19,7 @@ - + Constructor0.9.5.99To be added.To be added.To be added. Constructor @@ -37,20 +37,20 @@ Gst.Caps To be added.To be added.To be added. - + Event 0.9.5.99 - Gst.HaveTypeHandler + Gst.CorePlugins.HaveTypeHandler To be added.To be added. - + Method 0.9.5.99 - Gst.TypeFindElement + Gst.CorePlugins.TypeFindElement To be added.To be added.To be added.To be added. diff --git a/doc/en/Gst/ImplementsInterface.xml b/doc/en/Gst/ImplementsInterface.xml index 0cda3c0c7e..3478a252ca 100644 --- a/doc/en/Gst/ImplementsInterface.xml +++ b/doc/en/Gst/ImplementsInterface.xml @@ -20,18 +20,9 @@ 0.9.5.99 - - System.Boolean - - - - - - To be added. - To be added. - To be added. - To be added. - + System.Boolean + + To be added.To be added.To be added.To be added. diff --git a/doc/en/Gst/ImplementsInterfaceAdapter.xml b/doc/en/Gst/ImplementsInterfaceAdapter.xml index f9aae225f3..28e0e9ce0a 100644 --- a/doc/en/Gst/ImplementsInterfaceAdapter.xml +++ b/doc/en/Gst/ImplementsInterfaceAdapter.xml @@ -17,6 +17,12 @@ To be added. + + + + + + Constructor @@ -24,114 +30,58 @@ 0.9.5.99 - - To be added. - To be added. - - - + To be added.To be added. + Constructor 0.9.5.99 - - - - - To be added. - To be added. - To be added. - - - + + To be added.To be added.To be added. + Constructor 0.9.5.99 - - - - - To be added. - To be added. - To be added. - - - + + To be added.To be added.To be added. + Method 0.9.5.99 - - Gst.ImplementsInterface - - - - - - To be added. - To be added. - To be added. - To be added. - - - + Gst.ImplementsInterface + + To be added.To be added.To be added.To be added. + Method 0.9.5.99 - - Gst.ImplementsInterface - - - - - - - To be added. - To be added. - To be added. - To be added. - To be added. - - - + Gst.ImplementsInterface + + To be added.To be added.To be added.To be added.To be added. + Property 0.9.5.99 - - Gst.ImplementsInterfaceImplementor - - - To be added. - To be added. - To be added. - - - + Gst.ImplementsInterfaceImplementor + To be added.To be added.To be added. + Method 0.9.5.99 - - System.Boolean - - - - - - To be added. - To be added. - To be added. - To be added. - + System.Boolean + + To be added.To be added.To be added.To be added. diff --git a/doc/en/Gst/ImplementsInterfaceImplementor.xml b/doc/en/Gst/ImplementsInterfaceImplementor.xml index 5e16df531b..8257021156 100644 --- a/doc/en/Gst/ImplementsInterfaceImplementor.xml +++ b/doc/en/Gst/ImplementsInterfaceImplementor.xml @@ -25,18 +25,9 @@ 0.9.5.99 - - System.Boolean - - - - - - To be added. - To be added. - To be added. - To be added. - + System.Boolean + + To be added.To be added.To be added.To be added. diff --git a/doc/en/index.xml b/doc/en/index.xml index e5d636f0c3..a0437f1cea 100644 --- a/doc/en/index.xml +++ b/doc/en/index.xml @@ -39,7 +39,6 @@ - @@ -68,8 +67,6 @@ - - @@ -95,8 +92,6 @@ - - @@ -144,7 +139,6 @@ - @@ -190,7 +184,6 @@ - @@ -206,6 +199,17 @@ + + + + + + + + + + + gst-sharp diff --git a/doc/en/ns-Gst.BasePlugins.xml b/doc/en/ns-Gst.BasePlugins.xml new file mode 100644 index 0000000000..311cc3cc4b --- /dev/null +++ b/doc/en/ns-Gst.BasePlugins.xml @@ -0,0 +1,6 @@ + + + To be added. + To be added. + + diff --git a/doc/en/ns-Gst.CorePlugins.xml b/doc/en/ns-Gst.CorePlugins.xml new file mode 100644 index 0000000000..c61e352476 --- /dev/null +++ b/doc/en/ns-Gst.CorePlugins.xml @@ -0,0 +1,6 @@ + + + To be added. + To be added. + + diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am index f487ac257b..21c31df1ed 100644 --- a/gstreamer-sharp/Makefile.am +++ b/gstreamer-sharp/Makefile.am @@ -44,13 +44,12 @@ sources = \ AssemblyInfo.cs \ GError.cs \ Value.cs \ - plugins-base/PlayBin.cs \ - plugins-base/DecodeBin.cs \ - plugins-base/TypeFindElement.cs \ GstSharp.PadQueryTypeFunctionNative.cs \ PadQueryTypeFunction.cs \ TypeFindDelegates.cs \ - PresetDefault.cs + PresetDefault.cs \ + coreplugins/*.cs \ + baseplugins/*.cs overrides = \ override/URIHandlerAdapter.cs diff --git a/gstreamer-sharp/plugins-base/DecodeBin.cs b/gstreamer-sharp/baseplugins/DecodeBin.cs similarity index 94% rename from gstreamer-sharp/plugins-base/DecodeBin.cs rename to gstreamer-sharp/baseplugins/DecodeBin.cs index bd668af860..e7b946cd2c 100644 --- a/gstreamer-sharp/plugins-base/DecodeBin.cs +++ b/gstreamer-sharp/baseplugins/DecodeBin.cs @@ -10,7 +10,7 @@ using System; using Gst; -namespace Gst +namespace Gst.BasePlugins { public delegate void NewDecodedPadHandler(object o, NewDecodedPadArgs args); @@ -32,6 +32,10 @@ namespace Gst public DecodeBin(IntPtr raw) : base(raw) { } + + public DecodeBin (GLib.Object o) : base (o.Handle) + { + } protected virtual void OnNewDecodedPad(object o, GLib.SignalArgs args) { diff --git a/gstreamer-sharp/plugins-base/PlayBin.cs b/gstreamer-sharp/baseplugins/PlayBin.cs similarity index 97% rename from gstreamer-sharp/plugins-base/PlayBin.cs rename to gstreamer-sharp/baseplugins/PlayBin.cs index ee0e61a771..a3de5a4bb7 100644 --- a/gstreamer-sharp/plugins-base/PlayBin.cs +++ b/gstreamer-sharp/baseplugins/PlayBin.cs @@ -11,7 +11,7 @@ using System; using System.Collections; using System.Runtime.InteropServices; -namespace Gst +namespace Gst.BasePlugins { public class PlayBin : Pipeline { @@ -19,6 +19,8 @@ namespace Gst { } + public PlayBin(GLib.Object o) : base (o.Handle) {} + [GLib.Property("uri")] public string Uri { get { diff --git a/gstreamer-sharp/plugins-base/TypeFindElement.cs b/gstreamer-sharp/coreplugins/TypeFindElement.cs similarity index 92% rename from gstreamer-sharp/plugins-base/TypeFindElement.cs rename to gstreamer-sharp/coreplugins/TypeFindElement.cs index 744726116a..cf1b0f9dd5 100644 --- a/gstreamer-sharp/plugins-base/TypeFindElement.cs +++ b/gstreamer-sharp/coreplugins/TypeFindElement.cs @@ -9,7 +9,7 @@ using System; -namespace Gst +namespace Gst.CorePlugins { public delegate void HaveTypeHandler(object o, HaveTypeArgs args); @@ -34,9 +34,13 @@ namespace Gst { } + public TypeFindElement(GLib.Object o) : base(o.Handle) + { + } + public static TypeFindElement Make(string name) { - return ElementFactory.Make("typefind", name) as TypeFindElement; + return new TypeFindElement (ElementFactory.Make("typefind", name)); } protected virtual void OnHaveType(object o, GLib.SignalArgs args) diff --git a/samples/DecodeBinTranscoder.cs b/samples/DecodeBinTranscoder.cs index 48b333b7d6..dbae8e94a0 100644 --- a/samples/DecodeBinTranscoder.cs +++ b/samples/DecodeBinTranscoder.cs @@ -9,6 +9,7 @@ using System; using Gst; +using Gst.BasePlugins; public delegate void ErrorHandler(object o, ErrorArgs args); public delegate void ProgressHandler(object o, ProgressArgs args); @@ -95,7 +96,7 @@ public class DecodeBinTranscoder : IDisposable filesink = ElementFactory.Make("filesink", "filesink"); audioconvert = ElementFactory.Make("audioconvert", "audioconvert"); encoder = ElementFactory.Make("wavenc", "wavenc"); - decodebin = ElementFactory.Make("decodebin", "decodebin") as DecodeBin; + decodebin = new DecodeBin (ElementFactory.Make("decodebin", "decodebin")); decodebin.NewDecodedPad += OnNewDecodedPad; pipeline.Add (filesrc, decodebin, audioconvert, encoder, filesink); diff --git a/samples/PlayBinPlayer.cs b/samples/PlayBinPlayer.cs index 23ca5d419e..da5af69c9f 100644 --- a/samples/PlayBinPlayer.cs +++ b/samples/PlayBinPlayer.cs @@ -4,6 +4,7 @@ using System; using GLib; using Gst; +using Gst.BasePlugins; public class PlayBinPlayer @@ -25,7 +26,7 @@ public class PlayBinPlayer Gst.Application.Init (); loop = new MainLoop (); - play = ElementFactory.Make ("playbin", "play") as PlayBin; + play = new PlayBin (ElementFactory.Make ("playbin", "play")); if (play == null) { Console.WriteLine ("error creating a playbin gstreamer object"); diff --git a/samples/TypeFind.cs b/samples/TypeFind.cs index 88ee4aa1b9..8915fe2919 100644 --- a/samples/TypeFind.cs +++ b/samples/TypeFind.cs @@ -1,5 +1,6 @@ using System; using Gst; +using Gst.CorePlugins; public static class GstTypefindTest {