GNOME.org
 

[banshee/managed-gst] Fixed the DllImport module name to match Windows

commit 8e66fc8f47133ff2505cc7b179e12218cd300d8b
Author: Aaron Bockover <abockover novell com>
Date:   Sun May 3 19:14:03 2009 -0400

    Fixed the DllImport module name to match Windows
---
 .../Banshee.GStreamer/Banshee.GStreamer.dll.config |    3 ++
 src/Backends/Banshee.GStreamer/GStreamer/Bin.cs    |   14 ++++----
 .../Banshee.GStreamer/GStreamer/Element.cs         |    8 ++--
 .../Banshee.GStreamer/GStreamer/ElementFactory.cs  |   32 ++++++++++----------
 .../Banshee.GStreamer/GStreamer/Framework.cs       |   18 +++++-----
 src/Backends/Banshee.GStreamer/GStreamer/Object.cs |    4 +-
 .../Banshee.GStreamer/GStreamer/PluginFeature.cs   |    2 +-
 7 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer.dll.config b/src/Backends/Banshee.GStreamer/Banshee.GStreamer.dll.config
new file mode 100644
index 0000000..0638d6b
--- /dev/null
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="gstreamer-0.10-0.dll" target="gstreamer-0.10.so.0" os="linux"/> 
+</configuration>
diff --git a/src/Backends/Banshee.GStreamer/GStreamer/Bin.cs b/src/Backends/Banshee.GStreamer/GStreamer/Bin.cs
index 24698ee..63c1ec1 100644
--- a/src/Backends/Banshee.GStreamer/GStreamer/Bin.cs
+++ b/src/Backends/Banshee.GStreamer/GStreamer/Bin.cs
@@ -31,13 +31,13 @@ namespace GStreamer
 {
     public class Bin : Element
     {
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_bin_get_type ();
         public static new GLib.GType GType {
             get { return new GLib.GType (gst_bin_get_type ()); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_bin_new (IntPtr name);
 
         public Bin (IntPtr raw) : base (raw)
@@ -54,7 +54,7 @@ namespace GStreamer
             }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_bin_add (IntPtr bin, IntPtr element);
         
         public void Add (Element element)
@@ -77,7 +77,7 @@ namespace GStreamer
             }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_bin_remove (IntPtr bin, IntPtr element);
         
         public void Remove (Element element)
@@ -100,7 +100,7 @@ namespace GStreamer
             }
         }
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_bin_get_by_name (IntPtr bin, IntPtr name);
 
         public Element GetByName (string name)
@@ -113,7 +113,7 @@ namespace GStreamer
             }
         }
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_bin_get_by_name_recurse_up (IntPtr bin, IntPtr name);
         
         public Element GetByNameRecurseUp (string name)
@@ -126,7 +126,7 @@ namespace GStreamer
             }
         }
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_bin_get_by_interface (IntPtr bin, IntPtr iface);
 
         public Element GetByInterface (GLib.GType iface)
diff --git a/src/Backends/Banshee.GStreamer/GStreamer/Element.cs b/src/Backends/Banshee.GStreamer/GStreamer/Element.cs
index 6ccebba..fb089d8 100644
--- a/src/Backends/Banshee.GStreamer/GStreamer/Element.cs
+++ b/src/Backends/Banshee.GStreamer/GStreamer/Element.cs
@@ -31,7 +31,7 @@ namespace GStreamer
 {
     public class Element : Object
     {
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_get_type ();
         public static new GLib.GType GType {
             get { return new GLib.GType (gst_element_get_type ()); }
@@ -48,10 +48,10 @@ namespace GStreamer
 
 #region Element Linking
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern bool gst_element_link (IntPtr src, IntPtr dest);
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern void gst_element_unlink (IntPtr src, IntPtr dest);
 
         public static bool TryLink (Element src, Element dest)
@@ -131,7 +131,7 @@ namespace GStreamer
 
 #region GObject Property Helpers
         
-        public new void SetProperty<T> (string name, T value)
+        public void SetProperty<T> (string name, T value)
         {
             base.SetProperty (name, new GLib.Value (value));
         }
diff --git a/src/Backends/Banshee.GStreamer/GStreamer/ElementFactory.cs b/src/Backends/Banshee.GStreamer/GStreamer/ElementFactory.cs
index c64e733..28dee9d 100644
--- a/src/Backends/Banshee.GStreamer/GStreamer/ElementFactory.cs
+++ b/src/Backends/Banshee.GStreamer/GStreamer/ElementFactory.cs
@@ -31,7 +31,7 @@ namespace GStreamer
 {
     public class ElementFactory : PluginFeature
     {
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_get_type ();
         public static new GLib.GType GType {
             get { return new GLib.GType (gst_element_factory_get_type ()); }
@@ -46,55 +46,55 @@ namespace GStreamer
             CreateNativeObject ();
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_get_element_type (IntPtr factory);
         public GLib.GType ElementGType {
             get { return new GLib.GType (gst_element_factory_get_element_type (Handle)); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_get_longname (IntPtr factory);
         public string LongName {
             get { return GLib.Marshaller.Utf8PtrToString (gst_element_factory_get_longname (Handle)); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_get_klass (IntPtr factory);
         public string Klass {
             get { return GLib.Marshaller.Utf8PtrToString (gst_element_factory_get_klass (Handle)); }
         }
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_get_description (IntPtr factory);
         public string Description {
             get { return GLib.Marshaller.Utf8PtrToString (gst_element_factory_get_description (Handle)); }
         }
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_get_author (IntPtr factory);
         public string Author {
             get { return GLib.Marshaller.Utf8PtrToString (gst_element_factory_get_author (Handle)); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern uint gst_element_factory_get_num_pad_templates (IntPtr factory);
         public uint NumPadTemplates {
             get { return gst_element_factory_get_num_pad_templates (Handle); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern int gst_element_factory_get_uri_type (IntPtr factory);
         public int UriType {
             get { return gst_element_factory_get_uri_type (Handle); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_get_uri_protocols (IntPtr factory);
         public string [] UriProtocols {
             get { return GLib.Marshaller.PtrToStringArrayGFree (gst_element_factory_get_uri_protocols (Handle)); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern bool gst_element_factory_has_interface (IntPtr factory, IntPtr interfacename);
 
         public bool HasInterface (string interfaceName)
@@ -108,7 +108,7 @@ namespace GStreamer
             }
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_create (IntPtr factory, IntPtr name);
         
         public Element Make (string name)
@@ -123,19 +123,19 @@ namespace GStreamer
             }
         }
 #if false
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern bool gst_element_factory_can_sink_caps (IntPtr factory, IntPtr caps /*const GstCaps *caps*/);
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern bool gst_element_factory_can_src_caps (IntPtr factory, IntPtr caps /*const GstCaps *caps*/);
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr /*const GList**/ gst_element_factory_get_static_pad_templates (IntPtr factory);
 #endif
 
 #region Static Methods
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_find (IntPtr name);
 
         public static ElementFactory Find (string name)
@@ -149,7 +149,7 @@ namespace GStreamer
             }
         }
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_element_factory_make (IntPtr factoryname, IntPtr name);
 
         public static Element TryMake (string factoryName, string name)
diff --git a/src/Backends/Banshee.GStreamer/GStreamer/Framework.cs b/src/Backends/Banshee.GStreamer/GStreamer/Framework.cs
index 5c3738e..4319d76 100644
--- a/src/Backends/Banshee.GStreamer/GStreamer/Framework.cs
+++ b/src/Backends/Banshee.GStreamer/GStreamer/Framework.cs
@@ -31,10 +31,10 @@ namespace GStreamer
 {
     public static class Framework
     {
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern void gst_init (ref int argc, ref IntPtr argv);
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern bool gst_init_check (ref int argc, ref IntPtr argv, IntPtr error);
 
         public static void Init ()
@@ -87,7 +87,7 @@ namespace GStreamer
             return Init (progname, ref args, true);
         }
         
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern void gst_deinit ();
 
         public static void Shutdown ()
@@ -95,7 +95,7 @@ namespace GStreamer
             gst_deinit ();
         }
                 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern bool gst_update_registry ();
 
         public static bool UpdateRegistry ()
@@ -103,7 +103,7 @@ namespace GStreamer
             return gst_update_registry ();
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern void gst_version (out uint major, out uint minor, out uint micro, out uint nano);
         public static FrameworkVersion Version {
             get { 
@@ -113,15 +113,15 @@ namespace GStreamer
             }
         }
         
-        [DllImport ("gstreamer-0.10.dll")] private static extern bool gst_segtrap_is_enabled ();
-        [DllImport ("gstreamer-0.10.dll")] private static extern void gst_segtrap_set_enabled (bool enabled);
+        [DllImport ("gstreamer-0.10-0.dll")] private static extern bool gst_segtrap_is_enabled ();
+        [DllImport ("gstreamer-0.10-0.dll")] private static extern void gst_segtrap_set_enabled (bool enabled);
         public static bool SegTrapEnabled {
             get { return gst_segtrap_is_enabled (); }
             set { gst_segtrap_set_enabled (value); }
         }
 
-        [DllImport ("gstreamer-0.10.dll")] private static extern bool gst_registry_fork_is_enabled ();
-        [DllImport ("gstreamer-0.10.dll")] private static extern void gst_registry_fork_set_enabled (bool enabled);
+        [DllImport ("gstreamer-0.10-0.dll")] private static extern bool gst_registry_fork_is_enabled ();
+        [DllImport ("gstreamer-0.10-0.dll")] private static extern void gst_registry_fork_set_enabled (bool enabled);
         public static bool RegistryForkEnabled {
             get { return gst_registry_fork_is_enabled (); }
             set { gst_registry_fork_set_enabled (value); }
diff --git a/src/Backends/Banshee.GStreamer/GStreamer/Object.cs b/src/Backends/Banshee.GStreamer/GStreamer/Object.cs
index 4e5bcd9..eaf428d 100644
--- a/src/Backends/Banshee.GStreamer/GStreamer/Object.cs
+++ b/src/Backends/Banshee.GStreamer/GStreamer/Object.cs
@@ -31,7 +31,7 @@ namespace GStreamer
 {
     public class Object : GLib.Object
     {
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_object_get_type ();
 
         public static new GLib.GType GType {
@@ -52,7 +52,7 @@ namespace GStreamer
             CreateNativeObject (new string[0], new GLib.Value[0]);
         }
 
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_object_get_name (IntPtr obj);
         public string Name {
             get { return GLib.Marshaller.Utf8PtrToString (gst_object_get_name (Handle)); }
diff --git a/src/Backends/Banshee.GStreamer/GStreamer/PluginFeature.cs b/src/Backends/Banshee.GStreamer/GStreamer/PluginFeature.cs
index 6325a06..55812e5 100644
--- a/src/Backends/Banshee.GStreamer/GStreamer/PluginFeature.cs
+++ b/src/Backends/Banshee.GStreamer/GStreamer/PluginFeature.cs
@@ -31,7 +31,7 @@ namespace GStreamer
 {
     public class PluginFeature : Object
     {
-        [DllImport ("gstreamer-0.10.dll")]
+        [DllImport ("gstreamer-0.10-0.dll")]
         private static extern IntPtr gst_plugin_feature_get_type ();
 
         public static new GLib.GType GType {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]