Mercurial > audlegacy

changeset 4632:f733f3d75850

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 11 Jun 2008 18:03:27 +0300
parents 5ebedd1470c9 (diff) 6cda48638a58 (current diff)
children 3d5862f6c6c4 ca64cd387021
files src/audacious/dbus.c
diffstat 7 files changed, 31 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Jun 11 18:02:53 2008 +0300
+++ b/configure.ac	Wed Jun 11 18:03:27 2008 +0300
@@ -32,6 +32,8 @@
 IMPLIB_LIBS=""
 AC_SUBST([IMPLIB_LIBS])
 
+AUDLDFLAGS="-Wl,-rpath,${libdir}"
+AC_SUBST([AUDLDFLAGS])
 
 dnl Plugin stuff
 dnl ========================
@@ -106,7 +108,7 @@
     PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gthread-2.0],
         [enable_dbus=yes],
         [enable_dbus=no])
-    
+
     AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
     AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal], [no])
     if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$enable_dbus" = "xno" ; then
@@ -117,7 +119,7 @@
         AC_DEFINE([USE_DBUS], 1, [Define if D-Bus support enabled])
         AC_DEFINE([DBUS_SERVICES_DIR], "$datadir/dbus-1/services",
             [Location of D-Bus services directory])
-        LIBAUDCLIENT_LDFLAGS="-laudclient"
+        LIBAUDCLIENT_LDFLAGS="$AUDLDFLAGS -laudclient"
         AC_SUBST([DBUS_CFLAGS])
         AC_SUBST([DBUS_LIBS])
         AC_SUBST([DBUS_SERVICES_DIR])
--- a/extra.mk.in	Wed Jun 11 18:02:53 2008 +0300
+++ b/extra.mk.in	Wed Jun 11 18:03:27 2008 +0300
@@ -180,3 +180,4 @@
 AUDACIOUS_PATH ?= @AUDACIOUS_PATH@
 ARCH_X86 ?= @ARCH_X86@
 VERSION ?= @VERSION@
+AUDLDFLAGS ?= @AUDLDFLAGS@
--- a/src/audacious/Makefile	Wed Jun 11 18:02:53 2008 +0300
+++ b/src/audacious/Makefile	Wed Jun 11 18:03:27 2008 +0300
@@ -191,9 +191,9 @@
 		${LIBMCS_LIBS}					\
 		${REGEX_LIBS}
 
-LDFLAGS += ${PROG_IMPLIB_LDFLAGS}
+LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
 
-build_stamp.c: 
+build_stamp.c:
 	if test -d ../../.hg ; then \
 		revh=`hg tip --template 'const char *svn_stamp = "#rev#:#node|short#";\n' 2>/dev/null`; \
 		[ -z "$$revh" ] || echo "$$revh" > build_stamp.c; \
--- a/src/audacious/dbus.c	Wed Jun 11 18:02:53 2008 +0300
+++ b/src/audacious/dbus.c	Wed Jun 11 18:03:27 2008 +0300
@@ -196,7 +196,7 @@
     TupleValueType type;
     type = tuple_get_value_type(tuple, -1, key);
     if (type == TUPLE_STRING) {
-        gchar *result = g_strdup(tuple_get_string(tuple, -1, key));
+        gchar *result = str_to_utf8(tuple_get_string(tuple, -1, key));
 
         val = g_new0(GValue, 1);
         g_value_init(val, G_TYPE_STRING);
@@ -698,7 +698,15 @@
 
 gboolean audacious_rc_song_filename(RemoteObject *obj, guint pos,
                                     gchar **filename, GError **error) {
-    *filename = playlist_get_filename(playlist_get_active(), pos);
+    gchar *tmp = NULL;
+    tmp = playlist_get_filename(playlist_get_active(), pos);
+
+    if(tmp){
+        *filename = str_to_utf8(tmp);
+    }
+    free(tmp);
+    tmp = NULL;
+
     return TRUE;
 }
 
--- a/src/audacious/plugin.h	Wed Jun 11 18:02:53 2008 +0300
+++ b/src/audacious/plugin.h	Wed Jun 11 18:03:27 2008 +0300
@@ -522,14 +522,6 @@
     gint (*hook_dissociate)(const gchar *name, HookFunction func);
     void (*hook_call)(const gchar *name, gpointer hook_data);
 
-    /* defunct xconvert API, not really supported. */
-    gpointer xmms_convert_buffers_new;
-    gpointer xmms_convert_buffers_free;
-    gpointer xmms_convert_buffers_destroy;
-    gpointer xmms_convert_get_func;
-    gpointer xmms_convert_get_channel_func;
-    gpointer xmms_convert_get_frequency_func;
-
     /* PluginMenu API */
     gint (*menu_plugin_item_add)(gint, GtkWidget *);
     gint (*menu_plugin_item_remove)(gint, GtkWidget *);
@@ -620,19 +612,8 @@
     void (*flow_link_element)(Flow *flow, FlowFunction func);
     void (*flow_unlink_element)(Flow *flow, FlowFunction func);
     void (*effect_flow)(FlowContext *context);
-    gpointer iir_flow;	/* old iir_flow */
     void (*volumecontrol_flow)(FlowContext *context);
     
-    /* Dock */
-    GList *(*get_dock_window_list)(void);
-    GList *(*dock_add_window)(GList * window_list, GtkWindow * window);
-    GList *(*dock_remove_window)(GList * window_list, GtkWindow * window);
-    void (*dock_move_press)(GList * window_list, GtkWindow * w,
-                         GdkEventButton * event, gboolean move_list);
-    void (*dock_move_motion)(GtkWindow * w, GdkEventMotion * event);
-    void (*dock_move_release)(GtkWindow * w);
-    gboolean (*dock_is_moving)(GtkWindow * w);
-
     GList *(*get_output_list)(void);
 
     void (*input_get_volume)(gint * l, gint * r);
@@ -1159,8 +1140,6 @@
 
     /* Added in Audacious 1.1.0 */
     Tuple *(*get_song_tuple) (gchar * filename);
-    void (*set_song_tuple) (Tuple * tuple); /* stillborn, obsoleted by update_song_tuple, which must be used for tag writing */
-    void (*set_status_buffering) (gboolean status); /* unfunctional */
 
     /* Added in Audacious 1.3.0 */
     gint (*is_our_file_from_vfs) (gchar *filename, VFSFile *fd);
--- a/src/audacious/pluginenum.c	Wed Jun 11 18:02:53 2008 +0300
+++ b/src/audacious/pluginenum.c	Wed Jun 11 18:03:27 2008 +0300
@@ -37,33 +37,29 @@
 #include <gmodule.h>
 #include <string.h>
 
+#include "pluginenum.h"
+
+#include "discovery.h"
+#include "effect.h"
+#include "general.h"
+#include "input.h"
 #include "main.h"
+#include "output.h"
 #include "playback.h"
 #include "playlist.h"
 #include "strings.h"
 #include "util.h"
-
-#include "effect.h"
-#include "general.h"
-#include "input.h"
-#include "output.h"
 #include "visualization.h"
-#include "discovery.h"
 #include "preferences.h"
-
-#include "pluginenum.h"
-
 #include "vfs_buffer.h"
 #include "vfs_buffered_file.h"
+#include "volumecontrol.h"
 
-#include "ui_dock.h"
-#include "ui_preferences.h"
 #include "ui_fileinfo.h"
 #include "ui_fileinfopopup.h"
+#include "ui_plugin_menu.h"
+#include "ui_preferences.h"
 
-#include "effect.h"
-#include "volumecontrol.h"
-#include "ui_plugin_menu.h"
 
 const gchar *plugin_dir_list[] = {
     PLUGINSUBS,
@@ -236,7 +232,6 @@
     .playlist_fileinfo = ui_fileinfo_show,
 
     .playlist_delete_index = playlist_delete_index,
-    .playlist_delete_filenames = NULL, /* remove eventually --mf0102 */
 
     .playlist_get_entry_to_play = playlist_get_entry_to_play,
 
@@ -307,7 +302,6 @@
     .drct_eq_win_toggle = drct_eq_win_toggle,
     .drct_pl_win_is_visible = drct_pl_win_is_visible,
     .drct_pl_win_toggle = drct_pl_win_toggle,
-    .drct_set_skin = NULL, /* remove someday. --mf0102 */
     .drct_activate = drct_activate,
 
     .drct_initiate = drct_initiate,
@@ -377,14 +371,6 @@
 
     .util_menu_main_show = util_menu_main_show,
     
-    .get_dock_window_list = get_dock_window_list,
-    .dock_add_window = dock_add_window,
-    .dock_remove_window = dock_remove_window,
-    .dock_move_press = dock_move_press,
-    .dock_move_motion = dock_move_motion,
-    .dock_move_release = dock_move_release,
-    .dock_is_moving = dock_is_moving,
-
     .get_output_list = get_output_list,
 
     .input_get_volume = input_get_volume,
@@ -561,7 +547,6 @@
        - descender */
     p->set_info = (void (*)(gchar *, gint, gint, gint, gint)) playlist_set_info_old_abi;
     p->set_info_text = input_set_info_text;
-    p->set_status_buffering = NULL; /* XXX: remove this someday --mf0102 */
 
     ip_data.input_list = g_list_append(ip_data.input_list, p);
     
--- a/src/audacious/pluginenum.h	Wed Jun 11 18:02:53 2008 +0300
+++ b/src/audacious/pluginenum.h	Wed Jun 11 18:03:27 2008 +0300
@@ -25,8 +25,11 @@
 #ifndef AUDACIOUS_PLUGINENUM_H
 #define AUDACIOUS_PLUGINENUM_H
 
+#include "config.h"
+
 #include <glib.h>
-#include "config.h"
+
+#include "plugin.h"
 
 #define PLUGIN_FILENAME(name) (name SHARED_SUFFIX)