[pidgin-musictracker] r464 committed - Look for libxmmsclient.so.6 and libxmmsclient.so.5 as well as just lib...

[pidgin-mu...@googlecode.com]

Revision: 464
Author: jon.t...@dronecode.org.uk
Date: Thu Jul 22 11:58:03 2010
Log: Look for libxmmsclient.so.6 and libxmmsclient.so.5 as well as just
libxmmsclient.so
(Issue 214)

http://code.google.com/p/pidgin-musictracker/source/detail?r=464

Modified:
/trunk/src/xmms2.c

=======================================
--- /trunk/src/xmms2.c Mon May 25 07:33:28 2009
+++ /trunk/src/xmms2.c Thu Jul 22 11:58:03 2010
@@ -35,41 +35,63 @@
static struct xmmsclientlib dl;

#define get_func(name) dl.name = dlsym(handle, #name) ; \
- if (dl.name == NULL) {trace("(XMMS2) could not
resolve symbol %s in libxmmsclient.so", #name); dlclose(handle); return
FALSE; } ;
+ if (dl.name == NULL) {trace("(XMMS2) could not
resolve symbol %s in ", #name, libname); dlclose(handle); return NULL; } ;

static
-void *xmms2_dlsym_init(void)
+void *xmms2_dlsym_init(const char *libname)
+{
+ void *handle = dlopen(libname, RTLD_NOW);
+ if (handle)
+ {
+ get_func(xmmsc_init);
+ get_func(xmmsc_connect);
+ get_func(xmmsc_unref);
+ get_func(xmmsc_get_last_error);
+ get_func(xmmsc_playback_status);
+ get_func(xmmsc_playback_current_id);
+ get_func(xmmsc_playback_playtime);
+ get_func(xmmsc_medialib_get_info);
+ get_func(xmmsv_dict_entry_get_string);
+ get_func(xmmsv_dict_entry_get_int);
+ get_func(xmmsc_result_wait);
+ get_func(xmmsc_result_get_value);
+ get_func(xmmsv_get_uint);
+ get_func(xmmsv_get_error);
+ get_func(xmmsc_result_unref);
+ get_func(xmmsv_get_string);
+ get_func(xmmsv_propdict_to_dict);
+ get_func(xmmsv_unref);
+ dl.handle = handle;
+ }
+ else
+ {
+ trace("(XMMS2) Failed to load library %s", libname);
+ }
+ return handle;
+}
+
+static
+void *xmms2_lib_init(void)
{
if (!dl.handle)
{
- void *handle = dlopen("libxmmsclient.so", RTLD_NOW);
- if (handle)
- {
- get_func(xmmsc_init);
- get_func(xmmsc_connect);
- get_func(xmmsc_unref);
- get_func(xmmsc_get_last_error);
- get_func(xmmsc_playback_status);
- get_func(xmmsc_playback_current_id);
- get_func(xmmsc_playback_playtime);
- get_func(xmmsc_medialib_get_info);
- get_func(xmmsv_dict_entry_get_string);
- get_func(xmmsv_dict_entry_get_int);
- get_func(xmmsc_result_wait);
- get_func(xmmsc_result_get_value);
- get_func(xmmsv_get_uint);
- get_func(xmmsv_get_error);
- get_func(xmmsc_result_unref);
- get_func(xmmsv_get_string);
- get_func(xmmsv_propdict_to_dict);
- get_func(xmmsv_unref);
- dl.handle = handle;
- }
- else
- {
- trace("(XMMS2) Failed to load library libxmmsclient.so");
- }
- }
+ dl.handle = xmms2_dlsym_init("libxmmsclient.so");
+
+ /* XMMS2 0.7 DrNo */
+ if (!dl.handle)
+ {
+ dl.handle = xmms2_dlsym_init("libxmmsclient.so.6");
+ }
+
+ /* XMMS2 0.6 DrMattDestruction */
+ if (!dl.handle)
+ {
+ dl.handle = xmms2_dlsym_init("libxmmsclient.so.5");
+ }
+
+ /* XMMS2 0.5 and earlier, libxmmsclient API is incompatible */
+ }
+
return dl.handle;
}

@@ -235,7 +257,7 @@
gint ret;

// have we successfully loaded the xmmsclient library and resolved
symbols
- if (!xmms2_dlsym_init())
+ if (!xmms2_lib_init())
{
return;
}