From 6cb104a67aa6a94eca77c8b3f14e8fc72412a015 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Mon, 25 May 2009 12:12:35 +0200 Subject: [PATCH] Add .dll to gstreamersharpglue DllImport Nescessary for .NET compatibility, where .dll isn't added for libraries with a . in the filename. --- gstreamer-sharp/Buffer.custom | 12 ++++++------ gstreamer-sharp/Clock.custom | 8 ++++---- gstreamer-sharp/ClockEntry.custom | 4 ++-- gstreamer-sharp/DynamicSignal.cs | 4 ++-- gstreamer-sharp/Event.custom | 4 ++-- gstreamer-sharp/IndexEntry.custom | 18 +++++++++--------- gstreamer-sharp/IndexFactory.custom | 2 +- gstreamer-sharp/Makefile.am | 2 +- gstreamer-sharp/Message.custom | 4 ++-- gstreamer-sharp/MixerTrack.custom | 10 +++++----- gstreamer-sharp/Object.custom | 2 +- gstreamer-sharp/Pad.custom | 2 +- gstreamer-sharp/PropertyInfo.cs | 2 +- gstreamer-sharp/Structure.custom | 2 +- gstreamer-sharp/TagList.custom | 2 +- gstreamer-sharp/Task.custom | 2 +- gstreamer-sharp/TypeFind.custom | 2 +- 17 files changed, 41 insertions(+), 41 deletions(-) diff --git a/gstreamer-sharp/Buffer.custom b/gstreamer-sharp/Buffer.custom index 9bbeb7127a..f289c48678 100644 --- a/gstreamer-sharp/Buffer.custom +++ b/gstreamer-sharp/Buffer.custom @@ -14,9 +14,9 @@ public Buffer (byte[] data) : this () { Data = data; } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_buffer_get_data_offset (); -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static void gstsharp_gst_buffer_set_data (IntPtr handle, IntPtr data, uint size); [DllImport ("libglib-2.0-0.dll") ] extern static IntPtr g_try_malloc (int size); @@ -103,7 +103,7 @@ public Gst.Caps Caps { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_buffer_get_timestamp_offset (); static uint timestamp_offset = gstsharp_gst_buffer_get_timestamp_offset (); @@ -126,7 +126,7 @@ public ulong Timestamp { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_buffer_get_duration_offset (); static uint duration_offset = gstsharp_gst_buffer_get_duration_offset (); @@ -149,7 +149,7 @@ public ulong Duration { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_buffer_get_offset_offset (); static uint offset_offset = gstsharp_gst_buffer_get_offset_offset (); @@ -172,7 +172,7 @@ public ulong Offset { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_buffer_get_offset_end_offset (); static uint offset_end_offset = gstsharp_gst_buffer_get_offset_end_offset (); diff --git a/gstreamer-sharp/Clock.custom b/gstreamer-sharp/Clock.custom index f7000475e6..1a373a2ae4 100644 --- a/gstreamer-sharp/Clock.custom +++ b/gstreamer-sharp/Clock.custom @@ -8,7 +8,7 @@ public static bool TimeIsValid (ulong time) { return (time != TimeNone); } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_clock_get_entries_changed_offset (); static uint entries_changed_offset = gstsharp_gst_clock_get_entries_changed_offset (); @@ -60,7 +60,7 @@ public void Broadcast () { g_cond_broadcast (EntriesChangedPtr); } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_clock_get_slave_lock_offset (); static uint slave_lock_offset = gstsharp_gst_clock_get_slave_lock_offset (); @@ -108,7 +108,7 @@ public Gst.Clock Master { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_clock_get_entries_offset (); static uint entries_offset = gstsharp_gst_clock_get_entries_offset (); @@ -127,7 +127,7 @@ protected Gst.ClockEntry[] Entries { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_clock_get_times_offset (); static uint times_offset = gstsharp_gst_clock_get_times_offset (); diff --git a/gstreamer-sharp/ClockEntry.custom b/gstreamer-sharp/ClockEntry.custom index e412d13798..6c25745aae 100644 --- a/gstreamer-sharp/ClockEntry.custom +++ b/gstreamer-sharp/ClockEntry.custom @@ -1,6 +1,6 @@ -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] static extern GstSharp.ClockCallbackNative gstsharp_gst_clock_entry_get_func (IntPtr raw); -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] static extern void gstsharp_gst_clock_entry_set_func (IntPtr raw, GstSharp.ClockCallbackNative func); private GstSharp.ClockCallbackWrapper wrapper; diff --git a/gstreamer-sharp/DynamicSignal.cs b/gstreamer-sharp/DynamicSignal.cs index ad722ab32c..b8cbddcf1f 100644 --- a/gstreamer-sharp/DynamicSignal.cs +++ b/gstreamer-sharp/DynamicSignal.cs @@ -113,7 +113,7 @@ namespace Gst { } } - [DllImport ("gstreamersharpglue-0.10") ] + [DllImport ("gstreamersharpglue-0.10.dll") ] static extern int gstsharp_g_closure_sizeof (); public static void Disconnect (GLib.Object o, string name, DynamicSignalHandler handler) { @@ -296,7 +296,7 @@ namespace Gst { return ret; } - [DllImport ("gstreamersharpglue-0.10") ] + [DllImport ("gstreamersharpglue-0.10.dll") ] static extern IntPtr gstsharp_g_type_from_instance (IntPtr o); [DllImport ("libgobject-2.0.dll") ] diff --git a/gstreamer-sharp/Event.custom b/gstreamer-sharp/Event.custom index 44ab52ecb0..4c2fa50f3b 100644 --- a/gstreamer-sharp/Event.custom +++ b/gstreamer-sharp/Event.custom @@ -1,6 +1,6 @@ public Event (GLib.Value val) : base (val) { } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_event_get_timestamp_offset (); static uint timestamp_offset = gstsharp_gst_event_get_timestamp_offset (); @@ -22,7 +22,7 @@ public ulong Timestamp { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_event_get_src_offset (); [DllImport ("libgobject-2.0.dll") ] diff --git a/gstreamer-sharp/IndexEntry.custom b/gstreamer-sharp/IndexEntry.custom index 27ec3869ee..bb0558dc09 100644 --- a/gstreamer-sharp/IndexEntry.custom +++ b/gstreamer-sharp/IndexEntry.custom @@ -3,7 +3,7 @@ protected override GLib.Opaque Copy (IntPtr raw) return GLib.Opaque.GetOpaque (raw, typeof (Gst.IndexEntry), true); } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_id_description_offset (); static uint id_description_offset = gstsharp_gst_index_entry_get_id_description_offset (); @@ -19,7 +19,7 @@ public string IdDescription { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_assoc_nassocs_offset (); static uint assoc_nassocs_offset = gstsharp_gst_index_entry_get_assoc_nassocs_offset (); @@ -35,7 +35,7 @@ public int AssocNAssocs { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_assoc_assocs_offset (); static uint assoc_assocs_offset = gstsharp_gst_index_entry_get_assoc_assocs_offset (); @@ -59,7 +59,7 @@ public Gst.IndexAssociation[] AssocAssocs { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_assoc_flags_offset (); static uint assoc_flags_offset = gstsharp_gst_index_entry_get_assoc_flags_offset (); @@ -75,7 +75,7 @@ public Gst.AssocFlags AssocFlags { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_object_key_offset (); static uint object_key_offset = gstsharp_gst_index_entry_get_object_key_offset (); @@ -91,7 +91,7 @@ public string ObjectKey { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_object_type_offset (); static uint object_type_offset = gstsharp_gst_index_entry_get_object_type_offset (); @@ -107,7 +107,7 @@ public GLib.GType ObjectGType { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_object_object_offset (); static uint object_object_offset = gstsharp_gst_index_entry_get_object_object_offset (); @@ -123,7 +123,7 @@ public object ObjectObject { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_format_format_offset (); static uint format_format_offset = gstsharp_gst_index_entry_get_format_format_offset (); @@ -139,7 +139,7 @@ public Gst.Format FormatFormat { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_index_entry_get_format_key_offset (); static uint format_key_offset = gstsharp_gst_index_entry_get_format_key_offset (); diff --git a/gstreamer-sharp/IndexFactory.custom b/gstreamer-sharp/IndexFactory.custom index f2b8ffa6bd..3caa50fe80 100644 --- a/gstreamer-sharp/IndexFactory.custom +++ b/gstreamer-sharp/IndexFactory.custom @@ -1,4 +1,4 @@ -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] static extern void gstsharp_gst_index_factory_set_plugin (IntPtr factory, IntPtr plugin); public static bool Register (Gst.Plugin plugin, string name, string longdesc, GLib.GType gtype) { diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am index 7c20b348c0..b506df0ac4 100644 --- a/gstreamer-sharp/Makefile.am +++ b/gstreamer-sharp/Makefile.am @@ -124,7 +124,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(srcdir)/$(SYMBOLS) generated-stamp: $(API) $(build_customs) $(overrides) $(MONO) $(top_builddir)/generator/gst-gapi_codegen.exe --generate $(API) \ --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - --gluelib-name=gstreamersharpglue-0.10 --glue-filename=glue/generated.c \ + --gluelib-name=gstreamersharpglue-0.10.dll --glue-filename=glue/generated.c \ --glue-includes=$(glue_includes) \ && cp $(overrides) $(builddir)/generated \ && sed 's;public class ObjectManager;internal class ObjectManager;g' generated/ObjectManager.cs > generated/ObjectManager.cs.tmp \ diff --git a/gstreamer-sharp/Message.custom b/gstreamer-sharp/Message.custom index 5ceecbb415..8fdfc970b0 100644 --- a/gstreamer-sharp/Message.custom +++ b/gstreamer-sharp/Message.custom @@ -1,6 +1,6 @@ public Message (GLib.Value val) : base (val) { } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_message_get_timestamp_offset (); static uint timestamp_offset = gstsharp_gst_message_get_timestamp_offset (); @@ -22,7 +22,7 @@ public ulong Timestamp { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_message_get_src_offset (); [DllImport ("libgobject-2.0.dll") ] diff --git a/gstreamer-sharp/MixerTrack.custom b/gstreamer-sharp/MixerTrack.custom index 28581d9854..122815d55b 100644 --- a/gstreamer-sharp/MixerTrack.custom +++ b/gstreamer-sharp/MixerTrack.custom @@ -1,16 +1,16 @@ -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gst__interfacessharp_gst__interfaces_mixertrack_get_label_offset (); static uint label_offset = gst__interfacessharp_gst__interfaces_mixertrack_get_label_offset (); -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gst__interfacessharp_gst__interfaces_mixertrack_get_flags_offset (); static uint flags_offset = gst__interfacessharp_gst__interfaces_mixertrack_get_flags_offset (); -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gst__interfacessharp_gst__interfaces_mixertrack_get_num_channels_offset (); static uint num_channels_offset = gst__interfacessharp_gst__interfaces_mixertrack_get_num_channels_offset (); -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gst__interfacessharp_gst__interfaces_mixertrack_get_min_volume_offset (); static uint min_volume_offset = gst__interfacessharp_gst__interfaces_mixertrack_get_min_volume_offset (); -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gst__interfacessharp_gst__interfaces_mixertrack_get_max_volume_offset (); static uint max_volume_offset = gst__interfacessharp_gst__interfaces_mixertrack_get_max_volume_offset (); diff --git a/gstreamer-sharp/Object.custom b/gstreamer-sharp/Object.custom index d24352223a..94ddcc455e 100644 --- a/gstreamer-sharp/Object.custom +++ b/gstreamer-sharp/Object.custom @@ -95,7 +95,7 @@ public Gst.Object Parent { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_object_get_lock_offset (); static uint lock_offset = gstsharp_gst_object_get_lock_offset (); diff --git a/gstreamer-sharp/Pad.custom b/gstreamer-sharp/Pad.custom index fa40873c53..b0a747692b 100644 --- a/gstreamer-sharp/Pad.custom +++ b/gstreamer-sharp/Pad.custom @@ -387,7 +387,7 @@ public Gst.FlowReturn Chain (Gst.Buffer buffer) { return ret; } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_pad_get_stream_lock_offset (); static uint stream_lock_offset = gstsharp_gst_pad_get_stream_lock_offset (); diff --git a/gstreamer-sharp/PropertyInfo.cs b/gstreamer-sharp/PropertyInfo.cs index ada8515f27..964b1b6459 100644 --- a/gstreamer-sharp/PropertyInfo.cs +++ b/gstreamer-sharp/PropertyInfo.cs @@ -93,7 +93,7 @@ namespace Gst { [DllImport ("libgobject-2.0-0.dll") ] static extern void g_param_value_set_default (IntPtr pspec, ref GLib.Value val); - [DllImport ("gstreamersharpglue-0.10") ] + [DllImport ("gstreamersharpglue-0.10.dll") ] static extern bool gstsharp_g_param_spec_get_range (IntPtr pspec, ref GLib.Value min, ref GLib.Value max); diff --git a/gstreamer-sharp/Structure.custom b/gstreamer-sharp/Structure.custom index a282f7a635..558e20bdcc 100644 --- a/gstreamer-sharp/Structure.custom +++ b/gstreamer-sharp/Structure.custom @@ -220,7 +220,7 @@ public bool FixateFieldNearestFraction (string field_name, Fraction target) { } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_structure_get_parent_refcount_offset (); static uint parent_refcount_offset = gstsharp_gst_structure_get_parent_refcount_offset (); diff --git a/gstreamer-sharp/TagList.custom b/gstreamer-sharp/TagList.custom index 4fc66d8983..9789299440 100644 --- a/gstreamer-sharp/TagList.custom +++ b/gstreamer-sharp/TagList.custom @@ -57,7 +57,7 @@ public object this[string tag] { } } -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] static extern void gstsharp_gst_tag_list_add_value (IntPtr list, Gst.TagMergeMode mode, IntPtr tag, ref GLib.Value v); public void Add (Gst.TagMergeMode mode, string tag, object value) { diff --git a/gstreamer-sharp/Task.custom b/gstreamer-sharp/Task.custom index 8e762c12f2..900e298433 100644 --- a/gstreamer-sharp/Task.custom +++ b/gstreamer-sharp/Task.custom @@ -1,4 +1,4 @@ -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] extern static uint gstsharp_gst_task_get_cond_offset (); static uint cond_offset = gstsharp_gst_task_get_cond_offset (); diff --git a/gstreamer-sharp/TypeFind.custom b/gstreamer-sharp/TypeFind.custom index aadb008c4c..3c151cb7a8 100644 --- a/gstreamer-sharp/TypeFind.custom +++ b/gstreamer-sharp/TypeFind.custom @@ -15,7 +15,7 @@ private GstSharp.TypeFindPeekFunctionWrapper peek; private GstSharp.TypeFindSuggestFunctionWrapper suggest; private GstSharp.TypeFindGetLengthFunctionWrapper get_length; -[DllImport ("gstreamersharpglue-0.10") ] +[DllImport ("gstreamersharpglue-0.10.dll") ] static extern IntPtr gstsharp_gst_type_find_new (GstSharp.TypeFindPeekFunctionNative peek, GstSharp.TypeFindSuggestFunctionNative suggest, GstSharp.TypeFindGetLengthFunctionNative get_length);