[banshee/windows: 4/7] Add Banshee.GStreamer.dll.config so we can reference libbanshee.dll in the code for Windows support.
- From: Gabriel Burt <gburt src gnome org>
- To: svn-commits-list gnome org
- Subject: [banshee/windows: 4/7] Add Banshee.GStreamer.dll.config so we can reference libbanshee.dll in the code for Windows support.
- Date: Fri, 1 May 2009 13:58:46 -0400 (EDT)
commit 89665b13a8d6c5f3dc6d317ebf6d3b5b8dbf0413
Author: Gabriel Burt <gabriel burt gmail com>
Date: Thu Apr 23 17:35:05 2009 -0500
Add Banshee.GStreamer.dll.config so we can reference libbanshee.dll in the code for Windows support. Remove unused include in libbanshee that is Unix specific
---
libbanshee/banshee-transcoder.c | 1 -
.../Banshee.GStreamer/Banshee.GStreamer.dll.config | 4 +
.../Banshee.GStreamer/AudioCdRipper.cs | 14 ++--
.../Banshee.GStreamer/BpmDetector.cs | 14 ++--
.../Banshee.GStreamer/PlayerEngine.cs | 68 ++++++++++----------
.../Banshee.GStreamer/Banshee.GStreamer/Service.cs | 4 +-
.../Banshee.GStreamer/Banshee.GStreamer/TagList.cs | 8 +-
.../Banshee.GStreamer/Transcoder.cs | 16 ++--
src/Backends/Banshee.GStreamer/Makefile.am | 2 +
9 files changed, 68 insertions(+), 63 deletions(-)
diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
index 6bfa550..f40ab9b 100644
--- a/libbanshee/banshee-transcoder.c
+++ b/libbanshee/banshee-transcoder.c
@@ -29,7 +29,6 @@
#include <gst/gst.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <unistd.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
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..0037e49
--- /dev/null
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer.dll.config
@@ -0,0 +1,4 @@
+<configuration>
+ <dllmap dll="libbanshee.dll" target="libbanshee" os="linux"/>
+ <dllmap dll="libbanshee.dll" target="libbanshee" os="osx"/>
+</configuration>
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
index 72cc985..fe466fd 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
@@ -221,26 +221,26 @@ namespace Banshee.GStreamer
private delegate void RipperFinishedHandler (IntPtr ripper);
private delegate void RipperErrorHandler (IntPtr ripper, IntPtr error, IntPtr debug);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern IntPtr br_new (string device, int paranoia_mode, string encoder_pipeline);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void br_destroy (HandleRef handle);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void br_rip_track (HandleRef handle, int track_number, string output_path,
HandleRef tag_list, out bool tagging_supported);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void br_set_progress_callback (HandleRef handle, RipperProgressHandler callback);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void br_set_mimetype_callback (HandleRef handle, RipperMimeTypeHandler callback);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void br_set_finished_callback (HandleRef handle, RipperFinishedHandler callback);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void br_set_error_callback (HandleRef handle, RipperErrorHandler callback);
}
}
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs
index f2b11f2..48b2e73 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs
@@ -168,25 +168,25 @@ namespace Banshee.GStreamer
private delegate void BpmDetectorFinishedHandler ();
//private delegate void BpmDetectorErrorHandler (IntPtr error, IntPtr debug);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern IntPtr bbd_new ();
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bbd_destroy (HandleRef handle);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool bbd_get_is_detecting (HandleRef handle);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bbd_process_file (HandleRef handle, IntPtr path);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bbd_set_progress_callback (HandleRef handle, BpmDetectorProgressHandler callback);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bbd_set_finished_callback (HandleRef handle, BpmDetectorFinishedHandler callback);
- //[DllImport ("libbanshee")]
+ //[DllImport ("libbanshee.dll")]
//private static extern void bbd_set_error_callback (HandleRef handle, BpmDetectorErrorHandler callback);
}
}
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
index c46a134..4d1ae39 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
@@ -524,113 +524,113 @@ namespace Banshee.GStreamer
#endregion
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern IntPtr bp_new ();
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_destroy (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_eos_callback (HandleRef player, BansheePlayerEosCallback cb);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_error_callback (HandleRef player, BansheePlayerErrorCallback cb);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_vis_data_callback (HandleRef player, BansheePlayerVisDataCallback cb);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_state_changed_callback (HandleRef player,
BansheePlayerStateChangedCallback cb);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_iterate_callback (HandleRef player,
BansheePlayerIterateCallback cb);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_buffering_callback (HandleRef player,
BansheePlayerBufferingCallback cb);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_tag_found_callback (HandleRef player,
GstTaggerTagFoundCallback cb);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool bp_open (HandleRef player, IntPtr uri);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_stop (HandleRef player, bool nullstate);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_pause (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_play (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_volume (HandleRef player, double volume);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern double bp_get_volume (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool bp_can_seek (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool bp_set_position (HandleRef player, ulong time_ms);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern ulong bp_get_position (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern ulong bp_get_duration (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool bp_get_pipeline_elements (HandleRef player, out IntPtr playbin,
out IntPtr audiobin, out IntPtr audiotee);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_set_application_gdk_window (HandleRef player, IntPtr window);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern VideoDisplayContextType bp_video_get_display_context_type (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_video_set_display_context (HandleRef player, IntPtr displayContext);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern IntPtr bp_video_get_display_context (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_video_window_expose (HandleRef player, IntPtr displayContext, bool direct);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_get_error_quarks (out uint core, out uint library,
out uint resource, out uint stream);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool bp_equalizer_is_supported (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_equalizer_set_preamp_level (HandleRef player, double level);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_equalizer_set_gain (HandleRef player, uint bandnum, double gain);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_equalizer_get_bandrange (HandleRef player, out int min, out int max);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern uint bp_equalizer_get_nbands (HandleRef player);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_equalizer_get_frequencies (HandleRef player,
[MarshalAs (UnmanagedType.LPArray)] out double [] freq);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bp_replaygain_set_enabled (HandleRef player, bool enabled);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool bp_replaygain_get_enabled (HandleRef player);
}
}
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Service.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Service.cs
index 70ffb3a..208f34d 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Service.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Service.cs
@@ -48,7 +48,7 @@ namespace Banshee.GStreamer
{
}
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void gstreamer_initialize (bool debugging, BansheeLogHandler log_handler);
void IExtensionService.Initialize ()
@@ -109,7 +109,7 @@ namespace Banshee.GStreamer
args.ProfileAvailable = available;
}
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern bool gstreamer_test_pipeline (IntPtr pipeline);
internal static bool TestPipeline (string pipeline)
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/TagList.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/TagList.cs
index 8dcd36e..866a139 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/TagList.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/TagList.cs
@@ -119,16 +119,16 @@ namespace Banshee.GStreamer
get { return handle; }
}
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern IntPtr bt_tag_list_new ();
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bt_tag_list_free (HandleRef tag_list);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bt_tag_list_add_value (HandleRef tag_list, string tag_name, ref GLib.Value value);
- [DllImport ("libbanshee")]
+ [DllImport ("libbanshee.dll")]
private static extern void bt_tag_list_add_date (HandleRef tag_list, int year, int month, int day);
}
}
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs
index 8b5bbea..164af28 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs
@@ -171,32 +171,32 @@ namespace Banshee.GStreamer
private delegate void GstTranscoderFinishedCallback(IntPtr transcoder);
private delegate void GstTranscoderErrorCallback(IntPtr transcoder, IntPtr error, IntPtr debug);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern IntPtr gst_transcoder_new();
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern void gst_transcoder_free(HandleRef handle);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern void gst_transcoder_transcode(HandleRef handle, IntPtr input_uri,
IntPtr output_uri, string encoder_pipeline);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern void gst_transcoder_cancel(HandleRef handle);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern void gst_transcoder_set_progress_callback(HandleRef handle,
GstTranscoderProgressCallback cb);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern void gst_transcoder_set_finished_callback(HandleRef handle,
GstTranscoderFinishedCallback cb);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern void gst_transcoder_set_error_callback(HandleRef handle,
GstTranscoderErrorCallback cb);
- [DllImport("libbanshee")]
+ [DllImport("libbanshee.dll")]
private static extern bool gst_transcoder_get_is_transcoding(HandleRef handle);
}
}
diff --git a/src/Backends/Banshee.GStreamer/Makefile.am b/src/Backends/Banshee.GStreamer/Makefile.am
index 238aa4d..321b270 100644
--- a/src/Backends/Banshee.GStreamer/Makefile.am
+++ b/src/Backends/Banshee.GStreamer/Makefile.am
@@ -14,3 +14,5 @@ INSTALL_DIR = $(BACKENDS_INSTALL_DIR)
include $(top_srcdir)/build/build.mk
+EXTRA_DIST += Banshee.GStreamer.dll.config
+module_SCRIPTS += Banshee.GStreamer.dll.config
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]