diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-09-16 08:38:59 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-09-16 08:38:59 +0200 |
| commit | f0f8e19694562287c4433b9ba6b60dda33606f6b (patch) | |
| tree | dad337a58eabf09a1b3afa4e88868794fb7d9cd7 | |
| parent | 1689d6a031cb2a21fad76ebabb8662342a18d40e (diff) | |
Update glib-sharp to SVN trunk
Also fix some previous errors with managed types.
38 files changed, 1799 insertions, 801 deletions
diff --git a/gstreamer-sharp/glib-sharp/Argv.cs b/gstreamer-sharp/glib-sharp/Argv.cs index 27ccb56..9339cb4 100644 --- a/gstreamer-sharp/glib-sharp/Argv.cs +++ b/gstreamer-sharp/glib-sharp/Argv.cs @@ -1,4 +1,4 @@ -// GLib.Argv.cs : Argv marshaling class +// Gst.GLib.Argv.cs : Argv marshaling class // // Author: Mike Kestner <mkestner@novell.com> // diff --git a/gstreamer-sharp/glib-sharp/DelegateWrapper.cs b/gstreamer-sharp/glib-sharp/DelegateWrapper.cs index e1ab3a1..5d60c1b 100644 --- a/gstreamer-sharp/glib-sharp/DelegateWrapper.cs +++ b/gstreamer-sharp/glib-sharp/DelegateWrapper.cs @@ -56,8 +56,8 @@ namespace Gst.GLib { // currently only GObjects store // callbacks over the long-term - if (o is GLib.Object) { - AddDestroyNotify ((GLib.Object) o); + if (o is Gst.GLib.Object) { + AddDestroyNotify ((Gst.GLib.Object) o); } } else { // If o is null, we cannot ask for a destroy @@ -75,7 +75,7 @@ namespace Gst.GLib { [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] private static extern void g_object_set_data_full (IntPtr obj, IntPtr name, IntPtr data, DestroyNotify destroy); - private void AddDestroyNotify (GLib.Object o) { + private void AddDestroyNotify (Gst.GLib.Object o) { // This is a bit of an ugly hack. There is no // way of getting a destroy notification // explicitly, so we set some data and ask @@ -92,7 +92,7 @@ namespace Gst.GLib { } } - // This callback is invoked by GLib to indicate that the + // This callback is invoked by Gst.GLib to indicate that the // object that owned the native delegate wrapper no longer // exists and the instance of the delegate itself is removed from the hash table. private void OnDestroy (IntPtr data) { diff --git a/gstreamer-sharp/glib-sharp/DestroyNotify.cs b/gstreamer-sharp/glib-sharp/DestroyNotify.cs index 1ae0605..03ebe20 100644 --- a/gstreamer-sharp/glib-sharp/DestroyNotify.cs +++ b/gstreamer-sharp/glib-sharp/DestroyNotify.cs @@ -1,4 +1,4 @@ -// GLib.DestroyNotify.cs - internal DestroyNotify helper +// Gst.GLib.DestroyNotify.cs - internal DestroyNotify helper // // Author: Mike Kestner <mkestner@novell.com> // diff --git a/gstreamer-sharp/glib-sharp/EnumWrapper.cs b/gstreamer-sharp/glib-sharp/EnumWrapper.cs index 5d1f2bb..b6f38d7 100644 --- a/gstreamer-sharp/glib-sharp/EnumWrapper.cs +++ b/gstreamer-sharp/glib-sharp/EnumWrapper.cs @@ -24,7 +24,7 @@ namespace Gst.GLib { using System; using System.Runtime.InteropServices; - [Obsolete ("Replaced by direct enum type casts to/from GLib.Value")] + [Obsolete ("Replaced by direct enum type casts to/from Gst.GLib.Value")] public class EnumWrapper { int val; public bool flags; diff --git a/gstreamer-sharp/glib-sharp/ExceptionManager.cs b/gstreamer-sharp/glib-sharp/ExceptionManager.cs index 131c535..8900671 100644 --- a/gstreamer-sharp/glib-sharp/ExceptionManager.cs +++ b/gstreamer-sharp/glib-sharp/ExceptionManager.cs @@ -1,4 +1,4 @@ -// GLib.Application.cs - static Application class +// Gst.GLib.Application.cs - static Application class // // Authors: Mike Kestner <mkestner@novell.com> // @@ -53,7 +53,7 @@ namespace Gst.GLib { { if (UnhandledException == null) { Console.Error.WriteLine ("Exception in Gtk# callback delegate"); - Console.Error.WriteLine (" Note: Applications can use GLib.ExceptionManager.UnhandledException to handle the exception."); + Console.Error.WriteLine (" Note: Applications can use Gst.GLib.ExceptionManager.UnhandledException to handle the exception."); Console.Error.WriteLine (e); Console.Error.WriteLine (new System.Diagnostics.StackTrace (true)); Environment.Exit (1); diff --git a/gstreamer-sharp/glib-sharp/FileUtils.cs b/gstreamer-sharp/glib-sharp/FileUtils.cs index 83c9d66..cc3748e 100644 --- a/gstreamer-sharp/glib-sharp/FileUtils.cs +++ b/gstreamer-sharp/glib-sharp/FileUtils.cs @@ -1,4 +1,4 @@ -// GLib.FileUtils.cs - GFileUtils class implementation +// Gst.GLib.FileUtils.cs - GFileUtils class implementation // // Author: Martin Baulig <martin@gnome.org> // diff --git a/gstreamer-sharp/glib-sharp/GString.cs b/gstreamer-sharp/glib-sharp/GString.cs index 11ffc80..e7590d8 100644 --- a/gstreamer-sharp/glib-sharp/GString.cs +++ b/gstreamer-sharp/glib-sharp/GString.cs @@ -1,4 +1,4 @@ -// GLib.GString.cs : Marshaler for GStrings +// Gst.GLib.GString.cs : Marshaler for GStrings // // Author: Mike Kestner <mkestner@ximian.com> // @@ -23,7 +23,7 @@ namespace Gst.GLib { using System; using System.Runtime.InteropServices; - public class GString : GLib.IWrapper { + public class GString : Gst.GLib.IWrapper { IntPtr handle; diff --git a/gstreamer-sharp/glib-sharp/GType.cs b/gstreamer-sharp/glib-sharp/GType.cs index 2a87193..ae8174e 100755 --- a/gstreamer-sharp/glib-sharp/GType.cs +++ b/gstreamer-sharp/glib-sharp/GType.cs @@ -1,4 +1,4 @@ -// GLib.Type.cs - GLib GType class implementation +// Gst.GLib.Type.cs - Gst.GLib GType class implementation // // Author: Mike Kestner <mkestner@speakeasy.net> // @@ -29,7 +29,7 @@ namespace Gst.GLib { using System.Runtime.InteropServices; using System.Text; - public delegate System.Type TypeResolutionHandler (GLib.GType gtype, string gtype_name); + public delegate System.Type TypeResolutionHandler (Gst.GLib.GType gtype, string gtype_name); [StructLayout(LayoutKind.Sequential)] public struct GType { @@ -103,8 +103,8 @@ namespace Gst.GLib { static GType () { - if (!GLib.Thread.Supported) - GLib.Thread.Init (); + if (!Gst.GLib.Thread.Supported) + Gst.GLib.Thread.Init (); g_type_init (); @@ -119,7 +119,7 @@ namespace Gst.GLib { Register (GType.Double, typeof (double)); Register (GType.String, typeof (string)); Register (GType.Pointer, typeof (IntPtr)); - Register (GType.Object, typeof (GLib.Object)); + Register (GType.Object, typeof (Gst.GLib.Object)); Register (GType.Pointer, typeof (IntPtr)); // One-way mapping @@ -135,8 +135,8 @@ namespace Gst.GLib { return (GType)gtypes[type]; } - if (type.IsSubclassOf (typeof (GLib.Object))) { - gtype = GLib.Object.LookupGType (type); + if (type.IsSubclassOf (typeof (Gst.GLib.Object))) { + gtype = Gst.GLib.Object.LookupGType (type); Register (gtype, type); return gtype; } @@ -148,7 +148,7 @@ namespace Gst.GLib { GTypeAttribute gattr = (GTypeAttribute)Attribute.GetCustomAttribute (type, typeof (GTypeAttribute), false); pi = gattr.WrapperType.GetProperty ("GType", BindingFlags.Public | BindingFlags.Static); gtype = (GType) pi.GetValue (null, null); - } else if (type.IsSubclassOf (typeof (GLib.Opaque))) + } else if (type.IsSubclassOf (typeof (Gst.GLib.Opaque))) gtype = GType.Pointer; else gtype = ManagedValue.GType; @@ -162,7 +162,7 @@ namespace Gst.GLib { for (int i = 1; i < cname.Length; i++) { if (System.Char.IsUpper (cname[i])) { if (i == 1 && cname [0] == 'G') - return "GLib." + cname.Substring (1); + return "Gst.GLib." + cname.Substring (1); else return cname.Substring (0, i) + "." + cname.Substring (i); } @@ -193,7 +193,7 @@ namespace Gst.GLib { string native_name = Marshaller.Utf8PtrToString (g_type_name (typeid)); if (ResolveType != null) { - GLib.GType gt = new GLib.GType (typeid); + Gst.GLib.GType gt = new Gst.GLib.GType (typeid); Delegate[] invocation_list = ResolveType.GetInvocationList (); foreach (Delegate d in invocation_list) { @@ -302,7 +302,7 @@ namespace Gst.GLib { public GType GetThresholdType () { GType curr_type = this; - while (curr_type.ToString ().StartsWith ("__gtksharp_")) + while (curr_type.ToString ().StartsWith ("__gst_gtksharp_")) curr_type = curr_type.GetBaseType (); return curr_type; } @@ -326,7 +326,7 @@ namespace Gst.GLib { string qn = t.FullName; // Just a random guess StringBuilder sb = new StringBuilder (20 + qn.Length); - sb.Append ("__gtksharp_"); + sb.Append ("__gst_gtksharp_"); sb.Append (type_uid++); sb.Append ("_"); foreach (char c in qn) { @@ -349,14 +349,14 @@ namespace Gst.GLib { { GType parent_gtype = LookupGObjectType (t.BaseType); string name = BuildEscapedName (t); - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); GTypeQuery query; g_type_query (parent_gtype.Val, out query); GTypeInfo info = new GTypeInfo (); info.class_size = (ushort) query.class_size; info.instance_size = (ushort) query.instance_size; GType gtype = new GType (g_type_register_static (parent_gtype.Val, native_name, ref info, 0)); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); Register (gtype, t); return gtype; } @@ -372,7 +372,7 @@ namespace Gst.GLib { if (pi != null) return (GType) pi.GetValue (null, null); - return GLib.Object.RegisterGType (t); + return Gst.GLib.Object.RegisterGType (t); } internal static IntPtr ValFromInstancePtr (IntPtr handle) diff --git a/gstreamer-sharp/glib-sharp/Global.cs b/gstreamer-sharp/glib-sharp/Global.cs index 8db5123..dbfddd2 100644 --- a/gstreamer-sharp/glib-sharp/Global.cs +++ b/gstreamer-sharp/glib-sharp/Global.cs @@ -1,4 +1,4 @@ -// GLib.Global.cs - Global glib properties and methods. +// Gst.GLib.Global.cs - Global glib properties and methods. // // Author: Andres G. Aragoneses <aaragoneses@novell.com> // @@ -33,12 +33,12 @@ namespace Gst.GLib { public static string ProgramName { get { - return GLib.Marshaller.PtrToStringGFree(g_get_prgname()); + return Gst.GLib.Marshaller.PtrToStringGFree(g_get_prgname()); } set { - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (value); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (value); g_set_prgname (native_name); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); } } @@ -50,12 +50,12 @@ namespace Gst.GLib { public static string ApplicationName { get { - return GLib.Marshaller.PtrToStringGFree(g_get_application_name()); + return Gst.GLib.Marshaller.PtrToStringGFree(g_get_application_name()); } set { - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (value); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (value); g_set_application_name (native_name); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); } } diff --git a/gstreamer-sharp/glib-sharp/IOChannel.cs b/gstreamer-sharp/glib-sharp/IOChannel.cs index ff0b091..4ae6a01 100644 --- a/gstreamer-sharp/glib-sharp/IOChannel.cs +++ b/gstreamer-sharp/glib-sharp/IOChannel.cs @@ -23,7 +23,7 @@ namespace Gst.GLibSharp { using System; using System.Runtime.InteropServices; - using GLib; + using Gst.GLib; [UnmanagedFunctionPointer (CallingConvention.Cdecl)] internal delegate bool IOFuncNative(IntPtr source, int condition, IntPtr data); @@ -55,7 +55,7 @@ namespace Gst.GLib { using System; using System.Runtime.InteropServices; - using GLibSharp; + using Gst.GLibSharp; public class IOChannel : IDisposable, IWrapper { diff --git a/gstreamer-sharp/glib-sharp/Idle.cs b/gstreamer-sharp/glib-sharp/Idle.cs index c3e5c3c..847235f 100755 --- a/gstreamer-sharp/glib-sharp/Idle.cs +++ b/gstreamer-sharp/glib-sharp/Idle.cs @@ -1,4 +1,4 @@ -// GLib.Idle.cs - Idle class implementation +// Gst.GLib.Idle.cs - Idle class implementation // // Author(s): // Mike Kestner <mkestner@speakeasy.net> diff --git a/gstreamer-sharp/glib-sharp/InitiallyUnowned.cs b/gstreamer-sharp/glib-sharp/InitiallyUnowned.cs index 0ad533e..abc69a4 100644 --- a/gstreamer-sharp/glib-sharp/InitiallyUnowned.cs +++ b/gstreamer-sharp/glib-sharp/InitiallyUnowned.cs @@ -31,7 +31,7 @@ namespace Gst.GLib { protected InitiallyUnowned (IntPtr raw) : base (raw) {} - public new static GLib.GType GType { + public new static Gst.GLib.GType GType { get { return GType.Object; } diff --git a/gstreamer-sharp/glib-sharp/ListBase.cs b/gstreamer-sharp/glib-sharp/ListBase.cs index 6ce0d2b..0ea59c4 100644 --- a/gstreamer-sharp/glib-sharp/ListBase.cs +++ b/gstreamer-sharp/glib-sharp/ListBase.cs @@ -26,7 +26,7 @@ namespace Gst.GLib { using System.Collections; using System.Runtime.InteropServices; - public abstract class ListBase : IDisposable, ICollection, GLib.IWrapper, ICloneable { + public abstract class ListBase : IDisposable, ICollection, Gst.GLib.IWrapper, ICloneable { private IntPtr list_ptr = IntPtr.Zero; private int length = -1; @@ -159,10 +159,10 @@ namespace Gst.GLib { ret = Marshaller.FilenamePtrToString (data); else if (element_type == typeof (IntPtr)) ret = data; - else if (element_type.IsSubclassOf (typeof (GLib.Object))) - ret = GLib.Object.GetObject (data, false); - else if (element_type.IsSubclassOf (typeof (GLib.Opaque))) - ret = GLib.Opaque.GetOpaque (data, element_type, elements_owned); + else if (element_type.IsSubclassOf (typeof (Gst.GLib.Object))) + ret = Gst.GLib.Object.GetObject (data, false); + else if (element_type.IsSubclassOf (typeof (Gst.GLib.Opaque))) + ret = Gst.GLib.Opaque.GetOpaque (data, element_type, elements_owned); else if (element_type == typeof (int)) ret = (int) data; else if (element_type.IsValueType) @@ -175,7 +175,7 @@ namespace Gst.GLib { ret = Activator.CreateInstance (element_type, new object[] {data}); } else if (Object.IsObject (data)) - ret = GLib.Object.GetObject (data, false); + ret = Gst.GLib.Object.GetObject (data, false); return ret; } @@ -190,10 +190,10 @@ namespace Gst.GLib { { if (elements_owned) for (uint i = 0; i < Count; i++) - if (typeof (GLib.Object).IsAssignableFrom (element_type)) + if (typeof (Gst.GLib.Object).IsAssignableFrom (element_type)) g_object_unref (NthData (i)); - else if (typeof (GLib.Opaque).IsAssignableFrom (element_type)) - GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); + else if (typeof (Gst.GLib.Opaque).IsAssignableFrom (element_type)) + Gst.GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); else g_free (NthData (i)); diff --git a/gstreamer-sharp/glib-sharp/Log.cs b/gstreamer-sharp/glib-sharp/Log.cs index 62f6da9..4229579 100644 --- a/gstreamer-sharp/glib-sharp/Log.cs +++ b/gstreamer-sharp/glib-sharp/Log.cs @@ -39,7 +39,7 @@ namespace Gst.GLib { FlagRecursion = 1 << 0, FlagFatal = 1 << 1, - /* GLib log levels */ + /* Gst.GLib log levels */ Error = 1 << 2, /* always fatal */ Critical = 1 << 3, Warning = 1 << 4, diff --git a/gstreamer-sharp/glib-sharp/MainContext.cs b/gstreamer-sharp/glib-sharp/MainContext.cs index 3e48cdd..9e7c89f 100644 --- a/gstreamer-sharp/glib-sharp/MainContext.cs +++ b/gstreamer-sharp/glib-sharp/MainContext.cs @@ -1,4 +1,4 @@ -// GLib.MainContext.cs - mainContext class implementation +// Gst.GLib.MainContext.cs - mainContext class implementation // // Author: Radek Doulik <rodo@matfyz.cz> // diff --git a/gstreamer-sharp/glib-sharp/MainLoop.cs b/gstreamer-sharp/glib-sharp/MainLoop.cs index d4bed8d..08bba86 100644 --- a/gstreamer-sharp/glib-sharp/MainLoop.cs +++ b/gstreamer-sharp/glib-sharp/MainLoop.cs @@ -1,4 +1,4 @@ -// GLib.MainLoop.cs - g_main_loop class implementation +// Gst.GLib.MainLoop.cs - g_main_loop class implementation // // Author: Jeroen Zwartepoorte <jeroen@xs4all.nl> // diff --git a/gstreamer-sharp/glib-sharp/ManagedValue.cs b/gstreamer-sharp/glib-sharp/ManagedValue.cs index 6481953..2b3b852 100644 --- a/gstreamer-sharp/glib-sharp/ManagedValue.cs +++ b/gstreamer-sharp/glib-sharp/ManagedValue.cs @@ -1,4 +1,4 @@ -// GLib.ManagedValue.cs : Managed types boxer +// Gst.GLib.ManagedValue.cs : Managed types boxer // // Author: Rachel Hestilow <hestilow@ximian.com> // @@ -23,7 +23,7 @@ namespace Gst.GLib { using System; using System.Collections; using System.Runtime.InteropServices; - using GLib; + using Gst.GLib; internal class ManagedValue { @@ -77,7 +77,7 @@ namespace Gst.GLib { free = new FreeFunc (Free); IntPtr name = Marshaller.StringToPtrGStrdup ("GstGLibSharpValue"); - boxed_type = new GLib.GType (g_boxed_type_register_static (name, copy, free)); + boxed_type = new Gst.GLib.GType (g_boxed_type_register_static (name, copy, free)); Marshaller.Free (name); } diff --git a/gstreamer-sharp/glib-sharp/Marshaller.cs b/gstreamer-sharp/glib-sharp/Marshaller.cs index 8cf38a1..00f5c6a 100644 --- a/gstreamer-sharp/glib-sharp/Marshaller.cs +++ b/gstreamer-sharp/glib-sharp/Marshaller.cs @@ -1,4 +1,4 @@ -// GLibSharp.Marshaller.cs : Marshalling utils +// Gst.GLibSharp.Marshaller.cs : Marshalling utils // // Author: Rachel Hestilow <rachel@nullenvoid.com> // Mike Kestner <mkestner@ximian.com> @@ -56,7 +56,7 @@ namespace Gst.GLib { IntPtr dummy, error; IntPtr utf8 = g_filename_to_utf8 (ptr, -1, IntPtr.Zero, out dummy, out error); if (error != IntPtr.Zero) - throw new GLib.GException (error); + throw new Gst.GLib.GException (error); return Utf8PtrToString (utf8); } @@ -200,9 +200,9 @@ namespace Gst.GLib { string[] members = new string[count]; for (int i = 0; i < count; ++i) { IntPtr s = Marshal.ReadIntPtr (string_array, i * IntPtr.Size); - members[i] = GLib.Marshaller.PtrToStringGFree (s); + members[i] = Gst.GLib.Marshaller.PtrToStringGFree (s); } - GLib.Marshaller.Free (string_array); + Gst.GLib.Marshaller.Free (string_array); return members; } @@ -262,7 +262,7 @@ namespace Gst.GLib { return buf; } - [Obsolete ("Use GLib.Argv instead to avoid leaks.")] + [Obsolete ("Use Gst.GLib.Argv instead to avoid leaks.")] public static IntPtr ArgvToArrayPtr (string[] args) { if (args.Length == 0) @@ -303,7 +303,7 @@ namespace Gst.GLib { return args; } - [Obsolete ("Use GLib.Argv instead to avoid leaks.")] + [Obsolete ("Use Gst.GLib.Argv instead to avoid leaks.")] public static string[] ArrayPtrToArgv (IntPtr array, int argc) { if (argc == 0) @@ -379,10 +379,10 @@ namespace Gst.GLib { { Type array_type = elem_type == typeof (ListBase.FilenameString) ? typeof (string) : elem_type; ListBase list; - if (list_type == typeof(GLib.List)) - list = new GLib.List (list_ptr, elem_type, owned, elements_owned); + if (list_type == typeof(Gst.GLib.List)) + list = new Gst.GLib.List (list_ptr, elem_type, owned, elements_owned); else - list = new GLib.SList (list_ptr, elem_type, owned, elements_owned); + list = new Gst.GLib.SList (list_ptr, elem_type, owned, elements_owned); using (list) return ListToArray (list, array_type); @@ -390,7 +390,7 @@ namespace Gst.GLib { public static Array PtrArrayToArray (IntPtr list_ptr, bool owned, bool elements_owned, Type elem_type) { - GLib.PtrArray array = new GLib.PtrArray (list_ptr, elem_type, owned, elements_owned); + Gst.GLib.PtrArray array = new Gst.GLib.PtrArray (list_ptr, elem_type, owned, elements_owned); Array ret = Array.CreateInstance (elem_type, array.Count); array.CopyTo (ret, 0); array.Dispose (); @@ -403,7 +403,7 @@ namespace Gst.GLib { if (list.Count > 0) list.CopyTo (result, 0); - if (type.IsSubclassOf (typeof (GLib.Opaque))) + if (type.IsSubclassOf (typeof (Gst.GLib.Opaque))) list.elements_owned = false; return result; diff --git a/gstreamer-sharp/glib-sharp/NotifyHandler.cs b/gstreamer-sharp/glib-sharp/NotifyHandler.cs index ba6219b..21d0d4d 100644 --- a/gstreamer-sharp/glib-sharp/NotifyHandler.cs +++ b/gstreamer-sharp/glib-sharp/NotifyHandler.cs @@ -21,7 +21,7 @@ namespace Gst.GLib { public delegate void NotifyHandler (object o, NotifyArgs args); - public class NotifyArgs : GLib.SignalArgs { + public class NotifyArgs : Gst.GLib.SignalArgs { [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_get_name (IntPtr pspec); diff --git a/gstreamer-sharp/glib-sharp/Object.cs b/gstreamer-sharp/glib-sharp/Object.cs index 8f279c4..3b74b09 100644 --- a/gstreamer-sharp/glib-sharp/Object.cs +++ b/gstreamer-sharp/glib-sharp/Object.cs @@ -118,7 +118,7 @@ namespace Gst.GLib { if (!owned_ref) g_object_ref (o); - obj = GLib.ObjectManager.CreateObject(o); + obj = Gst.GLib.ObjectManager.CreateObject(o); if (obj == null) { g_object_unref (o); return null; @@ -163,7 +163,7 @@ namespace Gst.GLib { m.Invoke (null, parms); } - for (Type curr = t; curr != typeof(GLib.Object); curr = curr.BaseType) { + for (Type curr = t; curr != typeof(Gst.GLib.Object); curr = curr.BaseType) { if (curr.Assembly.IsDefined (typeof (IgnoreClassInitializersAttribute), false)) continue; @@ -185,12 +185,10 @@ namespace Gst.GLib { } } - [StructLayout(LayoutKind.Sequential)] struct GTypeClass { public IntPtr gtype; } - [StructLayout(LayoutKind.Sequential)] struct GObjectClass { GTypeClass type_class; IntPtr construct_props; @@ -201,7 +199,7 @@ namespace Gst.GLib { IntPtr finalize; IntPtr dispatch_properties_changed; IntPtr notify; - public ConstructedDelegate constructed_cb; + IntPtr constructed; IntPtr dummy1; IntPtr dummy2; IntPtr dummy3; @@ -211,146 +209,109 @@ namespace Gst.GLib { IntPtr dummy7; } - static Hashtable class_structs; - - static GObjectClass GetClassStruct (GLib.GType gtype, bool use_cache) - { - if (class_structs == null) - class_structs = new Hashtable (); - - if (use_cache && class_structs.Contains (gtype)) - return (GObjectClass) class_structs [gtype]; - else { - IntPtr class_ptr = gtype.GetClassPtr (); - GObjectClass class_struct = (GObjectClass) Marshal.PtrToStructure (class_ptr, typeof (GObjectClass)); - if (use_cache) - class_structs.Add (gtype, class_struct); - return class_struct; - } - } - - static void OverrideClassStruct (GLib.GType gtype, GObjectClass class_struct) - { - IntPtr class_ptr = gtype.GetClassPtr (); - Marshal.StructureToPtr (class_struct, class_ptr, false); - } + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + delegate IntPtr ConstructorDelegate (IntPtr gtype, uint n_construct_properties, IntPtr construct_properties); + static ConstructorDelegate constructor_handler; - static void OverridePropertyHandlers (GType gtype, GetPropertyDelegate get_cb, SetPropertyDelegate set_cb) - { - GObjectClass klass = GetClassStruct (gtype, false); - klass.get_prop_cb = get_cb; - klass.set_prop_cb = set_cb; - OverrideClassStruct (gtype, klass); + static ConstructorDelegate ConstructorHandler { + get { + if (constructor_handler == null) + constructor_handler = new ConstructorDelegate (ConstructorCallback); + return constructor_handler; + } } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_object_class_install_property (IntPtr klass, uint prop_id, IntPtr param_spec); + static extern IntPtr g_param_spec_get_name (IntPtr pspec); - static IntPtr RegisterProperty (GType type, string name, string nick, string blurb, uint property_id, GType property_type, bool can_read, bool can_write) + static IntPtr ConstructorCallback (IntPtr gtypeval, uint n_construct_properties, IntPtr construct_properties) { - IntPtr declaring_class = type.GetClassPtr (); - ParamSpec pspec = new ParamSpec (name, nick, blurb, property_type, can_read, can_write); - - g_object_class_install_property (declaring_class, property_id, pspec.Handle); - return pspec.Handle; - } - - static ConstructorDelegate Constructor_cb = new ConstructorDelegate (constructor_cb); - delegate IntPtr ConstructorDelegate (IntPtr gtype, uint n_construct_properties, IntPtr construct_properties); - - [StructLayout(LayoutKind.Sequential)] - struct GObjectConstructParam { - public IntPtr pspec; - public IntPtr value; - } - - static IntPtr constructor_cb (IntPtr gtype, uint n_construct_properties, IntPtr construct_properties) - { - GType type = new GLib.GType (gtype); - IntPtr instance = GetClassStruct (type.GetThresholdType (), false).constructor_cb (gtype, n_construct_properties, construct_properties); + GType gtype = new Gst.GLib.GType (gtypeval); + GObjectClass threshold_class = (GObjectClass) Marshal.PtrToStructure (gtype.GetThresholdType ().GetClassPtr (), typeof (GObjectClass)); + IntPtr raw = threshold_class.constructor_cb (gtypeval, n_construct_properties, construct_properties); + bool construct_needed = true; for (int i = 0; i < n_construct_properties; i++) { - IntPtr p = new IntPtr ((long) construct_properties + i * Marshal.SizeOf (typeof (GObjectConstructParam))); + IntPtr p = new IntPtr (construct_properties.ToInt64 () + i * 2 * IntPtr.Size); - GObjectConstructParam cparam = (GObjectConstructParam) Marshal.PtrToStructure (p, typeof (GObjectConstructParam)); - - ParamSpec pspec = new ParamSpec (cparam.pspec); - GLib.Value val = (Value) Marshal.PtrToStructure (cparam.value, typeof (Value)); + string prop_name = Marshaller.Utf8PtrToString (g_param_spec_get_name (Marshal.ReadIntPtr (p))); + if (prop_name != "gtk-sharp-managed-instance") + continue; - if (pspec.Name == "gtk-sharp-managed-instance" && (IntPtr) val.Val != IntPtr.Zero) { + Value val = (Value) Marshal.PtrToStructure (Marshal.ReadIntPtr (p, IntPtr.Size), typeof (Value)); + if ((IntPtr) val.Val != IntPtr.Zero) { GCHandle gch = (GCHandle) (IntPtr) val.Val; - Object o = (GLib.Object) gch.Target; - o.Raw = instance; + Object o = (Gst.GLib.Object) gch.Target; + o.Raw = raw; + construct_needed = false; + break; } } - return instance; + if (construct_needed) + GetObject (raw, false); + + return raw; } - static ConstructedDelegate Constructed_cb = new ConstructedDelegate (constructed_cb); - [GLib.CDeclCallback] - delegate void ConstructedDelegate (IntPtr o); + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void g_object_class_install_property (IntPtr klass, uint prop_id, IntPtr param_spec); - static void constructed_cb (IntPtr o) + static IntPtr RegisterProperty (GType type, string name, string nick, string blurb, uint property_id, GType property_type, bool can_read, bool can_write) { - GLib.Object __obj = GLib.Object.GetObject (o, false) as GLib.Object; - ConstructedDelegate unmanaged = GetClassStruct (__obj.LookupGType ().GetThresholdType (), true).constructed_cb; - if (unmanaged != null) - unmanaged (__obj.Handle); - } + IntPtr declaring_class = type.GetClassPtr (); + ParamSpec pspec = new ParamSpec (name, nick, blurb, property_type, can_read, can_write); - static SetPropertyDelegate Set_prop_dummy_cb = new SetPropertyDelegate (set_prop_dummy_cb); - static void set_prop_dummy_cb (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec) {} + g_object_class_install_property (declaring_class, property_id, pspec.Handle); + return pspec.Handle; + } - static void AddProperties (GType gtype, System.Type t) + static void AddProperties (GType gtype, System.Type t, bool register_instance_prop) { uint idx = 1; - - if (gtype.GetBaseType () == gtype.GetThresholdType ()) { - GObjectClass gobject_class = GetClassStruct (gtype, false); - gobject_class.constructor_cb = Constructor_cb; - gobject_class.constructed_cb = Constructed_cb; - gobject_class.set_prop_cb = Set_prop_dummy_cb; - OverrideClassStruct (gtype, gobject_class); - + + if (register_instance_prop) { IntPtr declaring_class = gtype.GetClassPtr (); ParamSpec pspec = new ParamSpec ("gtk-sharp-managed-instance", "", "", GType.Pointer, ParamFlags.Writable | ParamFlags.ConstructOnly); g_object_class_install_property (declaring_class, idx, pspec.Handle); idx++; } - - bool handlers_overridden = false; + + bool handlers_overridden = register_instance_prop; foreach (PropertyInfo pinfo in t.GetProperties (BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)) { foreach (object attr in pinfo.GetCustomAttributes (typeof (PropertyAttribute), false)) { if(pinfo.GetIndexParameters().Length > 0) - throw(new InvalidOperationException(String.Format("GLib.RegisterPropertyAttribute cannot be applied to property {0} of type {1} because the property expects one or more indexed parameters", pinfo.Name, t.FullName))); + throw(new InvalidOperationException(String.Format("Gst.GLib.RegisterPropertyAttribute cannot be applied to property {0} of type {1} because the property expects one or more indexed parameters", pinfo.Name, t.FullName))); - PropertyAttribute property_attr = attr as PropertyAttribute; if (!handlers_overridden) { - OverridePropertyHandlers (gtype, GetPropertyHandler, SetPropertyHandler); + IntPtr class_ptr = gtype.GetClassPtr (); + GObjectClass gobject_class = (GObjectClass) Marshal.PtrToStructure (class_ptr, typeof (GObjectClass)); + gobject_class.get_prop_cb = GetPropertyHandler; + gobject_class.set_prop_cb = SetPropertyHandler; + Marshal.StructureToPtr (gobject_class, class_ptr, false); handlers_overridden = true; } - + PropertyAttribute property_attr = attr as PropertyAttribute; try { IntPtr param_spec = RegisterProperty (gtype, property_attr.Name, property_attr.Nickname, property_attr.Blurb, idx, (GType) pinfo.PropertyType, pinfo.CanRead, pinfo.CanWrite); Properties.Add (param_spec, pinfo); idx++; } catch (ArgumentException) { - throw new InvalidOperationException (String.Format ("GLib.PropertyAttribute cannot be applied to property {0} of type {1} because the return type of the property is not supported", pinfo.Name, t.FullName)); + throw new InvalidOperationException (String.Format ("Gst.GLib.PropertyAttribute cannot be applied to property {0} of type {1} because the return type of the property is not supported", pinfo.Name, t.FullName)); } } } } [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - delegate void GetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); + delegate void GetPropertyDelegate (IntPtr GObject, uint property_id, ref Gst.GLib.Value value, IntPtr pspec); - static void GetPropertyCallback (IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) + static void GetPropertyCallback (IntPtr handle, uint property_id, ref Gst.GLib.Value value, IntPtr param_spec) { if (!Properties.Contains (param_spec)) - return; + return; - GLib.Object obj = GLib.Object.GetObject (handle, false); + Gst.GLib.Object obj = Gst.GLib.Object.GetObject (handle, false); value.Val = (Properties [param_spec] as PropertyInfo).GetValue (obj, new object [0]); } @@ -364,14 +325,14 @@ namespace Gst.GLib { } [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - delegate void SetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); + delegate void SetPropertyDelegate (IntPtr GObject, uint property_id, ref Gst.GLib.Value value, IntPtr pspec); - static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) + static void SetPropertyCallback(IntPtr handle, uint property_id, ref Gst.GLib.Value value, IntPtr param_spec) { if (!Properties.Contains (param_spec)) - return; + return; - GLib.Object obj = GLib.Object.GetObject (handle, false); + Gst.GLib.Object obj = Gst.GLib.Object.GetObject (handle, false); (Properties [param_spec] as PropertyInfo).SetValue (obj, value.Val, new object [0]); } @@ -404,20 +365,28 @@ namespace Gst.GLib { protected internal static GType RegisterGType (System.Type t) { GType gtype = GType.RegisterGObjectType (t); - AddProperties (gtype, t); + bool is_first_subclass = gtype.GetBaseType () == gtype.GetThresholdType (); + if (is_first_subclass) { + IntPtr class_ptr = gtype.GetClassPtr (); + GObjectClass gobject_class = (GObjectClass) Marshal.PtrToStructure (class_ptr, typeof (GObjectClass)); + gobject_class.constructor_cb = ConstructorHandler; + gobject_class.get_prop_cb = GetPropertyHandler; + gobject_class.set_prop_cb = SetPropertyHandler; + Marshal.StructureToPtr (gobject_class, class_ptr, false); + } + AddProperties (gtype, t, is_first_subclass); ConnectDefaultHandlers (gtype, t); InvokeClassInitializers (gtype, t); AddInterfaces (gtype, t); return gtype; } - protected GType LookupGType () { if (Handle != IntPtr.Zero) { GTypeInstance obj = (GTypeInstance) Marshal.PtrToStructure (Handle, typeof (GTypeInstance)); GTypeClass klass = (GTypeClass) Marshal.PtrToStructure (obj.g_class, typeof (GTypeClass)); - return new GLib.GType (klass.gtype); + return new Gst.GLib.GType (klass.gtype); } else { return LookupGType (GetType ()); } @@ -435,7 +404,7 @@ namespace Gst.GLib { protected Object () { - CreateNativeObject (new string [0], new GLib.Value [0]); + CreateNativeObject (new string [0], new Gst.GLib.Value [0]); } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] @@ -443,38 +412,34 @@ namespace Gst.GLib { struct GParameter { public IntPtr name; - public GLib.Value val; + public Gst.GLib.Value val; } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_newv (IntPtr gtype, int n_params, GParameter[] parms); - protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals) + protected virtual void CreateNativeObject (string[] names, Gst.GLib.Value[] vals) { - GLib.GType gtype = LookupGType (); - bool managed_type = gtype.ToString().StartsWith ("__gtksharp_"); - - GParameter[] parms = new GParameter [names.Length + ((managed_type) ? 1 : 0)]; - + GType gtype = LookupGType (); + bool is_managed_subclass = gtype.ToString ().StartsWith ("__gst_gtksharp"); + GParameter[] parms = new GParameter [is_managed_subclass ? names.Length + 1 : names.Length]; for (int i = 0; i < names.Length; i++) { - parms [i].name = GLib.Marshaller.StringToPtrGStrdup (names [i]); + parms [i].name = Gst.GLib.Marshaller.StringToPtrGStrdup (names [i]); parms [i].val = vals [i]; } - if (managed_type) { + if (is_managed_subclass) { GCHandle gch = GCHandle.Alloc (this); - parms[names.Length].name = GLib.Marshaller.StringToPtrGStrdup ("gtk-sharp-managed-instance"); - parms[names.Length].val = new GLib.Value ((IntPtr) gch); - + parms[names.Length].name = Gst.GLib.Marshaller.StringToPtrGStrdup ("gtk-sharp-managed-instance"); + parms[names.Length].val = new Gst.GLib.Value ((IntPtr) gch); Raw = g_object_newv (gtype.Val, parms.Length, parms); - gch.Free (); } else { Raw = g_object_newv (gtype.Val, parms.Length, parms); } foreach (GParameter p in parms) - GLib.Marshaller.Free (p.name); + Gst.GLib.Marshaller.Free (p.name); } protected virtual IntPtr Raw { @@ -500,7 +465,7 @@ namespace Gst.GLib { } } - public static GLib.GType GType { + public static Gst.GLib.GType GType { get { return GType.Object; } @@ -512,7 +477,7 @@ namespace Gst.GLib { } } - internal GLib.GType NativeType { + internal Gst.GLib.GType NativeType { get { return LookupGType (); } @@ -537,7 +502,7 @@ namespace Gst.GLib { } Hashtable before_signals; - [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] + [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] protected internal Hashtable BeforeSignals { get { if (before_signals == null) @@ -547,7 +512,7 @@ namespace Gst.GLib { } Hashtable after_signals; - [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] + [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] protected internal Hashtable AfterSignals { get { if (after_signals == null) @@ -557,7 +522,7 @@ namespace Gst.GLib { } EventHandlerList before_handlers; - [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] + [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] protected EventHandlerList BeforeHandlers { get { if (before_handlers == null) @@ -567,7 +532,7 @@ namespace Gst.GLib { } EventHandlerList after_handlers; - [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] + [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] protected EventHandlerList AfterHandlers { get { if (after_handlers == null) @@ -582,7 +547,7 @@ namespace Gst.GLib { void NotifyCallback (IntPtr handle, IntPtr pspec, IntPtr gch) { try { - GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal; + Gst.GLib.Signal sig = ((GCHandle) gch).Target as Gst.GLib.Signal; if (sig == null) throw new Exception("Unknown signal GC handle received " + gch); @@ -590,7 +555,7 @@ namespace Gst.GLib { args.Args = new object[1]; args.Args[0] = pspec; NotifyHandler handler = (NotifyHandler) sig.Handler; - handler (GLib.Object.GetObject (handle), args); + handler (Gst.GLib.Object.GetObject (handle), args); } catch (Exception e) { ExceptionManager.RaiseUnhandledException (e, false); } @@ -653,25 +618,25 @@ namespace Gst.GLib { } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_object_get_property (IntPtr obj, IntPtr name, ref GLib.Value val); + static extern void g_object_get_property (IntPtr obj, IntPtr name, ref Gst.GLib.Value val); - protected GLib.Value GetProperty (string name) + protected Gst.GLib.Value GetProperty (string name) { Value val = new Value (this, name); - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); g_object_get_property (Raw, native_name, ref val); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); return val; } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_object_set_property (IntPtr obj, IntPtr name, ref GLib.Value val); + static extern void g_object_set_property (IntPtr obj, IntPtr name, ref Gst.GLib.Value val); - protected void SetProperty (string name, GLib.Value val) + protected void SetProperty (string name, Gst.GLib.Value val) { - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); g_object_set_property (Raw, native_name, ref val); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] @@ -679,9 +644,9 @@ namespace Gst.GLib { protected void Notify (string property_name) { - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (property_name); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (property_name); g_object_notify (Handle, native_name); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); } protected static void OverrideVirtualMethod (GType gtype, string name, Delegate cb) @@ -690,7 +655,7 @@ namespace Gst.GLib { } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval); + protected static extern void g_signal_chain_from_overridden (IntPtr args, ref Gst.GLib.Value retval); [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_type_check_instance_is_a (IntPtr obj, IntPtr gtype); @@ -700,12 +665,10 @@ namespace Gst.GLib { return g_type_check_instance_is_a (obj, GType.Object.Val); } - [StructLayout(LayoutKind.Sequential)] struct GTypeInstance { public IntPtr g_class; } - [StructLayout(LayoutKind.Sequential)] struct GObject { public GTypeInstance type_instance; public uint ref_count; @@ -727,7 +690,7 @@ namespace Gst.GLib { static Object () { if (Environment.GetEnvironmentVariable ("GTK_SHARP_DEBUG") != null) - GLib.Log.SetLogHandler ("GLib-GObject", GLib.LogLevelFlags.All, new GLib.LogFunc (GLib.Log.PrintTraceLogFunction)); + Gst.GLib.Log.SetLogHandler ("Gst.GLib-GObject", Gst.GLib.LogLevelFlags.All, new Gst.GLib.LogFunc (Gst.GLib.Log.PrintTraceLogFunction)); } } } diff --git a/gstreamer-sharp/glib-sharp/ObjectManager.cs b/gstreamer-sharp/glib-sharp/ObjectManager.cs index b83e5e4..237b0fe 100644 --- a/gstreamer-sharp/glib-sharp/ObjectManager.cs +++ b/gstreamer-sharp/glib-sharp/ObjectManager.cs @@ -1,4 +1,4 @@ -// GLib.ObjectManager.cs - GLib ObjectManager class implementation +// Gst.GLib.ObjectManager.cs - Gst.GLib ObjectManager class implementation // // Author: Mike Kestner <mkestner@speakeasy.net> // @@ -30,7 +30,7 @@ namespace Gst.GLib { static BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.CreateInstance; - public static GLib.Object CreateObject (IntPtr raw) + public static Gst.GLib.Object CreateObject (IntPtr raw) { if (raw == IntPtr.Zero) return null; @@ -40,11 +40,11 @@ namespace Gst.GLib { if (type == null) return null; - GLib.Object obj; + Gst.GLib.Object obj; try { - obj = Activator.CreateInstance (type, flags, null, new object[] {raw}, null) as GLib.Object; + obj = Activator.CreateInstance (type, flags, null, new object[] {raw}, null) as Gst.GLib.Object; } catch (MissingMethodException) { - throw new GLib.MissingIntPtrCtorException ("GLib.Object subclass " + type + " must provide a protected or public IntPtr ctor to support wrapping of native object handles."); + throw new Gst.GLib.MissingIntPtrCtorException ("Gst.GLib.Object subclass " + type + " must provide a protected or public IntPtr ctor to support wrapping of native object handles."); } return obj; } diff --git a/gstreamer-sharp/glib-sharp/ParamSpec.cs b/gstreamer-sharp/glib-sharp/ParamSpec.cs index f17eb02..43b3047 100644 --- a/gstreamer-sharp/glib-sharp/ParamSpec.cs +++ b/gstreamer-sharp/glib-sharp/ParamSpec.cs @@ -25,10 +25,10 @@ namespace Gst.GLib { using System.Runtime.InteropServices; internal enum ParamFlags { - None = 0, - Readable = 1 << 0, - Writable = 1 << 1, - Construct = 1 << 2, + None = 0, + Readable = 1 << 0, + Writable = 1 << 1, + Construct = 1 << 2, ConstructOnly = 1 << 3, } @@ -36,32 +36,34 @@ namespace Gst.GLib { IntPtr handle; - private static IntPtr CreateParamSpec (string name, string nick, string blurb, GType type, ParamFlags pflags) { + public ParamSpec (string name, string nick, string blurb, GType type, bool readable, bool writable) : this (name, nick, blurb, type, (readable ? ParamFlags.Readable : ParamFlags.None) | (writable ? ParamFlags.Writable : ParamFlags.None)) {} + + internal ParamSpec (string name, string nick, string blurb, GType type, ParamFlags pflags) + { int flags = (int) pflags; - IntPtr ret; - IntPtr p_name = GLib.Marshaller.StringToPtrGStrdup (name); - IntPtr p_nick = GLib.Marshaller.StringToPtrGStrdup (nick); - IntPtr p_blurb = GLib.Marshaller.StringToPtrGStrdup (blurb); + IntPtr p_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr p_nick = Gst.GLib.Marshaller.StringToPtrGStrdup (nick); + IntPtr p_blurb = Gst.GLib.Marshaller.StringToPtrGStrdup (blurb); if (type == GType.Char) - ret = g_param_spec_char (p_name, p_nick, p_blurb, SByte.MinValue, SByte.MaxValue, 0, flags); + handle = g_param_spec_char (p_name, p_nick, p_blurb, SByte.MinValue, SByte.MaxValue, 0, flags); else if (type == GType.UChar) - ret = g_param_spec_uchar (p_name, p_nick, p_blurb, Byte.MinValue, Byte.MaxValue, 0, flags); + handle = g_param_spec_uchar (p_name, p_nick, p_blurb, Byte.MinValue, Byte.MaxValue, 0, flags); else if (type == GType.Boolean) - ret = g_param_spec_boolean (p_name, p_nick, p_blurb, false, flags); + handle = g_param_spec_boolean (p_name, p_nick, p_blurb, false, flags); else if (type == GType.Int) - ret = g_param_spec_int (p_name, p_nick, p_blurb, Int32.MinValue, Int32.MaxValue, 0, flags); + handle = g_param_spec_int (p_name, p_nick, p_blurb, Int32.MinValue, Int32.MaxValue, 0, flags); else if (type == GType.UInt) - ret = g_param_spec_uint (p_name, p_nick, p_blurb, 0, UInt32.MaxValue, 0, flags); + handle = g_param_spec_uint (p_name, p_nick, p_blurb, 0, UInt32.MaxValue, 0, flags); else if (type == GType.Long) - ret = g_param_spec_long (p_name, p_nick, p_blurb, IntPtr.Zero, IntPtr.Size == 4 ? new IntPtr (Int32.MaxValue) : new IntPtr (Int64.MaxValue), IntPtr.Zero, flags); + handle = g_param_spec_long (p_name, p_nick, p_blurb, IntPtr.Zero, IntPtr.Size == 4 ? new IntPtr (Int32.MaxValue) : new IntPtr (Int64.MaxValue), IntPtr.Zero, flags); else if (type == GType.ULong) - ret = g_param_spec_ulong (p_name, p_nick, p_blurb, UIntPtr.Zero, UIntPtr.Size == 4 ? new UIntPtr (UInt32.MaxValue) : new UIntPtr (UInt64.MaxValue), UIntPtr.Zero, flags); + handle = g_param_spec_ulong (p_name, p_nick, p_blurb, UIntPtr.Zero, UIntPtr.Size == 4 ? new UIntPtr (UInt32.MaxValue) : new UIntPtr (UInt64.MaxValue), UIntPtr.Zero, flags); else if (type == GType.Int64) - ret = g_param_spec_int64 (p_name, p_nick, p_blurb, Int64.MinValue, Int64.MaxValue, 0, flags); + handle = g_param_spec_int64 (p_name, p_nick, p_blurb, Int64.MinValue, Int64.MaxValue, 0, flags); else if (type == GType.UInt64) - ret = g_param_spec_uint64 (p_name, p_nick, p_blurb, 0, UInt64.MaxValue, 0, flags); + handle = g_param_spec_uint64 (p_name, p_nick, p_blurb, 0, UInt64.MaxValue, 0, flags); /* else if (type == GType.Enum) else if (type == GType.Flags) @@ -69,40 +71,25 @@ namespace Gst.GLib { * Both g_param_spec_enum and g_param_spec_flags expect default property values and the members of the enum seemingly cannot be enumerated */ else if (type == GType.Float) - ret = g_param_spec_float (p_name, p_nick, p_blurb, Single.MinValue, Single.MaxValue, 0.0f, flags); + handle = g_param_spec_float (p_name, p_nick, p_blurb, Single.MinValue, Single.MaxValue, 0.0f, flags); else if (type == GType.Double) - ret = g_param_spec_double (p_name, p_nick, p_blurb, Double.MinValue, Double.MaxValue, 0.0, flags); + handle = g_param_spec_double (p_name, p_nick, p_blurb, Double.MinValue, Double.MaxValue, 0.0, flags); else if (type == GType.String) - ret = g_param_spec_string (p_name, p_nick, p_blurb, IntPtr.Zero, flags); + handle = g_param_spec_string (p_name, p_nick, p_blurb, IntPtr.Zero, flags); else if (type == GType.Pointer) - ret = g_param_spec_pointer (p_name, p_nick, p_blurb, flags); + handle = g_param_spec_pointer (p_name, p_nick, p_blurb, flags); else if (type.Val == g_gtype_get_type ()) - ret = g_param_spec_gtype (p_name, p_nick, p_blurb, GType.None.Val, flags); + handle = g_param_spec_gtype (p_name, p_nick, p_blurb, GType.None.Val, flags); else if (g_type_is_a (type.Val, GType.Boxed.Val)) - ret = g_param_spec_boxed (p_name, p_nick, p_blurb, type.Val, flags); + handle = g_param_spec_boxed (p_name, p_nick, p_blurb, type.Val, flags); else if (g_type_is_a (type.Val, GType.Object.Val)) - ret = g_param_spec_object (p_name, p_nick, p_blurb, type.Val, flags); + handle = g_param_spec_object (p_name, p_nick, p_blurb, type.Val, flags); else throw new ArgumentException ("type"); - GLib.Marshaller.Free (p_name); - GLib.Marshaller.Free (p_nick); - GLib.Marshaller.Free (p_blurb); - - return ret; - } - - internal ParamSpec (string name, string nick, string blurb, GType type, ParamFlags pflags) { - handle = CreateParamSpec (name, nick, blurb, type, pflags); - } - - public ParamSpec (string name, string nick, string blurb, GType type, bool readable, bool writable) - { - ParamFlags pflags = ParamFlags.None; - if (readable) pflags |= ParamFlags.Readable; - if (writable) pflags |= ParamFlags.Writable; - - handle = CreateParamSpec (name, nick, blurb, type, pflags); + Gst.GLib.Marshaller.Free (p_name); + Gst.GLib.Marshaller.Free (p_nick); + Gst.GLib.Marshaller.Free (p_blurb); } public ParamSpec (IntPtr native) @@ -121,13 +108,6 @@ namespace Gst.GLib { } } - public string Name { - get { - GParamSpec spec = (GParamSpec) Marshal.PtrToStructure (Handle, typeof (GParamSpec)); - return GLib.Marshaller.Utf8PtrToString (spec.name); - } - } - struct GTypeInstance { IntPtr g_class; } @@ -135,7 +115,7 @@ namespace Gst.GLib { struct GParamSpec { GTypeInstance g_type_instance; - public IntPtr name; + IntPtr name; ParamFlags flags; public IntPtr value_type; IntPtr owner_type; diff --git a/gstreamer-sharp/glib-sharp/Priority.cs b/gstreamer-sharp/glib-sharp/Priority.cs index b22d493..5fbfadf 100644 --- a/gstreamer-sharp/glib-sharp/Priority.cs +++ b/gstreamer-sharp/glib-sharp/Priority.cs @@ -1,4 +1,4 @@ -// GLib.Priority.cs +// Gst.GLib.Priority.cs // // Author(s): // Stephane Delcroix <stephane@delcroix.org> diff --git a/gstreamer-sharp/glib-sharp/PtrArray.cs b/gstreamer-sharp/glib-sharp/PtrArray.cs index 8d08181..a11d127 100644 --- a/gstreamer-sharp/glib-sharp/PtrArray.cs +++ b/gstreamer-sharp/glib-sharp/PtrArray.cs @@ -94,10 +94,10 @@ namespace Gst.GLib { if (elements_owned) { int count = Count; for (uint i = 0; i < count; i++) - if (typeof (GLib.Object).IsAssignableFrom (element_type)) + if (typeof (Gst.GLib.Object).IsAssignableFrom (element_type)) g_object_unref (NthData (i)); - else if (typeof (GLib.Opaque).IsAssignableFrom (element_type)) - GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); + else if (typeof (Gst.GLib.Opaque).IsAssignableFrom (element_type)) + Gst.GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); else g_free (NthData (i)); } @@ -174,10 +174,10 @@ namespace Gst.GLib { ret = Marshaller.Utf8PtrToString (data); else if (element_type == typeof (IntPtr)) ret = data; - else if (element_type.IsSubclassOf (typeof (GLib.Object))) - ret = GLib.Object.GetObject (data, false); - else if (element_type.IsSubclassOf (typeof (GLib.Opaque))) - ret = GLib.Opaque.GetOpaque (data, element_type, elements_owned); + else if (element_type.IsSubclassOf (typeof (Gst.GLib.Object))) + ret = Gst.GLib.Object.GetObject (data, false); + else if (element_type.IsSubclassOf (typeof (Gst.GLib.Opaque))) + ret = Gst.GLib.Opaque.GetOpaque (data, element_type, elements_owned); else if (element_type == typeof (int)) ret = (int) data; else if (element_type.IsValueType) @@ -186,7 +186,7 @@ namespace Gst.GLib { ret = Activator.CreateInstance (element_type, new object[] {data}); } else if (Object.IsObject (data)) - ret = GLib.Object.GetObject (data, false); + ret = Gst.GLib.Object.GetObject (data, false); return ret; } diff --git a/gstreamer-sharp/glib-sharp/Signal.cs b/gstreamer-sharp/glib-sharp/Signal.cs index 20215f3..5ca28c6 100644 --- a/gstreamer-sharp/glib-sharp/Signal.cs +++ b/gstreamer-sharp/glib-sharp/Signal.cs @@ -1,4 +1,4 @@ -// GLib.Signal.cs - signal marshaling class +// Gst.GLib.Signal.cs - signal marshaling class // // Authors: Mike Kestner <mkestner@novell.com> // Andrés G. Aragoneses <aaragoneses@novell.com> @@ -140,7 +140,7 @@ namespace Gst.GLib { SignalClosure after_closure; Delegate marshaler; - private Signal (GLib.Object obj, string signal_name, Delegate marshaler) + private Signal (Gst.GLib.Object obj, string signal_name, Delegate marshaler) { tref = obj.ToggleRef; name = signal_name; @@ -148,7 +148,7 @@ namespace Gst.GLib { this.marshaler = marshaler; } - private Signal (GLib.Object obj, string signal_name, Type args_type) + private Signal (Gst.GLib.Object obj, string signal_name, Type args_type) { tref = obj.ToggleRef; name = signal_name; @@ -215,12 +215,12 @@ namespace Gst.GLib { } } - public static Signal Lookup (GLib.Object obj, string name) + public static Signal Lookup (Gst.GLib.Object obj, string name) { return Lookup (obj, name, typeof (EventArgs)); } - public static Signal Lookup (GLib.Object obj, string name, Delegate marshaler) + public static Signal Lookup (Gst.GLib.Object obj, string name, Delegate marshaler) { Signal result = obj.ToggleRef.Signals [name] as Signal; if (result == null) @@ -228,7 +228,7 @@ namespace Gst.GLib { return result; } - public static Signal Lookup (GLib.Object obj, string name, Type args_type) + public static Signal Lookup (Gst.GLib.Object obj, string name, Type args_type) { Signal result = obj.ToggleRef.Signals [name] as Signal; if (result == null) @@ -313,7 +313,7 @@ namespace Gst.GLib { } } - public static object Emit (GLib.Object instance, string detailed_signal, params object[] args) + public static object Emit (Gst.GLib.Object instance, string detailed_signal, params object[] args) { uint gquark, signal_id; string signal_name; @@ -321,13 +321,13 @@ namespace Gst.GLib { signal_id = GetSignalId (signal_name, instance); if (signal_id <= 0) throw new ArgumentException ("Invalid signal name: " + signal_name); - GLib.Value[] vals = new GLib.Value [args.Length + 1]; - GLib.ValueArray inst_and_params = new GLib.ValueArray ((uint) args.Length + 1); + Gst.GLib.Value[] vals = new Gst.GLib.Value [args.Length + 1]; + Gst.GLib.ValueArray inst_and_params = new Gst.GLib.ValueArray ((uint) args.Length + 1); - vals [0] = new GLib.Value (instance); + vals [0] = new Gst.GLib.Value (instance); inst_and_params.Append (vals [0]); for (int i = 1; i < vals.Length; i++) { - vals [i] = new GLib.Value (args [i - 1]); + vals [i] = new Gst.GLib.Value (args [i - 1]); inst_and_params.Append (vals [i]); } @@ -335,27 +335,27 @@ namespace Gst.GLib { Query query; g_signal_query (signal_id, out query); if (query.return_type != GType.None.Val) { - GLib.Value ret = GLib.Value.Empty; + Gst.GLib.Value ret = Gst.GLib.Value.Empty; g_signal_emitv (inst_and_params.ArrayPtr, signal_id, gquark, ref ret); ret_obj = ret.Val; ret.Dispose (); } else g_signal_emitv (inst_and_params.ArrayPtr, signal_id, gquark, IntPtr.Zero); - foreach (GLib.Value val in vals) + foreach (Gst.GLib.Value val in vals) val.Dispose (); return ret_obj; } private static uint GetGQuarkFromString (string str) { - IntPtr native_string = GLib.Marshaller.StringToPtrGStrdup (str); + IntPtr native_string = Gst.GLib.Marshaller.StringToPtrGStrdup (str); uint ret = g_quark_from_string (native_string); - GLib.Marshaller.Free (native_string); + Gst.GLib.Marshaller.Free (native_string); return ret; } - private static uint GetSignalId (string signal_name, GLib.Object obj) + private static uint GetSignalId (string signal_name, Gst.GLib.Object obj) { IntPtr typeid = GType.ValFromInstancePtr (obj.Handle); return GetSignalId (signal_name, typeid); @@ -363,13 +363,13 @@ namespace Gst.GLib { private static uint GetSignalId (string signal_name, IntPtr typeid) { - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (signal_name); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (signal_name); uint signal_id = g_signal_lookup (native_name, typeid); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); return signal_id; } - public static ulong AddEmissionHook (string detailed_signal, GLib.GType type, EmissionHook handler_func) + public static ulong AddEmissionHook (string detailed_signal, Gst.GLib.GType type, EmissionHook handler_func) { uint gquark; string signal_name; @@ -395,7 +395,7 @@ namespace Gst.GLib { static extern IntPtr g_signal_get_invocation_hint (IntPtr instance); [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, ref GLib.Value return_value); + static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, ref Gst.GLib.Value return_value); [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, IntPtr return_value); diff --git a/gstreamer-sharp/glib-sharp/SignalArgs.cs b/gstreamer-sharp/glib-sharp/SignalArgs.cs index f8e2eb4..a1d8cd3 100644 --- a/gstreamer-sharp/glib-sharp/SignalArgs.cs +++ b/gstreamer-sharp/glib-sharp/SignalArgs.cs @@ -1,4 +1,4 @@ -// GLib.SignalArgs.cs - Signal argument class implementation +// Gst.GLib.SignalArgs.cs - Signal argument class implementation // // Author: Mike Kestner <mkestner@speakeasy.net> // diff --git a/gstreamer-sharp/glib-sharp/SignalCallback.cs b/gstreamer-sharp/glib-sharp/SignalCallback.cs index c7f37ae..bf6749e 100644 --- a/gstreamer-sharp/glib-sharp/SignalCallback.cs +++ b/gstreamer-sharp/glib-sharp/SignalCallback.cs @@ -1,4 +1,4 @@ -// GLib.SignalCallback.cs - Signal callback base class implementation +// Gst.GLib.SignalCallback.cs - Signal callback base class implementation // // Authors: Mike Kestner <mkestner@ximian.com> // @@ -25,7 +25,7 @@ namespace Gst.GLib { using System.Collections; using System.Runtime.InteropServices; - [Obsolete ("Replaced by GLib.Signal.")] + [Obsolete ("Replaced by Gst.GLib.Signal.")] public abstract class SignalCallback : IDisposable { // A counter used to produce unique keys for instances. @@ -35,13 +35,13 @@ namespace Gst.GLib { protected static Hashtable _Instances = new Hashtable (); // protected instance members - protected GLib.Object _obj; + protected Gst.GLib.Object _obj; protected Delegate _handler; protected int _key; protected System.Type _argstype; protected uint _HandlerID; - protected SignalCallback (GLib.Object obj, Delegate eh, System.Type argstype) + protected SignalCallback (Gst.GLib.Object obj, Delegate eh, System.Type argstype) { _key = _NextKey++; _obj = obj; diff --git a/gstreamer-sharp/glib-sharp/SignalClosure.cs b/gstreamer-sharp/glib-sharp/SignalClosure.cs index 151531d..dbec5d6 100644 --- a/gstreamer-sharp/glib-sharp/SignalClosure.cs +++ b/gstreamer-sharp/glib-sharp/SignalClosure.cs @@ -28,10 +28,10 @@ namespace Gst.GLib { internal class ClosureInvokedArgs : EventArgs { EventArgs args; - GLib.Object obj; + Gst.GLib.Object obj; object result; - public ClosureInvokedArgs (GLib.Object obj, EventArgs args) + public ClosureInvokedArgs (Gst.GLib.Object obj, EventArgs args) { this.obj = obj; this.args = args; @@ -43,7 +43,7 @@ namespace Gst.GLib { } } - public GLib.Object Target { + public Gst.GLib.Object Target { get { return obj; } @@ -97,9 +97,9 @@ namespace Gst.GLib { public void Connect (bool is_after) { - IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); + IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); id = g_signal_connect_closure (handle, native_name, raw_closure, is_after); - GLib.Marshaller.Free (native_name); + Gst.GLib.Marshaller.Free (native_name); } public void Disconnect () @@ -147,7 +147,7 @@ namespace Gst.GLib { SignalClosure closure = closures [raw_closure] as SignalClosure; message = "Marshaling " + closure.name + " signal"; Value objval = (Value) Marshal.PtrToStructure (param_values, typeof (Value)); - GLib.Object __obj = objval.Val as GLib.Object; + Gst.GLib.Object __obj = objval.Val as Gst.GLib.Object; if (__obj == null) return; @@ -158,7 +158,7 @@ namespace Gst.GLib { SignalArgs args = Activator.CreateInstance (closure.args_type, new object [0]) as SignalArgs; args.Args = new object [n_param_vals - 1]; - GLib.Value[] vals = new GLib.Value [n_param_vals - 1]; + Gst.GLib.Value[] vals = new Gst.GLib.Value [n_param_vals - 1]; for (int i = 1; i < n_param_vals; i++) { IntPtr ptr = new IntPtr (param_values.ToInt64 () + i * Marshal.SizeOf (typeof (Value))); vals [i - 1] = (Value) Marshal.PtrToStructure (ptr, typeof (Value)); diff --git a/gstreamer-sharp/glib-sharp/Source.cs b/gstreamer-sharp/glib-sharp/Source.cs index e48a7b3..4463b65 100644 --- a/gstreamer-sharp/glib-sharp/Source.cs +++ b/gstreamer-sharp/glib-sharp/Source.cs @@ -1,4 +1,4 @@ -// GLib.Source.cs - Source class implementation +// Gst.GLib.Source.cs - Source class implementation // // Author: Duncan Mak <duncan@ximian.com> // diff --git a/gstreamer-sharp/glib-sharp/Spawn.cs b/gstreamer-sharp/glib-sharp/Spawn.cs index 2860309..bd671db 100644 --- a/gstreamer-sharp/glib-sharp/Spawn.cs +++ b/gstreamer-sharp/glib-sharp/Spawn.cs @@ -126,7 +126,7 @@ namespace Gst.GLib { Marshaller.Free (native_dir); Marshaller.Free (native_argv); Marshaller.Free (native_envp); - if (error != IntPtr.Zero) throw new GLib.GException (error); + if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); return result; } @@ -161,7 +161,7 @@ namespace Gst.GLib { Marshaller.Free (native_dir); Marshaller.Free (native_argv); Marshaller.Free (native_envp); - if (error != IntPtr.Zero) throw new GLib.GException (error); + if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); return result; } @@ -181,7 +181,7 @@ namespace Gst.GLib { Marshaller.Free (native_envp); stdout = Marshaller.PtrToStringGFree (native_stdout); stderr = Marshaller.PtrToStringGFree (native_stderr); - if (error != IntPtr.Zero) throw new GLib.GException (error); + if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); return result; } @@ -194,7 +194,7 @@ namespace Gst.GLib { IntPtr native_cmd = Marshaller.StringToPtrGStrdup (command_line); bool result = g_spawn_command_line_async (native_cmd, out error); Marshaller.Free (native_cmd); - if (error != IntPtr.Zero) throw new GLib.GException (error); + if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); return result; } @@ -209,7 +209,7 @@ namespace Gst.GLib { Marshaller.Free (native_cmd); stdout = Marshaller.PtrToStringGFree (native_stdout); stderr = Marshaller.PtrToStringGFree (native_stderr); - if (error != IntPtr.Zero) throw new GLib.GException (error); + if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); return result; } } diff --git a/gstreamer-sharp/glib-sharp/Timeout.cs b/gstreamer-sharp/glib-sharp/Timeout.cs index b33a065..f17a205 100755 --- a/gstreamer-sharp/glib-sharp/Timeout.cs +++ b/gstreamer-sharp/glib-sharp/Timeout.cs @@ -1,4 +1,4 @@ -// GLib.Timeout.cs - Timeout class implementation +// Gst.GLib.Timeout.cs - Timeout class implementation // // Author(s): // Mike Kestner <mkestner@speakeasy.net> diff --git a/gstreamer-sharp/glib-sharp/ToggleRef.cs b/gstreamer-sharp/glib-sharp/ToggleRef.cs index 6edf231..0476e6b 100644 --- a/gstreamer-sharp/glib-sharp/ToggleRef.cs +++ b/gstreamer-sharp/glib-sharp/ToggleRef.cs @@ -1,4 +1,4 @@ -// GLib.ToggleRef.cs - GLib ToggleRef class implementation +// Gst.GLib.ToggleRef.cs - Gst.GLib ToggleRef class implementation // // Author: Mike Kestner <mkestner@novell.com> // @@ -33,7 +33,7 @@ namespace Gst.GLib { GCHandle gch; Hashtable signals; - public ToggleRef (GLib.Object target) + public ToggleRef (Gst.GLib.Object target) { handle = target.Handle; gch = GCHandle.Alloc (this); @@ -67,15 +67,15 @@ namespace Gst.GLib { } } - public GLib.Object Target { + public Gst.GLib.Object Target { get { if (reference == null) return null; - else if (reference is GLib.Object) - return reference as GLib.Object; + else if (reference is Gst.GLib.Object) + return reference as Gst.GLib.Object; WeakReference weak = reference as WeakReference; - return weak.Target as GLib.Object; + return weak.Target as Gst.GLib.Object; } } @@ -111,7 +111,7 @@ namespace Gst.GLib { void Toggle (bool is_last_ref) { - if (is_last_ref && reference is GLib.Object) + if (is_last_ref && reference is Gst.GLib.Object) reference = new WeakReference (reference); else if (!is_last_ref && reference is WeakReference) { WeakReference weak = reference as WeakReference; diff --git a/gstreamer-sharp/glib-sharp/TypeConverter.cs b/gstreamer-sharp/glib-sharp/TypeConverter.cs index b26f25e..3de9650 100644 --- a/gstreamer-sharp/glib-sharp/TypeConverter.cs +++ b/gstreamer-sharp/glib-sharp/TypeConverter.cs @@ -1,4 +1,4 @@ -// GLib.TypeConverter.cs : Convert between fundamental and .NET types +// Gst.GLib.TypeConverter.cs : Convert between fundamental and .NET types // // Author: Rachel Hestilow <hestilow@ximian.com> // diff --git a/gstreamer-sharp/glib-sharp/TypeFundamentals.cs b/gstreamer-sharp/glib-sharp/TypeFundamentals.cs index 0c73ae7..d08c2b2 100644 --- a/gstreamer-sharp/glib-sharp/TypeFundamentals.cs +++ b/gstreamer-sharp/glib-sharp/TypeFundamentals.cs @@ -1,4 +1,4 @@ -// GLib.TypeFundamentals.cs : Standard Types enumeration +// Gst.GLib.TypeFundamentals.cs : Standard Types enumeration // // Author: Mike Kestner <mkestner@speakeasy.net> // diff --git a/gstreamer-sharp/glib-sharp/UnwrappedObject.cs b/gstreamer-sharp/glib-sharp/UnwrappedObject.cs index b270b07..08900eb 100644 --- a/gstreamer-sharp/glib-sharp/UnwrappedObject.cs +++ b/gstreamer-sharp/glib-sharp/UnwrappedObject.cs @@ -24,7 +24,7 @@ namespace Gst.GLib { using System; using System.Runtime.InteropServices; - [Obsolete ("Replaced by direct object-type casts to/from GLib.Value")] + [Obsolete ("Replaced by direct object-type casts to/from Gst.GLib.Value")] public class UnwrappedObject { IntPtr obj; diff --git a/gstreamer-sharp/glib-sharp/Value.cs b/gstreamer-sharp/glib-sharp/Value.cs index f3d7354..daf9b5c 100755 --- a/gstreamer-sharp/glib-sharp/Value.cs +++ b/gstreamer-sharp/glib-sharp/Value.cs @@ -1,4 +1,4 @@ -// GLib.Value.cs - GLib Value class implementation +// Gst.GLib.Value.cs - Gst.GLib Value class implementation // // Author: Mike Kestner <mkestner@speakeasy.net> // @@ -49,7 +49,7 @@ namespace Gst.GLib { public static Value Empty; - public Value (GLib.GType gtype) + public Value (Gst.GLib.GType gtype) { type = IntPtr.Zero; pad1 = new Padding (); @@ -133,9 +133,9 @@ namespace Gst.GLib { public Value (string val) : this (GType.String) { - IntPtr native_val = GLib.Marshaller.StringToPtrGStrdup (val); + IntPtr native_val = Gst.GLib.Marshaller.StringToPtrGStrdup (val); g_value_set_string (ref this, native_val); - GLib.Marshaller.Free (native_val); + Gst.GLib.Marshaller.Free (native_val); } public Value (ValueArray val) : this (ValueArray.GType) @@ -157,17 +157,17 @@ namespace Gst.GLib { g_value_set_boxed (ref this, val.Handle); } - public Value (GLib.Object val) : this (val == null ? GType.Object : val.NativeType) + public Value (Gst.GLib.Object val) : this (val == null ? GType.Object : val.NativeType) { g_value_set_object (ref this, val == null ? IntPtr.Zero : val.Handle); } - public Value (GLib.GInterfaceAdapter val) : this (val == null ? GType.Object : val.GType) + public Value (Gst.GLib.GInterfaceAdapter val) : this (val == null ? GType.Object : val.GType) { g_value_set_object (ref this, val == null ? IntPtr.Zero : val.Handle); } - public Value (GLib.Object obj, string prop_name) + public Value (Gst.GLib.Object obj, string prop_name) { type = IntPtr.Zero; pad1 = new Padding (); @@ -176,7 +176,7 @@ namespace Gst.GLib { } [Obsolete] - public Value (GLib.Object obj, string prop_name, EnumWrapper wrap) + public Value (Gst.GLib.Object obj, string prop_name, EnumWrapper wrap) { type = IntPtr.Zero; pad1 = new Padding (); @@ -194,11 +194,11 @@ namespace Gst.GLib { type = IntPtr.Zero; pad1 = new Padding (); pad2 = new Padding (); - InitForProperty (GLib.Object.GetObject (obj), prop_name); + InitForProperty (Gst.GLib.Object.GetObject (obj), prop_name); g_value_set_boxed (ref this, val.Handle); } - public Value (string[] val) : this (new GLib.GType (g_strv_get_type ())) + public Value (string[] val) : this (new Gst.GLib.GType (g_strv_get_type ())) { if (val == null) { g_value_set_boxed (ref this, IntPtr.Zero); @@ -207,13 +207,13 @@ namespace Gst.GLib { IntPtr native_array = Marshal.AllocHGlobal ((val.Length + 1) * IntPtr.Size); for (int i = 0; i < val.Length; i++) - Marshal.WriteIntPtr (native_array, i * IntPtr.Size, GLib.Marshaller.StringToPtrGStrdup (val[i])); + Marshal.WriteIntPtr (native_array, i * IntPtr.Size, Gst.GLib.Marshaller.StringToPtrGStrdup (val[i])); Marshal.WriteIntPtr (native_array, val.Length * IntPtr.Size, IntPtr.Zero); g_value_set_boxed (ref this, native_array); for (int i = 0; i < val.Length; i++) - GLib.Marshaller.Free (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); + Gst.GLib.Marshaller.Free (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); Marshal.FreeHGlobal (native_array); } @@ -223,7 +223,7 @@ namespace Gst.GLib { g_value_unset (ref this); } - public void Init (GLib.GType gtype) + public void Init (Gst.GLib.GType gtype) { g_value_init (ref this, gtype.Val); } @@ -299,7 +299,7 @@ namespace Gst.GLib { public static explicit operator string (Value val) { IntPtr str = g_value_get_string (ref val); - return str == IntPtr.Zero ? null : GLib.Marshaller.Utf8PtrToString (str); + return str == IntPtr.Zero ? null : Gst.GLib.Marshaller.Utf8PtrToString (str); } public static explicit operator ValueArray (Value val) @@ -312,23 +312,23 @@ namespace Gst.GLib { return g_value_get_pointer (ref val); } - public static explicit operator GLib.Opaque (Value val) + public static explicit operator Gst.GLib.Opaque (Value val) { - return GLib.Opaque.GetOpaque (g_value_get_boxed (ref val), (Type) new GType (val.type), false); + return Gst.GLib.Opaque.GetOpaque (g_value_get_boxed (ref val), (Type) new GType (val.type), false); } - public static explicit operator GLib.Boxed (Value val) + public static explicit operator Gst.GLib.Boxed (Value val) { - return new GLib.Boxed (g_value_get_boxed (ref val)); + return new Gst.GLib.Boxed (g_value_get_boxed (ref val)); } - public static explicit operator GLib.Object (Value val) + public static explicit operator Gst.GLib.Object (Value val) { - return GLib.Object.GetObject (g_value_get_object (ref val), false); + return Gst.GLib.Object.GetObject (g_value_get_object (ref val), false); } - [Obsolete ("Replaced by GLib.Object cast")] - public static explicit operator GLib.UnwrappedObject (Value val) + [Obsolete ("Replaced by Gst.GLib.Object cast")] + public static explicit operator Gst.GLib.UnwrappedObject (Value val) { return new UnwrappedObject (g_value_get_object (ref val)); } @@ -344,18 +344,18 @@ namespace Gst.GLib { count++; string[] strings = new string[count]; for (int i = 0; i < count; i++) - strings[i] = GLib.Marshaller.Utf8PtrToString (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); + strings[i] = Gst.GLib.Marshaller.Utf8PtrToString (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); return strings; } object ToRegisteredType () { - Type t = GLib.GType.LookupType (type); + Type t = Gst.GLib.GType.LookupType (type); ConstructorInfo ci = null; try { while (ci == null && t != null) { if (!t.IsAbstract) - ci = t.GetConstructor (new Type[] { typeof (GLib.Value) }); + ci = t.GetConstructor (new Type[] { typeof (Gst.GLib.Value) }); if (ci == null) t = t.BaseType; } @@ -370,12 +370,12 @@ namespace Gst.GLib { } void FromRegisteredType (object val) { - Type t = GLib.GType.LookupType (type); + Type t = Gst.GLib.GType.LookupType (type); MethodInfo mi = null; try { while (mi == null && t != null) { - mi = t.GetMethod ("SetGValue", new Type[] { Type.GetType ("GLib.Value&") }); + mi = t.GetMethod ("SetGValue", new Type[] { Type.GetType ("Gst.GLib.Value&") }); if (mi != null && (mi.IsAbstract || mi.ReturnType != typeof (void))) mi = null; if (mi == null) @@ -390,7 +390,7 @@ namespace Gst.GLib { object[] parameters = new object[] { this }; mi.Invoke (val, parameters); - this = (GLib.Value) parameters[0]; + this = (Gst.GLib.Value) parameters[0]; } object ToEnum () @@ -413,8 +413,8 @@ namespace Gst.GLib { Type t = GType.LookupType (type); if (t == null) throw new Exception ("Unknown type " + new GType (type).ToString ()); - else if (t.IsSubclassOf (typeof (GLib.Opaque))) - return (GLib.Opaque) this; + else if (t.IsSubclassOf (typeof (Gst.GLib.Opaque))) + return (Gst.GLib.Opaque) this; MethodInfo mi = t.GetMethod ("New", BindingFlags.Static | BindingFlags.Public | BindingFlags.FlattenHierarchy); if (mi == null) @@ -458,7 +458,7 @@ namespace Gst.GLib { else if (type == ManagedValue.GType.Val) return ManagedValue.ObjectForWrapper (g_value_get_boxed (ref this)); else if (GType.Is (type, GType.Object)) - return (GLib.Object) this; + return (Gst.GLib.Object) this; else if (GType.Is (type, GType.Boxed)) return ToBoxed (); else if (GType.LookupType (type) != null) @@ -492,9 +492,9 @@ namespace Gst.GLib { else if (type == GType.Double.Val) g_value_set_double (ref this, (double) value); else if (type == GType.String.Val) { - IntPtr native = GLib.Marshaller.StringToPtrGStrdup ((string)value); + IntPtr native = Gst.GLib.Marshaller.StringToPtrGStrdup ((string)value); g_value_set_string (ref this, native); - GLib.Marshaller.Free (native); + Gst.GLib.Marshaller.Free (native); } else if (type == GType.Pointer.Val) { if (value.GetType () == typeof (IntPtr)) { g_value_set_pointer (ref this, (IntPtr) value); @@ -515,10 +515,10 @@ namespace Gst.GLib { g_value_set_boxed (ref this, wrapper); ManagedValue.ReleaseWrapper (wrapper); } else if (GType.Is (type, GType.Object)) - if(value is GLib.Object) - g_value_set_object (ref this, (value as GLib.Object).Handle); + if(value is Gst.GLib.Object) + g_value_set_object (ref this, (value as Gst.GLib.Object).Handle); else - g_value_set_object (ref this, (value as GLib.GInterfaceAdapter).Handle); + g_value_set_object (ref this, (value as Gst.GLib.GInterfaceAdapter).Handle); else if (GType.Is (type, GType.Boxed)) { if (value is IWrapper) { g_value_set_boxed (ref this, ((IWrapper)value).Handle); @@ -527,7 +527,7 @@ namespace Gst.GLib { IntPtr buf = Marshaller.StructureToPtrAlloc (value); g_value_set_boxed (ref this, buf); Marshal.FreeHGlobal (buf); - } else if (GLib.GType.LookupType (type) != null) { + } else if (Gst.GLib.GType.LookupType (type) != null) { FromRegisteredType (value); } else throw new Exception ("Unknown type " + new GType (type).ToString ()); @@ -570,10 +570,10 @@ namespace Gst.GLib { static extern bool g_type_check_value_holds (ref Value val, IntPtr gtype); [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_value_init (ref GLib.Value val, IntPtr gtype); + static extern void g_value_init (ref Gst.GLib.Value val, IntPtr gtype); [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_value_unset (ref GLib.Value val); + static extern void g_value_unset (ref Gst.GLib.Value val); [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_boolean (ref Value val, bool data); diff --git a/gstreamer-sharp/glib-sharp/ValueArray.cs b/gstreamer-sharp/glib-sharp/ValueArray.cs index f7f199a..d962aed 100644 --- a/gstreamer-sharp/glib-sharp/ValueArray.cs +++ b/gstreamer-sharp/glib-sharp/ValueArray.cs @@ -116,25 +116,25 @@ namespace Gst.GLib { } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_value_array_append (IntPtr raw, ref GLib.Value val); + static extern void g_value_array_append (IntPtr raw, ref Gst.GLib.Value val); - public void Append (GLib.Value val) + public void Append (Gst.GLib.Value val) { g_value_array_append (Handle, ref val); } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_value_array_insert (IntPtr raw, uint idx, ref GLib.Value val); + static extern void g_value_array_insert (IntPtr raw, uint idx, ref Gst.GLib.Value val); - public void Insert (uint idx, GLib.Value val) + public void Insert (uint idx, Gst.GLib.Value val) { g_value_array_insert (Handle, idx, ref val); } [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_value_array_prepend (IntPtr raw, ref GLib.Value val); + static extern void g_value_array_prepend (IntPtr raw, ref Gst.GLib.Value val); - public void Prepend (GLib.Value val) + public void Prepend (Gst.GLib.Value val) { g_value_array_prepend (Handle, ref val); } @@ -158,7 +158,7 @@ namespace Gst.GLib { public object this [int index] { get { IntPtr raw_val = g_value_array_get_nth (Handle, (uint) index); - return Marshal.PtrToStructure (raw_val, typeof (GLib.Value)); + return Marshal.PtrToStructure (raw_val, typeof (Gst.GLib.Value)); } } @@ -238,9 +238,9 @@ namespace Gst.GLib { [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_array_get_type (); - public static GLib.GType GType { + public static Gst.GLib.GType GType { get { - return new GLib.GType (g_value_array_get_type ()); + return new Gst.GLib.GType (g_value_array_get_type ()); } } } diff --git a/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff b/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff index a386cfc..947793c 100644 --- a/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff +++ b/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff @@ -1,6 +1,11 @@ -diff -Naur glib-sharp-upstream/Argv.cs glib-sharp/Argv.cs --- glib-sharp-upstream/Argv.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Argv.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Argv.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Argv.cs : Argv marshaling class ++// Gst.GLib.Argv.cs : Argv marshaling class + // + // Author: Mike Kestner <mkestner@novell.com> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -10,9 +15,8 @@ diff -Naur glib-sharp-upstream/Argv.cs glib-sharp/Argv.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/Boxed.cs glib-sharp/Boxed.cs --- glib-sharp-upstream/Boxed.cs 2004-10-21 03:08:10.000000000 +0200 -+++ glib-sharp/Boxed.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Boxed.cs 2009-09-16 08:31:05.000000000 +0200 @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -22,9 +26,8 @@ diff -Naur glib-sharp-upstream/Boxed.cs glib-sharp/Boxed.cs using System; -diff -Naur glib-sharp-upstream/CDeclCallbackAttribute.cs glib-sharp/CDeclCallbackAttribute.cs --- glib-sharp-upstream/CDeclCallbackAttribute.cs 2009-07-02 22:18:10.000000000 +0200 -+++ glib-sharp/CDeclCallbackAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/CDeclCallbackAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -34,9 +37,8 @@ diff -Naur glib-sharp-upstream/CDeclCallbackAttribute.cs glib-sharp/CDeclCallbac using System; -diff -Naur glib-sharp-upstream/ClassInitializerAttribute.cs glib-sharp/ClassInitializerAttribute.cs --- glib-sharp-upstream/ClassInitializerAttribute.cs 2007-09-07 16:40:46.000000000 +0200 -+++ glib-sharp/ClassInitializerAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/ClassInitializerAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -46,9 +48,8 @@ diff -Naur glib-sharp-upstream/ClassInitializerAttribute.cs glib-sharp/ClassInit using System; -diff -Naur glib-sharp-upstream/ConnectBeforeAttribute.cs glib-sharp/ConnectBeforeAttribute.cs --- glib-sharp-upstream/ConnectBeforeAttribute.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/ConnectBeforeAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/ConnectBeforeAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -58,9 +59,8 @@ diff -Naur glib-sharp-upstream/ConnectBeforeAttribute.cs glib-sharp/ConnectBefor using System; -diff -Naur glib-sharp-upstream/DefaultSignalHandlerAttribute.cs glib-sharp/DefaultSignalHandlerAttribute.cs --- glib-sharp-upstream/DefaultSignalHandlerAttribute.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/DefaultSignalHandlerAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/DefaultSignalHandlerAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -70,9 +70,8 @@ diff -Naur glib-sharp-upstream/DefaultSignalHandlerAttribute.cs glib-sharp/Defau using System; -diff -Naur glib-sharp-upstream/DelegateWrapper.cs glib-sharp/DelegateWrapper.cs --- glib-sharp-upstream/DelegateWrapper.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/DelegateWrapper.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/DelegateWrapper.cs 2009-09-16 08:31:05.000000000 +0200 @@ -22,7 +22,7 @@ // Boston, MA 02111-1307, USA. @@ -82,9 +81,43 @@ diff -Naur glib-sharp-upstream/DelegateWrapper.cs glib-sharp/DelegateWrapper.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/DestroyNotify.cs glib-sharp/DestroyNotify.cs +@@ -56,8 +56,8 @@ + // currently only GObjects store + // callbacks over the long-term + +- if (o is GLib.Object) { +- AddDestroyNotify ((GLib.Object) o); ++ if (o is Gst.GLib.Object) { ++ AddDestroyNotify ((Gst.GLib.Object) o); + } + } else { + // If o is null, we cannot ask for a destroy +@@ -75,7 +75,7 @@ + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + private static extern void g_object_set_data_full (IntPtr obj, IntPtr name, IntPtr data, DestroyNotify destroy); + +- private void AddDestroyNotify (GLib.Object o) { ++ private void AddDestroyNotify (Gst.GLib.Object o) { + // This is a bit of an ugly hack. There is no + // way of getting a destroy notification + // explicitly, so we set some data and ask +@@ -92,7 +92,7 @@ + } + } + +- // This callback is invoked by GLib to indicate that the ++ // This callback is invoked by Gst.GLib to indicate that the + // object that owned the native delegate wrapper no longer + // exists and the instance of the delegate itself is removed from the hash table. + private void OnDestroy (IntPtr data) { --- glib-sharp-upstream/DestroyNotify.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/DestroyNotify.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/DestroyNotify.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.DestroyNotify.cs - internal DestroyNotify helper ++// Gst.GLib.DestroyNotify.cs - internal DestroyNotify helper + // + // Author: Mike Kestner <mkestner@novell.com> + // @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -94,10 +127,9 @@ diff -Naur glib-sharp-upstream/DestroyNotify.cs glib-sharp/DestroyNotify.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/EnumWrapper.cs glib-sharp/EnumWrapper.cs --- glib-sharp-upstream/EnumWrapper.cs 2005-07-22 20:36:50.000000000 +0200 -+++ glib-sharp/EnumWrapper.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -19,7 +19,7 @@ ++++ glib-sharp/EnumWrapper.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -19,12 +19,12 @@ // Boston, MA 02111-1307, USA. @@ -106,9 +138,20 @@ diff -Naur glib-sharp-upstream/EnumWrapper.cs glib-sharp/EnumWrapper.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/ExceptionManager.cs glib-sharp/ExceptionManager.cs + +- [Obsolete ("Replaced by direct enum type casts to/from GLib.Value")] ++ [Obsolete ("Replaced by direct enum type casts to/from Gst.GLib.Value")] + public class EnumWrapper { + int val; + public bool flags; --- glib-sharp-upstream/ExceptionManager.cs 2007-03-08 21:28:24.000000000 +0100 -+++ glib-sharp/ExceptionManager.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/ExceptionManager.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Application.cs - static Application class ++// Gst.GLib.Application.cs - static Application class + // + // Authors: Mike Kestner <mkestner@novell.com> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -118,9 +161,23 @@ diff -Naur glib-sharp-upstream/ExceptionManager.cs glib-sharp/ExceptionManager.c using System; -diff -Naur glib-sharp-upstream/FileUtils.cs glib-sharp/FileUtils.cs +@@ -53,7 +53,7 @@ + { + if (UnhandledException == null) { + Console.Error.WriteLine ("Exception in Gtk# callback delegate"); +- Console.Error.WriteLine (" Note: Applications can use GLib.ExceptionManager.UnhandledException to handle the exception."); ++ Console.Error.WriteLine (" Note: Applications can use Gst.GLib.ExceptionManager.UnhandledException to handle the exception."); + Console.Error.WriteLine (e); + Console.Error.WriteLine (new System.Diagnostics.StackTrace (true)); + Environment.Exit (1); --- glib-sharp-upstream/FileUtils.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/FileUtils.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/FileUtils.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.FileUtils.cs - GFileUtils class implementation ++// Gst.GLib.FileUtils.cs - GFileUtils class implementation + // + // Author: Martin Baulig <martin@gnome.org> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -130,9 +187,8 @@ diff -Naur glib-sharp-upstream/FileUtils.cs glib-sharp/FileUtils.cs using System; using System.Text; -diff -Naur glib-sharp-upstream/Format.cs glib-sharp/Format.cs --- glib-sharp-upstream/Format.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Format.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Format.cs 2009-09-16 08:31:05.000000000 +0200 @@ -23,7 +23,7 @@ using System; using System.Runtime.InteropServices; @@ -142,9 +198,8 @@ diff -Naur glib-sharp-upstream/Format.cs glib-sharp/Format.cs #if GTK_SHARP_2_14 public class Format { [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] -diff -Naur glib-sharp-upstream/GException.cs glib-sharp/GException.cs --- glib-sharp-upstream/GException.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/GException.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/GException.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -154,9 +209,8 @@ diff -Naur glib-sharp-upstream/GException.cs glib-sharp/GException.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/GInterfaceAdapter.cs glib-sharp/GInterfaceAdapter.cs --- glib-sharp-upstream/GInterfaceAdapter.cs 2009-07-21 08:51:10.000000000 +0200 -+++ glib-sharp/GInterfaceAdapter.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/GInterfaceAdapter.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -166,9 +220,8 @@ diff -Naur glib-sharp-upstream/GInterfaceAdapter.cs glib-sharp/GInterfaceAdapter using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/GInterfaceAttribute.cs glib-sharp/GInterfaceAttribute.cs --- glib-sharp-upstream/GInterfaceAttribute.cs 2007-09-11 22:34:24.000000000 +0200 -+++ glib-sharp/GInterfaceAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/GInterfaceAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -17,7 +17,7 @@ // Boston, MA 02111-1307, USA. @@ -178,12 +231,14 @@ diff -Naur glib-sharp-upstream/GInterfaceAttribute.cs glib-sharp/GInterfaceAttri using System; -diff -Naur glib-sharp-upstream/glib-api.xml glib-sharp/glib-api.xml -diff -Naur glib-sharp-upstream/glib-sharp-3.0.pc.in glib-sharp/glib-sharp-3.0.pc.in -diff -Naur glib-sharp-upstream/glib-sharp.dll.config.in glib-sharp/glib-sharp.dll.config.in -diff -Naur glib-sharp-upstream/Global.cs glib-sharp/Global.cs --- glib-sharp-upstream/Global.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Global.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Global.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Global.cs - Global glib properties and methods. ++// Gst.GLib.Global.cs - Global glib properties and methods. + // + // Author: Andres G. Aragoneses <aaragoneses@novell.com> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -193,14 +248,47 @@ diff -Naur glib-sharp-upstream/Global.cs glib-sharp/Global.cs using System; using System.Text; -diff -Naur glib-sharp-upstream/glue/Makefile.am glib-sharp/glue/Makefile.am -diff -Naur glib-sharp-upstream/glue/thread.c glib-sharp/glue/thread.c -diff -Naur glib-sharp-upstream/glue/win32dll.c glib-sharp/glue/win32dll.c -diff -Naur glib-sharp-upstream/gst-glib-sharp.diff glib-sharp/gst-glib-sharp.diff -diff -Naur glib-sharp-upstream/GString.cs glib-sharp/GString.cs +@@ -33,12 +33,12 @@ + + public static string ProgramName { + get { +- return GLib.Marshaller.PtrToStringGFree(g_get_prgname()); ++ return Gst.GLib.Marshaller.PtrToStringGFree(g_get_prgname()); + } + set { +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (value); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (value); + g_set_prgname (native_name); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + } + } + +@@ -50,12 +50,12 @@ + + public static string ApplicationName { + get { +- return GLib.Marshaller.PtrToStringGFree(g_get_application_name()); ++ return Gst.GLib.Marshaller.PtrToStringGFree(g_get_application_name()); + } + set { +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (value); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (value); + g_set_application_name (native_name); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + } + } + --- glib-sharp-upstream/GString.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/GString.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -19,7 +19,7 @@ ++++ glib-sharp/GString.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.GString.cs : Marshaler for GStrings ++// Gst.GLib.GString.cs : Marshaler for GStrings + // + // Author: Mike Kestner <mkestner@ximian.com> + // +@@ -19,11 +19,11 @@ // Boston, MA 02111-1307, USA. @@ -209,9 +297,13 @@ diff -Naur glib-sharp-upstream/GString.cs glib-sharp/GString.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/GTypeAttribute.cs glib-sharp/GTypeAttribute.cs +- public class GString : GLib.IWrapper { ++ public class GString : Gst.GLib.IWrapper { + + IntPtr handle; + --- glib-sharp-upstream/GTypeAttribute.cs 2005-05-04 18:54:24.000000000 +0200 -+++ glib-sharp/GTypeAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/GTypeAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -17,7 +17,7 @@ // Boston, MA 02111-1307, USA. @@ -221,9 +313,14 @@ diff -Naur glib-sharp-upstream/GTypeAttribute.cs glib-sharp/GTypeAttribute.cs using System; -diff -Naur glib-sharp-upstream/GType.cs glib-sharp/GType.cs --- glib-sharp-upstream/GType.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/GType.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/GType.cs 2009-09-16 08:34:13.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Type.cs - GLib GType class implementation ++// Gst.GLib.Type.cs - Gst.GLib GType class implementation + // + // Author: Mike Kestner <mkestner@speakeasy.net> + // @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -233,9 +330,125 @@ diff -Naur glib-sharp-upstream/GType.cs glib-sharp/GType.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/Idle.cs glib-sharp/Idle.cs +@@ -29,7 +29,7 @@ + using System.Runtime.InteropServices; + using System.Text; + +- public delegate System.Type TypeResolutionHandler (GLib.GType gtype, string gtype_name); ++ public delegate System.Type TypeResolutionHandler (Gst.GLib.GType gtype, string gtype_name); + + [StructLayout(LayoutKind.Sequential)] + public struct GType { +@@ -103,8 +103,8 @@ + + static GType () + { +- if (!GLib.Thread.Supported) +- GLib.Thread.Init (); ++ if (!Gst.GLib.Thread.Supported) ++ Gst.GLib.Thread.Init (); + + g_type_init (); + +@@ -119,7 +119,7 @@ + Register (GType.Double, typeof (double)); + Register (GType.String, typeof (string)); + Register (GType.Pointer, typeof (IntPtr)); +- Register (GType.Object, typeof (GLib.Object)); ++ Register (GType.Object, typeof (Gst.GLib.Object)); + Register (GType.Pointer, typeof (IntPtr)); + + // One-way mapping +@@ -135,8 +135,8 @@ + return (GType)gtypes[type]; + } + +- if (type.IsSubclassOf (typeof (GLib.Object))) { +- gtype = GLib.Object.LookupGType (type); ++ if (type.IsSubclassOf (typeof (Gst.GLib.Object))) { ++ gtype = Gst.GLib.Object.LookupGType (type); + Register (gtype, type); + return gtype; + } +@@ -148,7 +148,7 @@ + GTypeAttribute gattr = (GTypeAttribute)Attribute.GetCustomAttribute (type, typeof (GTypeAttribute), false); + pi = gattr.WrapperType.GetProperty ("GType", BindingFlags.Public | BindingFlags.Static); + gtype = (GType) pi.GetValue (null, null); +- } else if (type.IsSubclassOf (typeof (GLib.Opaque))) ++ } else if (type.IsSubclassOf (typeof (Gst.GLib.Opaque))) + gtype = GType.Pointer; + else + gtype = ManagedValue.GType; +@@ -162,7 +162,7 @@ + for (int i = 1; i < cname.Length; i++) { + if (System.Char.IsUpper (cname[i])) { + if (i == 1 && cname [0] == 'G') +- return "GLib." + cname.Substring (1); ++ return "Gst.GLib." + cname.Substring (1); + else + return cname.Substring (0, i) + "." + cname.Substring (i); + } +@@ -193,7 +193,7 @@ + string native_name = Marshaller.Utf8PtrToString (g_type_name (typeid)); + + if (ResolveType != null) { +- GLib.GType gt = new GLib.GType (typeid); ++ Gst.GLib.GType gt = new Gst.GLib.GType (typeid); + + Delegate[] invocation_list = ResolveType.GetInvocationList (); + foreach (Delegate d in invocation_list) { +@@ -302,7 +302,7 @@ + public GType GetThresholdType () + { + GType curr_type = this; +- while (curr_type.ToString ().StartsWith ("__gtksharp_")) ++ while (curr_type.ToString ().StartsWith ("__gst_gtksharp_")) + curr_type = curr_type.GetBaseType (); + return curr_type; + } +@@ -326,7 +326,7 @@ + string qn = t.FullName; + // Just a random guess + StringBuilder sb = new StringBuilder (20 + qn.Length); +- sb.Append ("__gtksharp_"); ++ sb.Append ("__gst_gtksharp_"); + sb.Append (type_uid++); + sb.Append ("_"); + foreach (char c in qn) { +@@ -349,14 +349,14 @@ + { + GType parent_gtype = LookupGObjectType (t.BaseType); + string name = BuildEscapedName (t); +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); + GTypeQuery query; + g_type_query (parent_gtype.Val, out query); + GTypeInfo info = new GTypeInfo (); + info.class_size = (ushort) query.class_size; + info.instance_size = (ushort) query.instance_size; + GType gtype = new GType (g_type_register_static (parent_gtype.Val, native_name, ref info, 0)); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + Register (gtype, t); + return gtype; + } +@@ -372,7 +372,7 @@ + if (pi != null) + return (GType) pi.GetValue (null, null); + +- return GLib.Object.RegisterGType (t); ++ return Gst.GLib.Object.RegisterGType (t); + } + + internal static IntPtr ValFromInstancePtr (IntPtr handle) --- glib-sharp-upstream/Idle.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Idle.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Idle.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Idle.cs - Idle class implementation ++// Gst.GLib.Idle.cs - Idle class implementation + // + // Author(s): + // Mike Kestner <mkestner@speakeasy.net> @@ -24,7 +24,7 @@ // Boston, MA 02111-1307, USA. @@ -245,9 +458,8 @@ diff -Naur glib-sharp-upstream/Idle.cs glib-sharp/Idle.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/IgnoreClassInitializersAttribute.cs glib-sharp/IgnoreClassInitializersAttribute.cs --- glib-sharp-upstream/IgnoreClassInitializersAttribute.cs 2007-09-07 16:40:46.000000000 +0200 -+++ glib-sharp/IgnoreClassInitializersAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/IgnoreClassInitializersAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -257,9 +469,8 @@ diff -Naur glib-sharp-upstream/IgnoreClassInitializersAttribute.cs glib-sharp/Ig using System; -diff -Naur glib-sharp-upstream/InitiallyUnowned.cs glib-sharp/InitiallyUnowned.cs --- glib-sharp-upstream/InitiallyUnowned.cs 2009-08-08 05:06:53.000000000 +0200 -+++ glib-sharp/InitiallyUnowned.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/InitiallyUnowned.cs 2009-09-16 08:31:05.000000000 +0200 @@ -20,7 +20,7 @@ #if GTK_SHARP_2_10 @@ -269,10 +480,18 @@ diff -Naur glib-sharp-upstream/InitiallyUnowned.cs glib-sharp/InitiallyUnowned.c using System; using System.Collections; -diff -Naur glib-sharp-upstream/IOChannel.cs glib-sharp/IOChannel.cs +@@ -31,7 +31,7 @@ + + protected InitiallyUnowned (IntPtr raw) : base (raw) {} + +- public new static GLib.GType GType { ++ public new static Gst.GLib.GType GType { + get { + return GType.Object; + } --- glib-sharp-upstream/IOChannel.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/IOChannel.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -19,7 +19,7 @@ ++++ glib-sharp/IOChannel.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -19,11 +19,11 @@ // Boston, MA 02111-1307, USA. @@ -281,7 +500,12 @@ diff -Naur glib-sharp-upstream/IOChannel.cs glib-sharp/IOChannel.cs using System; using System.Runtime.InteropServices; -@@ -51,7 +51,7 @@ +- using GLib; ++ using Gst.GLib; + + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate bool IOFuncNative(IntPtr source, int condition, IntPtr data); +@@ -51,11 +51,11 @@ } } @@ -290,9 +514,13 @@ diff -Naur glib-sharp-upstream/IOChannel.cs glib-sharp/IOChannel.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/IWrapper.cs glib-sharp/IWrapper.cs +- using GLibSharp; ++ using Gst.GLibSharp; + + public class IOChannel : IDisposable, IWrapper { + --- glib-sharp-upstream/IWrapper.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/IWrapper.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/IWrapper.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -302,10 +530,9 @@ diff -Naur glib-sharp-upstream/IWrapper.cs glib-sharp/IWrapper.cs { using System; -diff -Naur glib-sharp-upstream/ListBase.cs glib-sharp/ListBase.cs --- glib-sharp-upstream/ListBase.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/ListBase.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -20,7 +20,7 @@ ++++ glib-sharp/ListBase.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -20,13 +20,13 @@ // Boston, MA 02111-1307, USA. @@ -314,9 +541,53 @@ diff -Naur glib-sharp-upstream/ListBase.cs glib-sharp/ListBase.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/List.cs glib-sharp/List.cs + using System.Runtime.InteropServices; + +- public abstract class ListBase : IDisposable, ICollection, GLib.IWrapper, ICloneable { ++ public abstract class ListBase : IDisposable, ICollection, Gst.GLib.IWrapper, ICloneable { + + private IntPtr list_ptr = IntPtr.Zero; + private int length = -1; +@@ -159,10 +159,10 @@ + ret = Marshaller.FilenamePtrToString (data); + else if (element_type == typeof (IntPtr)) + ret = data; +- else if (element_type.IsSubclassOf (typeof (GLib.Object))) +- ret = GLib.Object.GetObject (data, false); +- else if (element_type.IsSubclassOf (typeof (GLib.Opaque))) +- ret = GLib.Opaque.GetOpaque (data, element_type, elements_owned); ++ else if (element_type.IsSubclassOf (typeof (Gst.GLib.Object))) ++ ret = Gst.GLib.Object.GetObject (data, false); ++ else if (element_type.IsSubclassOf (typeof (Gst.GLib.Opaque))) ++ ret = Gst.GLib.Opaque.GetOpaque (data, element_type, elements_owned); + else if (element_type == typeof (int)) + ret = (int) data; + else if (element_type.IsValueType) +@@ -175,7 +175,7 @@ + ret = Activator.CreateInstance (element_type, new object[] {data}); + + } else if (Object.IsObject (data)) +- ret = GLib.Object.GetObject (data, false); ++ ret = Gst.GLib.Object.GetObject (data, false); + + return ret; + } +@@ -190,10 +190,10 @@ + { + if (elements_owned) + for (uint i = 0; i < Count; i++) +- if (typeof (GLib.Object).IsAssignableFrom (element_type)) ++ if (typeof (Gst.GLib.Object).IsAssignableFrom (element_type)) + g_object_unref (NthData (i)); +- else if (typeof (GLib.Opaque).IsAssignableFrom (element_type)) +- GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); ++ else if (typeof (Gst.GLib.Opaque).IsAssignableFrom (element_type)) ++ Gst.GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); + else + g_free (NthData (i)); + --- glib-sharp-upstream/List.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/List.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/List.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -326,9 +597,8 @@ diff -Naur glib-sharp-upstream/List.cs glib-sharp/List.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/Log.cs glib-sharp/Log.cs --- glib-sharp-upstream/Log.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Log.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Log.cs 2009-09-16 08:31:05.000000000 +0200 @@ -22,7 +22,7 @@ // @@ -338,9 +608,23 @@ diff -Naur glib-sharp-upstream/Log.cs glib-sharp/Log.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/MainContext.cs glib-sharp/MainContext.cs +@@ -39,7 +39,7 @@ + FlagRecursion = 1 << 0, + FlagFatal = 1 << 1, + +- /* GLib log levels */ ++ /* Gst.GLib log levels */ + Error = 1 << 2, /* always fatal */ + Critical = 1 << 3, + Warning = 1 << 4, --- glib-sharp-upstream/MainContext.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/MainContext.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/MainContext.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.MainContext.cs - mainContext class implementation ++// Gst.GLib.MainContext.cs - mainContext class implementation + // + // Author: Radek Doulik <rodo@matfyz.cz> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -350,9 +634,14 @@ diff -Naur glib-sharp-upstream/MainContext.cs glib-sharp/MainContext.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/MainLoop.cs glib-sharp/MainLoop.cs --- glib-sharp-upstream/MainLoop.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/MainLoop.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/MainLoop.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.MainLoop.cs - g_main_loop class implementation ++// Gst.GLib.MainLoop.cs - g_main_loop class implementation + // + // Author: Jeroen Zwartepoorte <jeroen@xs4all.nl> + // @@ -21,7 +21,7 @@ using System; using System.Runtime.InteropServices; @@ -362,11 +651,15 @@ diff -Naur glib-sharp-upstream/MainLoop.cs glib-sharp/MainLoop.cs public class MainLoop { private IntPtr handle; -diff -Naur glib-sharp-upstream/Makefile.am glib-sharp/Makefile.am -diff -Naur glib-sharp-upstream/ManagedValue.cs glib-sharp/ManagedValue.cs --- glib-sharp-upstream/ManagedValue.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/ManagedValue.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -19,7 +19,7 @@ ++++ glib-sharp/ManagedValue.cs 2009-09-16 08:33:09.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.ManagedValue.cs : Managed types boxer ++// Gst.GLib.ManagedValue.cs : Managed types boxer + // + // Author: Rachel Hestilow <hestilow@ximian.com> + // +@@ -19,11 +19,11 @@ // Boston, MA 02111-1307, USA. @@ -375,18 +668,24 @@ diff -Naur glib-sharp-upstream/ManagedValue.cs glib-sharp/ManagedValue.cs using System; using System.Collections; using System.Runtime.InteropServices; -@@ -76,7 +76,7 @@ +- using GLib; ++ using Gst.GLib; + + internal class ManagedValue { + +@@ -76,8 +76,8 @@ copy = new CopyFunc (Copy); free = new FreeFunc (Free); - IntPtr name = Marshaller.StringToPtrGStrdup ("GtkSharpValue"); +- boxed_type = new GLib.GType (g_boxed_type_register_static (name, copy, free)); + IntPtr name = Marshaller.StringToPtrGStrdup ("GstGLibSharpValue"); - boxed_type = new GLib.GType (g_boxed_type_register_static (name, copy, free)); ++ boxed_type = new Gst.GLib.GType (g_boxed_type_register_static (name, copy, free)); Marshaller.Free (name); } -diff -Naur glib-sharp-upstream/Markup.cs glib-sharp/Markup.cs + --- glib-sharp-upstream/Markup.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Markup.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Markup.cs 2009-09-16 08:31:05.000000000 +0200 @@ -23,7 +23,7 @@ using System; using System.Runtime.InteropServices; @@ -396,9 +695,14 @@ diff -Naur glib-sharp-upstream/Markup.cs glib-sharp/Markup.cs public class Markup { -diff -Naur glib-sharp-upstream/Marshaller.cs glib-sharp/Marshaller.cs --- glib-sharp-upstream/Marshaller.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Marshaller.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Marshaller.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLibSharp.Marshaller.cs : Marshalling utils ++// Gst.GLibSharp.Marshaller.cs : Marshalling utils + // + // Author: Rachel Hestilow <rachel@nullenvoid.com> + // Mike Kestner <mkestner@ximian.com> @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. @@ -408,9 +712,79 @@ diff -Naur glib-sharp-upstream/Marshaller.cs glib-sharp/Marshaller.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/MissingIntPtrCtorException.cs glib-sharp/MissingIntPtrCtorException.cs +@@ -56,7 +56,7 @@ + IntPtr dummy, error; + IntPtr utf8 = g_filename_to_utf8 (ptr, -1, IntPtr.Zero, out dummy, out error); + if (error != IntPtr.Zero) +- throw new GLib.GException (error); ++ throw new Gst.GLib.GException (error); + return Utf8PtrToString (utf8); + } + +@@ -200,9 +200,9 @@ + string[] members = new string[count]; + for (int i = 0; i < count; ++i) { + IntPtr s = Marshal.ReadIntPtr (string_array, i * IntPtr.Size); +- members[i] = GLib.Marshaller.PtrToStringGFree (s); ++ members[i] = Gst.GLib.Marshaller.PtrToStringGFree (s); + } +- GLib.Marshaller.Free (string_array); ++ Gst.GLib.Marshaller.Free (string_array); + return members; + } + +@@ -262,7 +262,7 @@ + return buf; + } + +- [Obsolete ("Use GLib.Argv instead to avoid leaks.")] ++ [Obsolete ("Use Gst.GLib.Argv instead to avoid leaks.")] + public static IntPtr ArgvToArrayPtr (string[] args) + { + if (args.Length == 0) +@@ -303,7 +303,7 @@ + return args; + } + +- [Obsolete ("Use GLib.Argv instead to avoid leaks.")] ++ [Obsolete ("Use Gst.GLib.Argv instead to avoid leaks.")] + public static string[] ArrayPtrToArgv (IntPtr array, int argc) + { + if (argc == 0) +@@ -379,10 +379,10 @@ + { + Type array_type = elem_type == typeof (ListBase.FilenameString) ? typeof (string) : elem_type; + ListBase list; +- if (list_type == typeof(GLib.List)) +- list = new GLib.List (list_ptr, elem_type, owned, elements_owned); ++ if (list_type == typeof(Gst.GLib.List)) ++ list = new Gst.GLib.List (list_ptr, elem_type, owned, elements_owned); + else +- list = new GLib.SList (list_ptr, elem_type, owned, elements_owned); ++ list = new Gst.GLib.SList (list_ptr, elem_type, owned, elements_owned); + + using (list) + return ListToArray (list, array_type); +@@ -390,7 +390,7 @@ + + public static Array PtrArrayToArray (IntPtr list_ptr, bool owned, bool elements_owned, Type elem_type) + { +- GLib.PtrArray array = new GLib.PtrArray (list_ptr, elem_type, owned, elements_owned); ++ Gst.GLib.PtrArray array = new Gst.GLib.PtrArray (list_ptr, elem_type, owned, elements_owned); + Array ret = Array.CreateInstance (elem_type, array.Count); + array.CopyTo (ret, 0); + array.Dispose (); +@@ -403,7 +403,7 @@ + if (list.Count > 0) + list.CopyTo (result, 0); + +- if (type.IsSubclassOf (typeof (GLib.Opaque))) ++ if (type.IsSubclassOf (typeof (Gst.GLib.Opaque))) + list.elements_owned = false; + + return result; --- glib-sharp-upstream/MissingIntPtrCtorException.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/MissingIntPtrCtorException.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/MissingIntPtrCtorException.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -420,10 +794,9 @@ diff -Naur glib-sharp-upstream/MissingIntPtrCtorException.cs glib-sharp/MissingI using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/NotifyHandler.cs glib-sharp/NotifyHandler.cs --- glib-sharp-upstream/NotifyHandler.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/NotifyHandler.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -14,7 +14,7 @@ ++++ glib-sharp/NotifyHandler.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -14,14 +14,14 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -432,9 +805,16 @@ diff -Naur glib-sharp-upstream/NotifyHandler.cs glib-sharp/NotifyHandler.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/Object.cs glib-sharp/Object.cs ---- glib-sharp-upstream/Object.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Object.cs 2009-09-11 08:35:22.000000000 +0200 + + public delegate void NotifyHandler (object o, NotifyArgs args); + +- public class NotifyArgs : GLib.SignalArgs { ++ public class NotifyArgs : Gst.GLib.SignalArgs { + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr g_param_spec_get_name (IntPtr pspec); + +--- glib-sharp-upstream/Object.cs 2009-09-12 03:01:12.000000000 +0200 ++++ glib-sharp/Object.cs 2009-09-16 08:34:21.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -444,209 +824,299 @@ diff -Naur glib-sharp-upstream/Object.cs glib-sharp/Object.cs using System; using System.Collections; -@@ -185,21 +185,23 @@ +@@ -118,7 +118,7 @@ + if (!owned_ref) + g_object_ref (o); + +- obj = GLib.ObjectManager.CreateObject(o); ++ obj = Gst.GLib.ObjectManager.CreateObject(o); + if (obj == null) { + g_object_unref (o); + return null; +@@ -163,7 +163,7 @@ + m.Invoke (null, parms); } - } -+ [StructLayout(LayoutKind.Sequential)] - struct GTypeClass { - public IntPtr gtype; - } - -+ [StructLayout(LayoutKind.Sequential)] - struct GObjectClass { - GTypeClass type_class; - IntPtr construct_props; -- IntPtr constructor_cb; -+ public ConstructorDelegate constructor_cb; - public SetPropertyDelegate set_prop_cb; - public GetPropertyDelegate get_prop_cb; - IntPtr dispose; - IntPtr finalize; - IntPtr dispatch_properties_changed; - IntPtr notify; -- IntPtr constructed; -+ public ConstructedDelegate constructed_cb; - IntPtr dummy1; - IntPtr dummy2; - IntPtr dummy3; -@@ -209,13 +211,37 @@ - IntPtr dummy7; - } - -+ static Hashtable class_structs; -+ -+ static GObjectClass GetClassStruct (GLib.GType gtype, bool use_cache) -+ { -+ if (class_structs == null) -+ class_structs = new Hashtable (); -+ -+ if (use_cache && class_structs.Contains (gtype)) -+ return (GObjectClass) class_structs [gtype]; -+ else { -+ IntPtr class_ptr = gtype.GetClassPtr (); -+ GObjectClass class_struct = (GObjectClass) Marshal.PtrToStructure (class_ptr, typeof (GObjectClass)); -+ if (use_cache) -+ class_structs.Add (gtype, class_struct); -+ return class_struct; -+ } -+ } -+ -+ static void OverrideClassStruct (GLib.GType gtype, GObjectClass class_struct) -+ { -+ IntPtr class_ptr = gtype.GetClassPtr (); -+ Marshal.StructureToPtr (class_struct, class_ptr, false); -+ } -+ -+ - static void OverridePropertyHandlers (GType gtype, GetPropertyDelegate get_cb, SetPropertyDelegate set_cb) - { -- IntPtr class_ptr = gtype.GetClassPtr (); -- GObjectClass klass = (GObjectClass) Marshal.PtrToStructure (class_ptr, typeof (GObjectClass)); -+ GObjectClass klass = GetClassStruct (gtype, false); - klass.get_prop_cb = get_cb; - klass.set_prop_cb = set_cb; -- Marshal.StructureToPtr (klass, class_ptr, false); -+ OverrideClassStruct (gtype, klass); - } +- for (Type curr = t; curr != typeof(GLib.Object); curr = curr.BaseType) { ++ for (Type curr = t; curr != typeof(Gst.GLib.Object); curr = curr.BaseType) { + + if (curr.Assembly.IsDefined (typeof (IgnoreClassInitializersAttribute), false)) + continue; +@@ -227,7 +227,7 @@ - [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] -@@ -230,9 +256,68 @@ - return pspec.Handle; - } - -+ static ConstructorDelegate Constructor_cb = new ConstructorDelegate (constructor_cb); -+ delegate IntPtr ConstructorDelegate (IntPtr gtype, uint n_construct_properties, IntPtr construct_properties); -+ -+ [StructLayout(LayoutKind.Sequential)] -+ struct GObjectConstructParam { -+ public IntPtr pspec; -+ public IntPtr value; -+ } -+ -+ static IntPtr constructor_cb (IntPtr gtype, uint n_construct_properties, IntPtr construct_properties) -+ { -+ GType type = new GLib.GType (gtype); -+ IntPtr instance = GetClassStruct (type.GetThresholdType (), false).constructor_cb (gtype, n_construct_properties, construct_properties); -+ for (int i = 0; i < n_construct_properties; i++) { -+ IntPtr p = new IntPtr ((long) construct_properties + i * Marshal.SizeOf (typeof (GObjectConstructParam))); -+ -+ GObjectConstructParam cparam = (GObjectConstructParam) Marshal.PtrToStructure (p, typeof (GObjectConstructParam)); -+ -+ ParamSpec pspec = new ParamSpec (cparam.pspec); -+ GLib.Value val = (Value) Marshal.PtrToStructure (cparam.value, typeof (Value)); -+ -+ if (pspec.Name == "gtk-sharp-managed-instance" && (IntPtr) val.Val != IntPtr.Zero) { -+ GCHandle gch = (GCHandle) (IntPtr) val.Val; -+ Object o = (GLib.Object) gch.Target; -+ o.Raw = instance; -+ } -+ } -+ -+ return instance; -+ } -+ -+ static ConstructedDelegate Constructed_cb = new ConstructedDelegate (constructed_cb); -+ [GLib.CDeclCallback] -+ delegate void ConstructedDelegate (IntPtr o); -+ -+ static void constructed_cb (IntPtr o) -+ { -+ GLib.Object __obj = GLib.Object.GetObject (o, false) as GLib.Object; -+ ConstructedDelegate unmanaged = GetClassStruct (__obj.LookupGType ().GetThresholdType (), true).constructed_cb; -+ if (unmanaged != null) -+ unmanaged (__obj.Handle); -+ } -+ -+ static SetPropertyDelegate Set_prop_dummy_cb = new SetPropertyDelegate (set_prop_dummy_cb); -+ static void set_prop_dummy_cb (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec) {} -+ - static void AddProperties (GType gtype, System.Type t) + static IntPtr ConstructorCallback (IntPtr gtypeval, uint n_construct_properties, IntPtr construct_properties) { - uint idx = 1; -+ -+ if (gtype.GetBaseType () == gtype.GetThresholdType ()) { -+ GObjectClass gobject_class = GetClassStruct (gtype, false); -+ gobject_class.constructor_cb = Constructor_cb; -+ gobject_class.constructed_cb = Constructed_cb; -+ gobject_class.set_prop_cb = Set_prop_dummy_cb; -+ OverrideClassStruct (gtype, gobject_class); -+ -+ IntPtr declaring_class = gtype.GetClassPtr (); -+ ParamSpec pspec = new ParamSpec ("gtk-sharp-managed-instance", "", "", GType.Pointer, ParamFlags.Writable | ParamFlags.ConstructOnly); -+ g_object_class_install_property (declaring_class, idx, pspec.Handle); -+ idx++; -+ } - - bool handlers_overridden = false; +- GType gtype = new GLib.GType (gtypeval); ++ GType gtype = new Gst.GLib.GType (gtypeval); + GObjectClass threshold_class = (GObjectClass) Marshal.PtrToStructure (gtype.GetThresholdType ().GetClassPtr (), typeof (GObjectClass)); + IntPtr raw = threshold_class.constructor_cb (gtypeval, n_construct_properties, construct_properties); + bool construct_needed = true; +@@ -241,7 +241,7 @@ + Value val = (Value) Marshal.PtrToStructure (Marshal.ReadIntPtr (p, IntPtr.Size), typeof (Value)); + if ((IntPtr) val.Val != IntPtr.Zero) { + GCHandle gch = (GCHandle) (IntPtr) val.Val; +- Object o = (GLib.Object) gch.Target; ++ Object o = (Gst.GLib.Object) gch.Target; + o.Raw = raw; + construct_needed = false; + break; +@@ -281,7 +281,7 @@ foreach (PropertyInfo pinfo in t.GetProperties (BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)) { -@@ -262,6 +347,9 @@ + foreach (object attr in pinfo.GetCustomAttributes (typeof (PropertyAttribute), false)) { + if(pinfo.GetIndexParameters().Length > 0) +- throw(new InvalidOperationException(String.Format("GLib.RegisterPropertyAttribute cannot be applied to property {0} of type {1} because the property expects one or more indexed parameters", pinfo.Name, t.FullName))); ++ throw(new InvalidOperationException(String.Format("Gst.GLib.RegisterPropertyAttribute cannot be applied to property {0} of type {1} because the property expects one or more indexed parameters", pinfo.Name, t.FullName))); + + if (!handlers_overridden) { + IntPtr class_ptr = gtype.GetClassPtr (); +@@ -297,21 +297,21 @@ + Properties.Add (param_spec, pinfo); + idx++; + } catch (ArgumentException) { +- throw new InvalidOperationException (String.Format ("GLib.PropertyAttribute cannot be applied to property {0} of type {1} because the return type of the property is not supported", pinfo.Name, t.FullName)); ++ throw new InvalidOperationException (String.Format ("Gst.GLib.PropertyAttribute cannot be applied to property {0} of type {1} because the return type of the property is not supported", pinfo.Name, t.FullName)); + } + } + } + } + + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] +- delegate void GetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); ++ delegate void GetPropertyDelegate (IntPtr GObject, uint property_id, ref Gst.GLib.Value value, IntPtr pspec); - static void GetPropertyCallback (IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) +- static void GetPropertyCallback (IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) ++ static void GetPropertyCallback (IntPtr handle, uint property_id, ref Gst.GLib.Value value, IntPtr param_spec) { -+ if (!Properties.Contains (param_spec)) -+ return; -+ - GLib.Object obj = GLib.Object.GetObject (handle, false); + if (!Properties.Contains (param_spec)) + return; + +- GLib.Object obj = GLib.Object.GetObject (handle, false); ++ Gst.GLib.Object obj = Gst.GLib.Object.GetObject (handle, false); value.Val = (Properties [param_spec] as PropertyInfo).GetValue (obj, new object [0]); } -@@ -280,6 +368,9 @@ - static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) +@@ -325,14 +325,14 @@ + } + + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] +- delegate void SetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); ++ delegate void SetPropertyDelegate (IntPtr GObject, uint property_id, ref Gst.GLib.Value value, IntPtr pspec); + +- static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) ++ static void SetPropertyCallback(IntPtr handle, uint property_id, ref Gst.GLib.Value value, IntPtr param_spec) { -+ if (!Properties.Contains (param_spec)) -+ return; -+ - GLib.Object obj = GLib.Object.GetObject (handle, false); + if (!Properties.Contains (param_spec)) + return; + +- GLib.Object obj = GLib.Object.GetObject (handle, false); ++ Gst.GLib.Object obj = Gst.GLib.Object.GetObject (handle, false); (Properties [param_spec] as PropertyInfo).SetValue (obj, value.Val, new object [0]); } -@@ -360,12 +451,28 @@ - protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals) +@@ -386,7 +386,7 @@ + if (Handle != IntPtr.Zero) { + GTypeInstance obj = (GTypeInstance) Marshal.PtrToStructure (Handle, typeof (GTypeInstance)); + GTypeClass klass = (GTypeClass) Marshal.PtrToStructure (obj.g_class, typeof (GTypeClass)); +- return new GLib.GType (klass.gtype); ++ return new Gst.GLib.GType (klass.gtype); + } else { + return LookupGType (GetType ()); + } +@@ -404,7 +404,7 @@ + + protected Object () + { +- CreateNativeObject (new string [0], new GLib.Value [0]); ++ CreateNativeObject (new string [0], new Gst.GLib.Value [0]); + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +@@ -412,26 +412,26 @@ + + struct GParameter { + public IntPtr name; +- public GLib.Value val; ++ public Gst.GLib.Value val; + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr g_object_newv (IntPtr gtype, int n_params, GParameter[] parms); + +- protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals) ++ protected virtual void CreateNativeObject (string[] names, Gst.GLib.Value[] vals) { -- GParameter[] parms = new GParameter [names.Length]; -+ GLib.GType gtype = LookupGType (); -+ bool managed_type = gtype.ToString().StartsWith ("__gtksharp_"); -+ -+ GParameter[] parms = new GParameter [names.Length + ((managed_type) ? 1 : 0)]; -+ + GType gtype = LookupGType (); +- bool is_managed_subclass = gtype.ToString ().StartsWith ("__gtksharp"); ++ bool is_managed_subclass = gtype.ToString ().StartsWith ("__gst_gtksharp"); + GParameter[] parms = new GParameter [is_managed_subclass ? names.Length + 1 : names.Length]; for (int i = 0; i < names.Length; i++) { - parms [i].name = GLib.Marshaller.StringToPtrGStrdup (names [i]); +- parms [i].name = GLib.Marshaller.StringToPtrGStrdup (names [i]); ++ parms [i].name = Gst.GLib.Marshaller.StringToPtrGStrdup (names [i]); parms [i].val = vals [i]; } -- Raw = g_object_newv (LookupGType ().Val, parms.Length, parms); -+ -+ if (managed_type) { -+ GCHandle gch = GCHandle.Alloc (this); -+ parms[names.Length].name = GLib.Marshaller.StringToPtrGStrdup ("gtk-sharp-managed-instance"); -+ parms[names.Length].val = new GLib.Value ((IntPtr) gch); -+ -+ Raw = g_object_newv (gtype.Val, parms.Length, parms); -+ -+ gch.Free (); -+ } else { -+ Raw = g_object_newv (gtype.Val, parms.Length, parms); -+ } -+ + + if (is_managed_subclass) { + GCHandle gch = GCHandle.Alloc (this); +- parms[names.Length].name = GLib.Marshaller.StringToPtrGStrdup ("gtk-sharp-managed-instance"); +- parms[names.Length].val = new GLib.Value ((IntPtr) gch); ++ parms[names.Length].name = Gst.GLib.Marshaller.StringToPtrGStrdup ("gtk-sharp-managed-instance"); ++ parms[names.Length].val = new Gst.GLib.Value ((IntPtr) gch); + Raw = g_object_newv (gtype.Val, parms.Length, parms); + gch.Free (); + } else { +@@ -439,7 +439,7 @@ + } + foreach (GParameter p in parms) - GLib.Marshaller.Free (p.name); +- GLib.Marshaller.Free (p.name); ++ Gst.GLib.Marshaller.Free (p.name); } -@@ -593,10 +700,12 @@ - return g_type_check_instance_is_a (obj, GType.Object.Val); + + protected virtual IntPtr Raw { +@@ -465,7 +465,7 @@ + } + } + +- public static GLib.GType GType { ++ public static Gst.GLib.GType GType { + get { + return GType.Object; + } +@@ -477,7 +477,7 @@ + } } -+ [StructLayout(LayoutKind.Sequential)] - struct GTypeInstance { - public IntPtr g_class; +- internal GLib.GType NativeType { ++ internal Gst.GLib.GType NativeType { + get { + return LookupGType (); + } +@@ -502,7 +502,7 @@ } -+ [StructLayout(LayoutKind.Sequential)] - struct GObject { - public GTypeInstance type_instance; - public uint ref_count; -diff -Naur glib-sharp-upstream/ObjectManager.cs glib-sharp/ObjectManager.cs + Hashtable before_signals; +- [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] ++ [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] + protected internal Hashtable BeforeSignals { + get { + if (before_signals == null) +@@ -512,7 +512,7 @@ + } + + Hashtable after_signals; +- [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] ++ [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] + protected internal Hashtable AfterSignals { + get { + if (after_signals == null) +@@ -522,7 +522,7 @@ + } + + EventHandlerList before_handlers; +- [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] ++ [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] + protected EventHandlerList BeforeHandlers { + get { + if (before_handlers == null) +@@ -532,7 +532,7 @@ + } + + EventHandlerList after_handlers; +- [Obsolete ("Replaced by GLib.Signal marshaling mechanism.")] ++ [Obsolete ("Replaced by Gst.GLib.Signal marshaling mechanism.")] + protected EventHandlerList AfterHandlers { + get { + if (after_handlers == null) +@@ -547,7 +547,7 @@ + void NotifyCallback (IntPtr handle, IntPtr pspec, IntPtr gch) + { + try { +- GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal; ++ Gst.GLib.Signal sig = ((GCHandle) gch).Target as Gst.GLib.Signal; + if (sig == null) + throw new Exception("Unknown signal GC handle received " + gch); + +@@ -555,7 +555,7 @@ + args.Args = new object[1]; + args.Args[0] = pspec; + NotifyHandler handler = (NotifyHandler) sig.Handler; +- handler (GLib.Object.GetObject (handle), args); ++ handler (Gst.GLib.Object.GetObject (handle), args); + } catch (Exception e) { + ExceptionManager.RaiseUnhandledException (e, false); + } +@@ -618,25 +618,25 @@ + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_object_get_property (IntPtr obj, IntPtr name, ref GLib.Value val); ++ static extern void g_object_get_property (IntPtr obj, IntPtr name, ref Gst.GLib.Value val); + +- protected GLib.Value GetProperty (string name) ++ protected Gst.GLib.Value GetProperty (string name) + { + Value val = new Value (this, name); +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); + g_object_get_property (Raw, native_name, ref val); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + return val; + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_object_set_property (IntPtr obj, IntPtr name, ref GLib.Value val); ++ static extern void g_object_set_property (IntPtr obj, IntPtr name, ref Gst.GLib.Value val); + +- protected void SetProperty (string name, GLib.Value val) ++ protected void SetProperty (string name, Gst.GLib.Value val) + { +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); + g_object_set_property (Raw, native_name, ref val); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +@@ -644,9 +644,9 @@ + + protected void Notify (string property_name) + { +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (property_name); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (property_name); + g_object_notify (Handle, native_name); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + } + + protected static void OverrideVirtualMethod (GType gtype, string name, Delegate cb) +@@ -655,7 +655,7 @@ + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval); ++ protected static extern void g_signal_chain_from_overridden (IntPtr args, ref Gst.GLib.Value retval); + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern bool g_type_check_instance_is_a (IntPtr obj, IntPtr gtype); +@@ -690,7 +690,7 @@ + static Object () + { + if (Environment.GetEnvironmentVariable ("GTK_SHARP_DEBUG") != null) +- GLib.Log.SetLogHandler ("GLib-GObject", GLib.LogLevelFlags.All, new GLib.LogFunc (GLib.Log.PrintTraceLogFunction)); ++ Gst.GLib.Log.SetLogHandler ("Gst.GLib-GObject", Gst.GLib.LogLevelFlags.All, new Gst.GLib.LogFunc (Gst.GLib.Log.PrintTraceLogFunction)); + } + } + } --- glib-sharp-upstream/ObjectManager.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/ObjectManager.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/ObjectManager.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.ObjectManager.cs - GLib ObjectManager class implementation ++// Gst.GLib.ObjectManager.cs - Gst.GLib ObjectManager class implementation + // + // Author: Mike Kestner <mkestner@speakeasy.net> + // @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -656,9 +1126,32 @@ diff -Naur glib-sharp-upstream/ObjectManager.cs glib-sharp/ObjectManager.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/Opaque.cs glib-sharp/Opaque.cs +@@ -30,7 +30,7 @@ + + static BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.CreateInstance; + +- public static GLib.Object CreateObject (IntPtr raw) ++ public static Gst.GLib.Object CreateObject (IntPtr raw) + { + if (raw == IntPtr.Zero) + return null; +@@ -40,11 +40,11 @@ + if (type == null) + return null; + +- GLib.Object obj; ++ Gst.GLib.Object obj; + try { +- obj = Activator.CreateInstance (type, flags, null, new object[] {raw}, null) as GLib.Object; ++ obj = Activator.CreateInstance (type, flags, null, new object[] {raw}, null) as Gst.GLib.Object; + } catch (MissingMethodException) { +- throw new GLib.MissingIntPtrCtorException ("GLib.Object subclass " + type + " must provide a protected or public IntPtr ctor to support wrapping of native object handles."); ++ throw new Gst.GLib.MissingIntPtrCtorException ("Gst.GLib.Object subclass " + type + " must provide a protected or public IntPtr ctor to support wrapping of native object handles."); + } + return obj; + } --- glib-sharp-upstream/Opaque.cs 2009-01-29 17:26:09.000000000 +0100 -+++ glib-sharp/Opaque.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Opaque.cs 2009-09-16 08:31:05.000000000 +0200 @@ -24,7 +24,7 @@ // Boston, MA 02111-1307, USA. @@ -668,10 +1161,9 @@ diff -Naur glib-sharp-upstream/Opaque.cs glib-sharp/Opaque.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/ParamSpec.cs glib-sharp/ParamSpec.cs ---- glib-sharp-upstream/ParamSpec.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/ParamSpec.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -19,50 +19,49 @@ +--- glib-sharp-upstream/ParamSpec.cs 2009-09-12 03:01:12.000000000 +0200 ++++ glib-sharp/ParamSpec.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -680,139 +1172,40 @@ diff -Naur glib-sharp-upstream/ParamSpec.cs glib-sharp/ParamSpec.cs using System; using System.Runtime.InteropServices; - - internal enum ParamFlags { -- None = 0, -- Readable = 1 << 0, -- Writable = 1 << 1, -+ None = 0, -+ Readable = 1 << 0, -+ Writable = 1 << 1, -+ Construct = 1 << 2, -+ ConstructOnly = 1 << 3, - } - - public class ParamSpec { - - IntPtr handle; - -- public ParamSpec (string name, string nick, string blurb, GType type, bool readable, bool writable) -- { -- ParamFlags pflags = ParamFlags.None; -- if (readable) pflags |= ParamFlags.Readable; -- if (writable) pflags |= ParamFlags.Writable; -+ private static IntPtr CreateParamSpec (string name, string nick, string blurb, GType type, ParamFlags pflags) { +@@ -42,9 +42,9 @@ + { int flags = (int) pflags; -+ IntPtr ret; - IntPtr p_name = GLib.Marshaller.StringToPtrGStrdup (name); - IntPtr p_nick = GLib.Marshaller.StringToPtrGStrdup (nick); - IntPtr p_blurb = GLib.Marshaller.StringToPtrGStrdup (blurb); +- IntPtr p_name = GLib.Marshaller.StringToPtrGStrdup (name); +- IntPtr p_nick = GLib.Marshaller.StringToPtrGStrdup (nick); +- IntPtr p_blurb = GLib.Marshaller.StringToPtrGStrdup (blurb); ++ IntPtr p_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); ++ IntPtr p_nick = Gst.GLib.Marshaller.StringToPtrGStrdup (nick); ++ IntPtr p_blurb = Gst.GLib.Marshaller.StringToPtrGStrdup (blurb); if (type == GType.Char) -- handle = g_param_spec_char (p_name, p_nick, p_blurb, SByte.MinValue, SByte.MaxValue, 0, flags); -+ ret = g_param_spec_char (p_name, p_nick, p_blurb, SByte.MinValue, SByte.MaxValue, 0, flags); - else if (type == GType.UChar) -- handle = g_param_spec_uchar (p_name, p_nick, p_blurb, Byte.MinValue, Byte.MaxValue, 0, flags); -+ ret = g_param_spec_uchar (p_name, p_nick, p_blurb, Byte.MinValue, Byte.MaxValue, 0, flags); - else if (type == GType.Boolean) -- handle = g_param_spec_boolean (p_name, p_nick, p_blurb, false, flags); -+ ret = g_param_spec_boolean (p_name, p_nick, p_blurb, false, flags); - else if (type == GType.Int) -- handle = g_param_spec_int (p_name, p_nick, p_blurb, Int32.MinValue, Int32.MaxValue, 0, flags); -+ ret = g_param_spec_int (p_name, p_nick, p_blurb, Int32.MinValue, Int32.MaxValue, 0, flags); - else if (type == GType.UInt) -- handle = g_param_spec_uint (p_name, p_nick, p_blurb, 0, UInt32.MaxValue, 0, flags); -+ ret = g_param_spec_uint (p_name, p_nick, p_blurb, 0, UInt32.MaxValue, 0, flags); - else if (type == GType.Long) -- handle = g_param_spec_long (p_name, p_nick, p_blurb, IntPtr.Zero, IntPtr.Size == 4 ? new IntPtr (Int32.MaxValue) : new IntPtr (Int64.MaxValue), IntPtr.Zero, flags); -+ ret = g_param_spec_long (p_name, p_nick, p_blurb, IntPtr.Zero, IntPtr.Size == 4 ? new IntPtr (Int32.MaxValue) : new IntPtr (Int64.MaxValue), IntPtr.Zero, flags); - else if (type == GType.ULong) -- handle = g_param_spec_ulong (p_name, p_nick, p_blurb, UIntPtr.Zero, UIntPtr.Size == 4 ? new UIntPtr (UInt32.MaxValue) : new UIntPtr (UInt64.MaxValue), UIntPtr.Zero, flags); -+ ret = g_param_spec_ulong (p_name, p_nick, p_blurb, UIntPtr.Zero, UIntPtr.Size == 4 ? new UIntPtr (UInt32.MaxValue) : new UIntPtr (UInt64.MaxValue), UIntPtr.Zero, flags); - else if (type == GType.Int64) -- handle = g_param_spec_int64 (p_name, p_nick, p_blurb, Int64.MinValue, Int64.MaxValue, 0, flags); -+ ret = g_param_spec_int64 (p_name, p_nick, p_blurb, Int64.MinValue, Int64.MaxValue, 0, flags); - else if (type == GType.UInt64) -- handle = g_param_spec_uint64 (p_name, p_nick, p_blurb, 0, UInt64.MaxValue, 0, flags); -+ ret = g_param_spec_uint64 (p_name, p_nick, p_blurb, 0, UInt64.MaxValue, 0, flags); - /* - else if (type == GType.Enum) - else if (type == GType.Flags) -@@ -70,25 +69,40 @@ - * Both g_param_spec_enum and g_param_spec_flags expect default property values and the members of the enum seemingly cannot be enumerated - */ - else if (type == GType.Float) -- handle = g_param_spec_float (p_name, p_nick, p_blurb, Single.MinValue, Single.MaxValue, 0.0f, flags); -+ ret = g_param_spec_float (p_name, p_nick, p_blurb, Single.MinValue, Single.MaxValue, 0.0f, flags); - else if (type == GType.Double) -- handle = g_param_spec_double (p_name, p_nick, p_blurb, Double.MinValue, Double.MaxValue, 0.0, flags); -+ ret = g_param_spec_double (p_name, p_nick, p_blurb, Double.MinValue, Double.MaxValue, 0.0, flags); - else if (type == GType.String) -- handle = g_param_spec_string (p_name, p_nick, p_blurb, IntPtr.Zero, flags); -+ ret = g_param_spec_string (p_name, p_nick, p_blurb, IntPtr.Zero, flags); - else if (type == GType.Pointer) -- handle = g_param_spec_pointer (p_name, p_nick, p_blurb, flags); -+ ret = g_param_spec_pointer (p_name, p_nick, p_blurb, flags); - else if (type.Val == g_gtype_get_type ()) -- handle = g_param_spec_gtype (p_name, p_nick, p_blurb, GType.None.Val, flags); -+ ret = g_param_spec_gtype (p_name, p_nick, p_blurb, GType.None.Val, flags); - else if (g_type_is_a (type.Val, GType.Boxed.Val)) -- handle = g_param_spec_boxed (p_name, p_nick, p_blurb, type.Val, flags); -+ ret = g_param_spec_boxed (p_name, p_nick, p_blurb, type.Val, flags); - else if (g_type_is_a (type.Val, GType.Object.Val)) -- handle = g_param_spec_object (p_name, p_nick, p_blurb, type.Val, flags); -+ ret = g_param_spec_object (p_name, p_nick, p_blurb, type.Val, flags); + handle = g_param_spec_char (p_name, p_nick, p_blurb, SByte.MinValue, SByte.MaxValue, 0, flags); +@@ -87,9 +87,9 @@ else throw new ArgumentException ("type"); - GLib.Marshaller.Free (p_name); - GLib.Marshaller.Free (p_nick); - GLib.Marshaller.Free (p_blurb); -+ -+ return ret; -+ } -+ -+ internal ParamSpec (string name, string nick, string blurb, GType type, ParamFlags pflags) { -+ handle = CreateParamSpec (name, nick, blurb, type, pflags); -+ } -+ -+ public ParamSpec (string name, string nick, string blurb, GType type, bool readable, bool writable) -+ { -+ ParamFlags pflags = ParamFlags.None; -+ if (readable) pflags |= ParamFlags.Readable; -+ if (writable) pflags |= ParamFlags.Writable; -+ -+ handle = CreateParamSpec (name, nick, blurb, type, pflags); +- GLib.Marshaller.Free (p_name); +- GLib.Marshaller.Free (p_nick); +- GLib.Marshaller.Free (p_blurb); ++ Gst.GLib.Marshaller.Free (p_name); ++ Gst.GLib.Marshaller.Free (p_nick); ++ Gst.GLib.Marshaller.Free (p_blurb); } public ParamSpec (IntPtr native) -@@ -107,6 +121,13 @@ - } - } - -+ public string Name { -+ get { -+ GParamSpec spec = (GParamSpec) Marshal.PtrToStructure (Handle, typeof (GParamSpec)); -+ return GLib.Marshaller.Utf8PtrToString (spec.name); -+ } -+ } -+ - struct GTypeInstance { - IntPtr g_class; - } -@@ -114,7 +135,7 @@ - struct GParamSpec { - GTypeInstance g_type_instance; - -- IntPtr name; -+ public IntPtr name; - ParamFlags flags; - public IntPtr value_type; - IntPtr owner_type; -diff -Naur glib-sharp-upstream/Priority.cs glib-sharp/Priority.cs --- glib-sharp-upstream/Priority.cs 2009-05-03 21:34:22.000000000 +0200 -+++ glib-sharp/Priority.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Priority.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Priority.cs ++// Gst.GLib.Priority.cs + // + // Author(s): + // Stephane Delcroix <stephane@delcroix.org> @@ -19,7 +19,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -822,9 +1215,8 @@ diff -Naur glib-sharp-upstream/Priority.cs glib-sharp/Priority.cs public enum Priority { High = -100, -diff -Naur glib-sharp-upstream/PropertyAttribute.cs glib-sharp/PropertyAttribute.cs --- glib-sharp-upstream/PropertyAttribute.cs 2008-06-06 18:55:00.000000000 +0200 -+++ glib-sharp/PropertyAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/PropertyAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -17,7 +17,7 @@ // Boston, MA 02111-1307, USA. @@ -834,9 +1226,8 @@ diff -Naur glib-sharp-upstream/PropertyAttribute.cs glib-sharp/PropertyAttribute using System; -diff -Naur glib-sharp-upstream/PtrArray.cs glib-sharp/PtrArray.cs --- glib-sharp-upstream/PtrArray.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/PtrArray.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/PtrArray.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -846,9 +1237,52 @@ diff -Naur glib-sharp-upstream/PtrArray.cs glib-sharp/PtrArray.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/SignalArgs.cs glib-sharp/SignalArgs.cs +@@ -94,10 +94,10 @@ + if (elements_owned) { + int count = Count; + for (uint i = 0; i < count; i++) +- if (typeof (GLib.Object).IsAssignableFrom (element_type)) ++ if (typeof (Gst.GLib.Object).IsAssignableFrom (element_type)) + g_object_unref (NthData (i)); +- else if (typeof (GLib.Opaque).IsAssignableFrom (element_type)) +- GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); ++ else if (typeof (Gst.GLib.Opaque).IsAssignableFrom (element_type)) ++ Gst.GLib.Opaque.GetOpaque (NthData (i), element_type, true).Dispose (); + else + g_free (NthData (i)); + } +@@ -174,10 +174,10 @@ + ret = Marshaller.Utf8PtrToString (data); + else if (element_type == typeof (IntPtr)) + ret = data; +- else if (element_type.IsSubclassOf (typeof (GLib.Object))) +- ret = GLib.Object.GetObject (data, false); +- else if (element_type.IsSubclassOf (typeof (GLib.Opaque))) +- ret = GLib.Opaque.GetOpaque (data, element_type, elements_owned); ++ else if (element_type.IsSubclassOf (typeof (Gst.GLib.Object))) ++ ret = Gst.GLib.Object.GetObject (data, false); ++ else if (element_type.IsSubclassOf (typeof (Gst.GLib.Opaque))) ++ ret = Gst.GLib.Opaque.GetOpaque (data, element_type, elements_owned); + else if (element_type == typeof (int)) + ret = (int) data; + else if (element_type.IsValueType) +@@ -186,7 +186,7 @@ + ret = Activator.CreateInstance (element_type, new object[] {data}); + + } else if (Object.IsObject (data)) +- ret = GLib.Object.GetObject (data, false); ++ ret = Gst.GLib.Object.GetObject (data, false); + + return ret; + } --- glib-sharp-upstream/SignalArgs.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/SignalArgs.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/SignalArgs.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.SignalArgs.cs - Signal argument class implementation ++// Gst.GLib.SignalArgs.cs - Signal argument class implementation + // + // Author: Mike Kestner <mkestner@speakeasy.net> + // @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -858,9 +1292,8 @@ diff -Naur glib-sharp-upstream/SignalArgs.cs glib-sharp/SignalArgs.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/SignalAttribute.cs glib-sharp/SignalAttribute.cs --- glib-sharp-upstream/SignalAttribute.cs 2005-10-08 23:08:04.000000000 +0200 -+++ glib-sharp/SignalAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/SignalAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -870,10 +1303,15 @@ diff -Naur glib-sharp-upstream/SignalAttribute.cs glib-sharp/SignalAttribute.cs using System; -diff -Naur glib-sharp-upstream/SignalCallback.cs glib-sharp/SignalCallback.cs --- glib-sharp-upstream/SignalCallback.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/SignalCallback.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -20,7 +20,7 @@ ++++ glib-sharp/SignalCallback.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.SignalCallback.cs - Signal callback base class implementation ++// Gst.GLib.SignalCallback.cs - Signal callback base class implementation + // + // Authors: Mike Kestner <mkestner@ximian.com> + // +@@ -20,12 +20,12 @@ // Boston, MA 02111-1307, USA. @@ -882,9 +1320,30 @@ diff -Naur glib-sharp-upstream/SignalCallback.cs glib-sharp/SignalCallback.cs using System; using System.Collections; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/SignalClosure.cs glib-sharp/SignalClosure.cs + +- [Obsolete ("Replaced by GLib.Signal.")] ++ [Obsolete ("Replaced by Gst.GLib.Signal.")] + public abstract class SignalCallback : IDisposable { + + // A counter used to produce unique keys for instances. +@@ -35,13 +35,13 @@ + protected static Hashtable _Instances = new Hashtable (); + + // protected instance members +- protected GLib.Object _obj; ++ protected Gst.GLib.Object _obj; + protected Delegate _handler; + protected int _key; + protected System.Type _argstype; + protected uint _HandlerID; + +- protected SignalCallback (GLib.Object obj, Delegate eh, System.Type argstype) ++ protected SignalCallback (Gst.GLib.Object obj, Delegate eh, System.Type argstype) + { + _key = _NextKey++; + _obj = obj; --- glib-sharp-upstream/SignalClosure.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/SignalClosure.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/SignalClosure.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -894,9 +1353,66 @@ diff -Naur glib-sharp-upstream/SignalClosure.cs glib-sharp/SignalClosure.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/Signal.cs glib-sharp/Signal.cs +@@ -28,10 +28,10 @@ + internal class ClosureInvokedArgs : EventArgs { + + EventArgs args; +- GLib.Object obj; ++ Gst.GLib.Object obj; + object result; + +- public ClosureInvokedArgs (GLib.Object obj, EventArgs args) ++ public ClosureInvokedArgs (Gst.GLib.Object obj, EventArgs args) + { + this.obj = obj; + this.args = args; +@@ -43,7 +43,7 @@ + } + } + +- public GLib.Object Target { ++ public Gst.GLib.Object Target { + get { + return obj; + } +@@ -97,9 +97,9 @@ + + public void Connect (bool is_after) + { +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (name); + id = g_signal_connect_closure (handle, native_name, raw_closure, is_after); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + } + + public void Disconnect () +@@ -147,7 +147,7 @@ + SignalClosure closure = closures [raw_closure] as SignalClosure; + message = "Marshaling " + closure.name + " signal"; + Value objval = (Value) Marshal.PtrToStructure (param_values, typeof (Value)); +- GLib.Object __obj = objval.Val as GLib.Object; ++ Gst.GLib.Object __obj = objval.Val as Gst.GLib.Object; + if (__obj == null) + return; + +@@ -158,7 +158,7 @@ + + SignalArgs args = Activator.CreateInstance (closure.args_type, new object [0]) as SignalArgs; + args.Args = new object [n_param_vals - 1]; +- GLib.Value[] vals = new GLib.Value [n_param_vals - 1]; ++ Gst.GLib.Value[] vals = new Gst.GLib.Value [n_param_vals - 1]; + for (int i = 1; i < n_param_vals; i++) { + IntPtr ptr = new IntPtr (param_values.ToInt64 () + i * Marshal.SizeOf (typeof (Value))); + vals [i - 1] = (Value) Marshal.PtrToStructure (ptr, typeof (Value)); --- glib-sharp-upstream/Signal.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Signal.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Signal.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Signal.cs - signal marshaling class ++// Gst.GLib.Signal.cs - signal marshaling class + // + // Authors: Mike Kestner <mkestner@novell.com> + // Andrés G. Aragoneses <aaragoneses@novell.com> @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -906,9 +1422,136 @@ diff -Naur glib-sharp-upstream/Signal.cs glib-sharp/Signal.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/SList.cs glib-sharp/SList.cs +@@ -140,7 +140,7 @@ + SignalClosure after_closure; + Delegate marshaler; + +- private Signal (GLib.Object obj, string signal_name, Delegate marshaler) ++ private Signal (Gst.GLib.Object obj, string signal_name, Delegate marshaler) + { + tref = obj.ToggleRef; + name = signal_name; +@@ -148,7 +148,7 @@ + this.marshaler = marshaler; + } + +- private Signal (GLib.Object obj, string signal_name, Type args_type) ++ private Signal (Gst.GLib.Object obj, string signal_name, Type args_type) + { + tref = obj.ToggleRef; + name = signal_name; +@@ -215,12 +215,12 @@ + } + } + +- public static Signal Lookup (GLib.Object obj, string name) ++ public static Signal Lookup (Gst.GLib.Object obj, string name) + { + return Lookup (obj, name, typeof (EventArgs)); + } + +- public static Signal Lookup (GLib.Object obj, string name, Delegate marshaler) ++ public static Signal Lookup (Gst.GLib.Object obj, string name, Delegate marshaler) + { + Signal result = obj.ToggleRef.Signals [name] as Signal; + if (result == null) +@@ -228,7 +228,7 @@ + return result; + } + +- public static Signal Lookup (GLib.Object obj, string name, Type args_type) ++ public static Signal Lookup (Gst.GLib.Object obj, string name, Type args_type) + { + Signal result = obj.ToggleRef.Signals [name] as Signal; + if (result == null) +@@ -313,7 +313,7 @@ + } + } + +- public static object Emit (GLib.Object instance, string detailed_signal, params object[] args) ++ public static object Emit (Gst.GLib.Object instance, string detailed_signal, params object[] args) + { + uint gquark, signal_id; + string signal_name; +@@ -321,13 +321,13 @@ + signal_id = GetSignalId (signal_name, instance); + if (signal_id <= 0) + throw new ArgumentException ("Invalid signal name: " + signal_name); +- GLib.Value[] vals = new GLib.Value [args.Length + 1]; +- GLib.ValueArray inst_and_params = new GLib.ValueArray ((uint) args.Length + 1); ++ Gst.GLib.Value[] vals = new Gst.GLib.Value [args.Length + 1]; ++ Gst.GLib.ValueArray inst_and_params = new Gst.GLib.ValueArray ((uint) args.Length + 1); + +- vals [0] = new GLib.Value (instance); ++ vals [0] = new Gst.GLib.Value (instance); + inst_and_params.Append (vals [0]); + for (int i = 1; i < vals.Length; i++) { +- vals [i] = new GLib.Value (args [i - 1]); ++ vals [i] = new Gst.GLib.Value (args [i - 1]); + inst_and_params.Append (vals [i]); + } + +@@ -335,27 +335,27 @@ + Query query; + g_signal_query (signal_id, out query); + if (query.return_type != GType.None.Val) { +- GLib.Value ret = GLib.Value.Empty; ++ Gst.GLib.Value ret = Gst.GLib.Value.Empty; + g_signal_emitv (inst_and_params.ArrayPtr, signal_id, gquark, ref ret); + ret_obj = ret.Val; + ret.Dispose (); + } else + g_signal_emitv (inst_and_params.ArrayPtr, signal_id, gquark, IntPtr.Zero); + +- foreach (GLib.Value val in vals) ++ foreach (Gst.GLib.Value val in vals) + val.Dispose (); + + return ret_obj; + } + + private static uint GetGQuarkFromString (string str) { +- IntPtr native_string = GLib.Marshaller.StringToPtrGStrdup (str); ++ IntPtr native_string = Gst.GLib.Marshaller.StringToPtrGStrdup (str); + uint ret = g_quark_from_string (native_string); +- GLib.Marshaller.Free (native_string); ++ Gst.GLib.Marshaller.Free (native_string); + return ret; + } + +- private static uint GetSignalId (string signal_name, GLib.Object obj) ++ private static uint GetSignalId (string signal_name, Gst.GLib.Object obj) + { + IntPtr typeid = GType.ValFromInstancePtr (obj.Handle); + return GetSignalId (signal_name, typeid); +@@ -363,13 +363,13 @@ + + private static uint GetSignalId (string signal_name, IntPtr typeid) + { +- IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (signal_name); ++ IntPtr native_name = Gst.GLib.Marshaller.StringToPtrGStrdup (signal_name); + uint signal_id = g_signal_lookup (native_name, typeid); +- GLib.Marshaller.Free (native_name); ++ Gst.GLib.Marshaller.Free (native_name); + return signal_id; + } + +- public static ulong AddEmissionHook (string detailed_signal, GLib.GType type, EmissionHook handler_func) ++ public static ulong AddEmissionHook (string detailed_signal, Gst.GLib.GType type, EmissionHook handler_func) + { + uint gquark; + string signal_name; +@@ -395,7 +395,7 @@ + static extern IntPtr g_signal_get_invocation_hint (IntPtr instance); + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, ref GLib.Value return_value); ++ static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, ref Gst.GLib.Value return_value); + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, IntPtr return_value); --- glib-sharp-upstream/SList.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/SList.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/SList.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -918,9 +1561,14 @@ diff -Naur glib-sharp-upstream/SList.cs glib-sharp/SList.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/Source.cs glib-sharp/Source.cs --- glib-sharp-upstream/Source.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Source.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Source.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Source.cs - Source class implementation ++// Gst.GLib.Source.cs - Source class implementation + // + // Author: Duncan Mak <duncan@ximian.com> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -930,9 +1578,8 @@ diff -Naur glib-sharp-upstream/Source.cs glib-sharp/Source.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/Spawn.cs glib-sharp/Spawn.cs --- glib-sharp-upstream/Spawn.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Spawn.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Spawn.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -942,9 +1589,53 @@ diff -Naur glib-sharp-upstream/Spawn.cs glib-sharp/Spawn.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/Thread.cs glib-sharp/Thread.cs +@@ -126,7 +126,7 @@ + Marshaller.Free (native_dir); + Marshaller.Free (native_argv); + Marshaller.Free (native_envp); +- if (error != IntPtr.Zero) throw new GLib.GException (error); ++ if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); + return result; + } + +@@ -161,7 +161,7 @@ + Marshaller.Free (native_dir); + Marshaller.Free (native_argv); + Marshaller.Free (native_envp); +- if (error != IntPtr.Zero) throw new GLib.GException (error); ++ if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); + return result; + } + +@@ -181,7 +181,7 @@ + Marshaller.Free (native_envp); + stdout = Marshaller.PtrToStringGFree (native_stdout); + stderr = Marshaller.PtrToStringGFree (native_stderr); +- if (error != IntPtr.Zero) throw new GLib.GException (error); ++ if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); + return result; + } + +@@ -194,7 +194,7 @@ + IntPtr native_cmd = Marshaller.StringToPtrGStrdup (command_line); + bool result = g_spawn_command_line_async (native_cmd, out error); + Marshaller.Free (native_cmd); +- if (error != IntPtr.Zero) throw new GLib.GException (error); ++ if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); + return result; + } + +@@ -209,7 +209,7 @@ + Marshaller.Free (native_cmd); + stdout = Marshaller.PtrToStringGFree (native_stdout); + stderr = Marshaller.PtrToStringGFree (native_stderr); +- if (error != IntPtr.Zero) throw new GLib.GException (error); ++ if (error != IntPtr.Zero) throw new Gst.GLib.GException (error); + return result; + } + } --- glib-sharp-upstream/Thread.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Thread.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Thread.cs 2009-09-16 08:36:43.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -971,9 +1662,14 @@ diff -Naur glib-sharp-upstream/Thread.cs glib-sharp/Thread.cs } } } -diff -Naur glib-sharp-upstream/Timeout.cs glib-sharp/Timeout.cs --- glib-sharp-upstream/Timeout.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Timeout.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Timeout.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Timeout.cs - Timeout class implementation ++// Gst.GLib.Timeout.cs - Timeout class implementation + // + // Author(s): + // Mike Kestner <mkestner@speakeasy.net> @@ -22,7 +22,7 @@ // Boston, MA 02111-1307, USA. @@ -983,9 +1679,14 @@ diff -Naur glib-sharp-upstream/Timeout.cs glib-sharp/Timeout.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/ToggleRef.cs glib-sharp/ToggleRef.cs --- glib-sharp-upstream/ToggleRef.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/ToggleRef.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/ToggleRef.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.ToggleRef.cs - GLib ToggleRef class implementation ++// Gst.GLib.ToggleRef.cs - Gst.GLib ToggleRef class implementation + // + // Author: Mike Kestner <mkestner@novell.com> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -995,9 +1696,52 @@ diff -Naur glib-sharp-upstream/ToggleRef.cs glib-sharp/ToggleRef.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/TypeConverter.cs glib-sharp/TypeConverter.cs +@@ -33,7 +33,7 @@ + GCHandle gch; + Hashtable signals; + +- public ToggleRef (GLib.Object target) ++ public ToggleRef (Gst.GLib.Object target) + { + handle = target.Handle; + gch = GCHandle.Alloc (this); +@@ -67,15 +67,15 @@ + } + } + +- public GLib.Object Target { ++ public Gst.GLib.Object Target { + get { + if (reference == null) + return null; +- else if (reference is GLib.Object) +- return reference as GLib.Object; ++ else if (reference is Gst.GLib.Object) ++ return reference as Gst.GLib.Object; + + WeakReference weak = reference as WeakReference; +- return weak.Target as GLib.Object; ++ return weak.Target as Gst.GLib.Object; + } + } + +@@ -111,7 +111,7 @@ + + void Toggle (bool is_last_ref) + { +- if (is_last_ref && reference is GLib.Object) ++ if (is_last_ref && reference is Gst.GLib.Object) + reference = new WeakReference (reference); + else if (!is_last_ref && reference is WeakReference) { + WeakReference weak = reference as WeakReference; --- glib-sharp-upstream/TypeConverter.cs 2005-05-04 18:54:24.000000000 +0200 -+++ glib-sharp/TypeConverter.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/TypeConverter.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.TypeConverter.cs : Convert between fundamental and .NET types ++// Gst.GLib.TypeConverter.cs : Convert between fundamental and .NET types + // + // Author: Rachel Hestilow <hestilow@ximian.com> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1007,9 +1751,14 @@ diff -Naur glib-sharp-upstream/TypeConverter.cs glib-sharp/TypeConverter.cs using System; public class TypeConverter { -diff -Naur glib-sharp-upstream/TypeFundamentals.cs glib-sharp/TypeFundamentals.cs --- glib-sharp-upstream/TypeFundamentals.cs 2004-07-09 17:25:39.000000000 +0200 -+++ glib-sharp/TypeFundamentals.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/TypeFundamentals.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.TypeFundamentals.cs : Standard Types enumeration ++// Gst.GLib.TypeFundamentals.cs : Standard Types enumeration + // + // Author: Mike Kestner <mkestner@speakeasy.net> + // @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1019,9 +1768,8 @@ diff -Naur glib-sharp-upstream/TypeFundamentals.cs glib-sharp/TypeFundamentals.c public enum TypeFundamentals { TypeInvalid = 0 << 2, -diff -Naur glib-sharp-upstream/TypeInitializerAttribute.cs glib-sharp/TypeInitializerAttribute.cs --- glib-sharp-upstream/TypeInitializerAttribute.cs 2007-09-07 16:40:46.000000000 +0200 -+++ glib-sharp/TypeInitializerAttribute.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/TypeInitializerAttribute.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1031,10 +1779,9 @@ diff -Naur glib-sharp-upstream/TypeInitializerAttribute.cs glib-sharp/TypeInitia using System; -diff -Naur glib-sharp-upstream/UnwrappedObject.cs glib-sharp/UnwrappedObject.cs --- glib-sharp-upstream/UnwrappedObject.cs 2005-07-22 20:36:50.000000000 +0200 -+++ glib-sharp/UnwrappedObject.cs 2009-09-11 08:35:22.000000000 +0200 -@@ -19,7 +19,7 @@ ++++ glib-sharp/UnwrappedObject.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -19,12 +19,12 @@ // Boston, MA 02111-1307, USA. @@ -1043,9 +1790,14 @@ diff -Naur glib-sharp-upstream/UnwrappedObject.cs glib-sharp/UnwrappedObject.cs using System; using System.Runtime.InteropServices; -diff -Naur glib-sharp-upstream/ValueArray.cs glib-sharp/ValueArray.cs + +- [Obsolete ("Replaced by direct object-type casts to/from GLib.Value")] ++ [Obsolete ("Replaced by direct object-type casts to/from Gst.GLib.Value")] + public class UnwrappedObject { + IntPtr obj; + --- glib-sharp-upstream/ValueArray.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/ValueArray.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/ValueArray.cs 2009-09-16 08:31:05.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1055,9 +1807,67 @@ diff -Naur glib-sharp-upstream/ValueArray.cs glib-sharp/ValueArray.cs using System; using System.Collections; -diff -Naur glib-sharp-upstream/Value.cs glib-sharp/Value.cs +@@ -116,25 +116,25 @@ + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_value_array_append (IntPtr raw, ref GLib.Value val); ++ static extern void g_value_array_append (IntPtr raw, ref Gst.GLib.Value val); + +- public void Append (GLib.Value val) ++ public void Append (Gst.GLib.Value val) + { + g_value_array_append (Handle, ref val); + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_value_array_insert (IntPtr raw, uint idx, ref GLib.Value val); ++ static extern void g_value_array_insert (IntPtr raw, uint idx, ref Gst.GLib.Value val); + +- public void Insert (uint idx, GLib.Value val) ++ public void Insert (uint idx, Gst.GLib.Value val) + { + g_value_array_insert (Handle, idx, ref val); + } + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_value_array_prepend (IntPtr raw, ref GLib.Value val); ++ static extern void g_value_array_prepend (IntPtr raw, ref Gst.GLib.Value val); + +- public void Prepend (GLib.Value val) ++ public void Prepend (Gst.GLib.Value val) + { + g_value_array_prepend (Handle, ref val); + } +@@ -158,7 +158,7 @@ + public object this [int index] { + get { + IntPtr raw_val = g_value_array_get_nth (Handle, (uint) index); +- return Marshal.PtrToStructure (raw_val, typeof (GLib.Value)); ++ return Marshal.PtrToStructure (raw_val, typeof (Gst.GLib.Value)); + } + } + +@@ -238,9 +238,9 @@ + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern IntPtr g_value_array_get_type (); + +- public static GLib.GType GType { ++ public static Gst.GLib.GType GType { + get { +- return new GLib.GType (g_value_array_get_type ()); ++ return new Gst.GLib.GType (g_value_array_get_type ()); + } + } + } --- glib-sharp-upstream/Value.cs 2009-09-03 21:50:53.000000000 +0200 -+++ glib-sharp/Value.cs 2009-09-11 08:35:22.000000000 +0200 ++++ glib-sharp/Value.cs 2009-09-16 08:31:05.000000000 +0200 +@@ -1,4 +1,4 @@ +-// GLib.Value.cs - GLib Value class implementation ++// Gst.GLib.Value.cs - Gst.GLib Value class implementation + // + // Author: Mike Kestner <mkestner@speakeasy.net> + // @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -1067,3 +1877,248 @@ diff -Naur glib-sharp-upstream/Value.cs glib-sharp/Value.cs using System; using System.Collections; +@@ -49,7 +49,7 @@ + + public static Value Empty; + +- public Value (GLib.GType gtype) ++ public Value (Gst.GLib.GType gtype) + { + type = IntPtr.Zero; + pad1 = new Padding (); +@@ -133,9 +133,9 @@ + + public Value (string val) : this (GType.String) + { +- IntPtr native_val = GLib.Marshaller.StringToPtrGStrdup (val); ++ IntPtr native_val = Gst.GLib.Marshaller.StringToPtrGStrdup (val); + g_value_set_string (ref this, native_val); +- GLib.Marshaller.Free (native_val); ++ Gst.GLib.Marshaller.Free (native_val); + } + + public Value (ValueArray val) : this (ValueArray.GType) +@@ -157,17 +157,17 @@ + g_value_set_boxed (ref this, val.Handle); + } + +- public Value (GLib.Object val) : this (val == null ? GType.Object : val.NativeType) ++ public Value (Gst.GLib.Object val) : this (val == null ? GType.Object : val.NativeType) + { + g_value_set_object (ref this, val == null ? IntPtr.Zero : val.Handle); + } + +- public Value (GLib.GInterfaceAdapter val) : this (val == null ? GType.Object : val.GType) ++ public Value (Gst.GLib.GInterfaceAdapter val) : this (val == null ? GType.Object : val.GType) + { + g_value_set_object (ref this, val == null ? IntPtr.Zero : val.Handle); + } + +- public Value (GLib.Object obj, string prop_name) ++ public Value (Gst.GLib.Object obj, string prop_name) + { + type = IntPtr.Zero; + pad1 = new Padding (); +@@ -176,7 +176,7 @@ + } + + [Obsolete] +- public Value (GLib.Object obj, string prop_name, EnumWrapper wrap) ++ public Value (Gst.GLib.Object obj, string prop_name, EnumWrapper wrap) + { + type = IntPtr.Zero; + pad1 = new Padding (); +@@ -194,11 +194,11 @@ + type = IntPtr.Zero; + pad1 = new Padding (); + pad2 = new Padding (); +- InitForProperty (GLib.Object.GetObject (obj), prop_name); ++ InitForProperty (Gst.GLib.Object.GetObject (obj), prop_name); + g_value_set_boxed (ref this, val.Handle); + } + +- public Value (string[] val) : this (new GLib.GType (g_strv_get_type ())) ++ public Value (string[] val) : this (new Gst.GLib.GType (g_strv_get_type ())) + { + if (val == null) { + g_value_set_boxed (ref this, IntPtr.Zero); +@@ -207,13 +207,13 @@ + + IntPtr native_array = Marshal.AllocHGlobal ((val.Length + 1) * IntPtr.Size); + for (int i = 0; i < val.Length; i++) +- Marshal.WriteIntPtr (native_array, i * IntPtr.Size, GLib.Marshaller.StringToPtrGStrdup (val[i])); ++ Marshal.WriteIntPtr (native_array, i * IntPtr.Size, Gst.GLib.Marshaller.StringToPtrGStrdup (val[i])); + Marshal.WriteIntPtr (native_array, val.Length * IntPtr.Size, IntPtr.Zero); + + g_value_set_boxed (ref this, native_array); + + for (int i = 0; i < val.Length; i++) +- GLib.Marshaller.Free (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); ++ Gst.GLib.Marshaller.Free (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); + Marshal.FreeHGlobal (native_array); + } + +@@ -223,7 +223,7 @@ + g_value_unset (ref this); + } + +- public void Init (GLib.GType gtype) ++ public void Init (Gst.GLib.GType gtype) + { + g_value_init (ref this, gtype.Val); + } +@@ -299,7 +299,7 @@ + public static explicit operator string (Value val) + { + IntPtr str = g_value_get_string (ref val); +- return str == IntPtr.Zero ? null : GLib.Marshaller.Utf8PtrToString (str); ++ return str == IntPtr.Zero ? null : Gst.GLib.Marshaller.Utf8PtrToString (str); + } + + public static explicit operator ValueArray (Value val) +@@ -312,23 +312,23 @@ + return g_value_get_pointer (ref val); + } + +- public static explicit operator GLib.Opaque (Value val) ++ public static explicit operator Gst.GLib.Opaque (Value val) + { +- return GLib.Opaque.GetOpaque (g_value_get_boxed (ref val), (Type) new GType (val.type), false); ++ return Gst.GLib.Opaque.GetOpaque (g_value_get_boxed (ref val), (Type) new GType (val.type), false); + } + +- public static explicit operator GLib.Boxed (Value val) ++ public static explicit operator Gst.GLib.Boxed (Value val) + { +- return new GLib.Boxed (g_value_get_boxed (ref val)); ++ return new Gst.GLib.Boxed (g_value_get_boxed (ref val)); + } + +- public static explicit operator GLib.Object (Value val) ++ public static explicit operator Gst.GLib.Object (Value val) + { +- return GLib.Object.GetObject (g_value_get_object (ref val), false); ++ return Gst.GLib.Object.GetObject (g_value_get_object (ref val), false); + } + +- [Obsolete ("Replaced by GLib.Object cast")] +- public static explicit operator GLib.UnwrappedObject (Value val) ++ [Obsolete ("Replaced by Gst.GLib.Object cast")] ++ public static explicit operator Gst.GLib.UnwrappedObject (Value val) + { + return new UnwrappedObject (g_value_get_object (ref val)); + } +@@ -344,18 +344,18 @@ + count++; + string[] strings = new string[count]; + for (int i = 0; i < count; i++) +- strings[i] = GLib.Marshaller.Utf8PtrToString (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); ++ strings[i] = Gst.GLib.Marshaller.Utf8PtrToString (Marshal.ReadIntPtr (native_array, i * IntPtr.Size)); + return strings; + } + + object ToRegisteredType () { +- Type t = GLib.GType.LookupType (type); ++ Type t = Gst.GLib.GType.LookupType (type); + ConstructorInfo ci = null; + + try { + while (ci == null && t != null) { + if (!t.IsAbstract) +- ci = t.GetConstructor (new Type[] { typeof (GLib.Value) }); ++ ci = t.GetConstructor (new Type[] { typeof (Gst.GLib.Value) }); + if (ci == null) + t = t.BaseType; + } +@@ -370,12 +370,12 @@ + } + + void FromRegisteredType (object val) { +- Type t = GLib.GType.LookupType (type); ++ Type t = Gst.GLib.GType.LookupType (type); + MethodInfo mi = null; + + try { + while (mi == null && t != null) { +- mi = t.GetMethod ("SetGValue", new Type[] { Type.GetType ("GLib.Value&") }); ++ mi = t.GetMethod ("SetGValue", new Type[] { Type.GetType ("Gst.GLib.Value&") }); + if (mi != null && (mi.IsAbstract || mi.ReturnType != typeof (void))) + mi = null; + if (mi == null) +@@ -390,7 +390,7 @@ + + object[] parameters = new object[] { this }; + mi.Invoke (val, parameters); +- this = (GLib.Value) parameters[0]; ++ this = (Gst.GLib.Value) parameters[0]; + } + + object ToEnum () +@@ -413,8 +413,8 @@ + Type t = GType.LookupType (type); + if (t == null) + throw new Exception ("Unknown type " + new GType (type).ToString ()); +- else if (t.IsSubclassOf (typeof (GLib.Opaque))) +- return (GLib.Opaque) this; ++ else if (t.IsSubclassOf (typeof (Gst.GLib.Opaque))) ++ return (Gst.GLib.Opaque) this; + + MethodInfo mi = t.GetMethod ("New", BindingFlags.Static | BindingFlags.Public | BindingFlags.FlattenHierarchy); + if (mi == null) +@@ -458,7 +458,7 @@ + else if (type == ManagedValue.GType.Val) + return ManagedValue.ObjectForWrapper (g_value_get_boxed (ref this)); + else if (GType.Is (type, GType.Object)) +- return (GLib.Object) this; ++ return (Gst.GLib.Object) this; + else if (GType.Is (type, GType.Boxed)) + return ToBoxed (); + else if (GType.LookupType (type) != null) +@@ -492,9 +492,9 @@ + else if (type == GType.Double.Val) + g_value_set_double (ref this, (double) value); + else if (type == GType.String.Val) { +- IntPtr native = GLib.Marshaller.StringToPtrGStrdup ((string)value); ++ IntPtr native = Gst.GLib.Marshaller.StringToPtrGStrdup ((string)value); + g_value_set_string (ref this, native); +- GLib.Marshaller.Free (native); ++ Gst.GLib.Marshaller.Free (native); + } else if (type == GType.Pointer.Val) { + if (value.GetType () == typeof (IntPtr)) { + g_value_set_pointer (ref this, (IntPtr) value); +@@ -515,10 +515,10 @@ + g_value_set_boxed (ref this, wrapper); + ManagedValue.ReleaseWrapper (wrapper); + } else if (GType.Is (type, GType.Object)) +- if(value is GLib.Object) +- g_value_set_object (ref this, (value as GLib.Object).Handle); ++ if(value is Gst.GLib.Object) ++ g_value_set_object (ref this, (value as Gst.GLib.Object).Handle); + else +- g_value_set_object (ref this, (value as GLib.GInterfaceAdapter).Handle); ++ g_value_set_object (ref this, (value as Gst.GLib.GInterfaceAdapter).Handle); + else if (GType.Is (type, GType.Boxed)) { + if (value is IWrapper) { + g_value_set_boxed (ref this, ((IWrapper)value).Handle); +@@ -527,7 +527,7 @@ + IntPtr buf = Marshaller.StructureToPtrAlloc (value); + g_value_set_boxed (ref this, buf); + Marshal.FreeHGlobal (buf); +- } else if (GLib.GType.LookupType (type) != null) { ++ } else if (Gst.GLib.GType.LookupType (type) != null) { + FromRegisteredType (value); + } else + throw new Exception ("Unknown type " + new GType (type).ToString ()); +@@ -570,10 +570,10 @@ + static extern bool g_type_check_value_holds (ref Value val, IntPtr gtype); + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_value_init (ref GLib.Value val, IntPtr gtype); ++ static extern void g_value_init (ref Gst.GLib.Value val, IntPtr gtype); + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +- static extern void g_value_unset (ref GLib.Value val); ++ static extern void g_value_unset (ref Gst.GLib.Value val); + + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + static extern void g_value_set_boolean (ref Value val, bool data); |