Mercurial > audlegacy-plugins
changeset 2938:597857a52f7c
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 18 Sep 2008 08:19:56 +0300 |
| parents | a5cb0e914df6 (diff) 8c48d6793b86 (current diff) |
| children | 3877a02782bb |
| files | configure.ac |
| diffstat | 6 files changed, 28 insertions(+), 154 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Sep 18 08:19:49 2008 +0300 +++ b/configure.ac Thu Sep 18 08:19:56 2008 +0300 @@ -1387,6 +1387,11 @@ PKG_CHECK_MODULES(MTP, [libmtp >= 0.1.3], [GENERAL_PLUGINS="$GENERAL_PLUGINS mtp_up" ], [have_mtp_up="no"]) MTP_LIBS=`pkg-config --libs libmtp` MTP_CFLAGS=`pkg-config --cflags libmtp` + dnl Check for libmtp 0.3.0+ + PKG_CHECK_EXISTS(libmtp >= 0.3.0, libmtp_030_pkg=yes, libmtp_030_pkg=no) + if test x"$libmtp_030_pkg" = "xyes" ; then + AC_DEFINE([HAVE_LIBMTP_030], 1, [indidaces if libmtp 0.3.0 is installed]) + fi else have_mtp_up=no AC_MSG_RESULT([*** mtp upload plugin disabled by request ***])
--- a/src/bluetooth/Makefile Thu Sep 18 08:19:49 2008 +0300 +++ b/src/bluetooth/Makefile Thu Sep 18 08:19:56 2008 +0300 @@ -3,6 +3,14 @@ SRCS = bluetooth.c gui.c marshal.c scan_gui.c agent.c include ../../buildsys.mk include ../../extra.mk + +pre-depend: marshal.h + +marshal.h: + glib-genmarshal --prefix=marshal --header marshal.list > $@ +marshal.c: + glib-genmarshal --prefix=marshal --body marshal.list > $@ + plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR} CFLAGS += ${PLUGIN_CFLAGS} CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${DBUS_GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${BLUEZ_CFLAGS}
--- a/src/bluetooth/marshal.c Thu Sep 18 08:19:49 2008 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,125 +0,0 @@ - -#include <glib-object.h> - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:STRING,UINT,INT (marshal.list:1) */ -void -marshal_VOID__STRING_UINT_INT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_UINT_INT) (gpointer data1, - gpointer arg_1, - guint arg_2, - gint arg_3, - gpointer data2); - register GMarshalFunc_VOID__STRING_UINT_INT callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_UINT_INT) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_uint (param_values + 2), - g_marshal_value_peek_int (param_values + 3), - data2); -} - -/* VOID:STRING,STRING (marshal.list:2) */ -void -marshal_VOID__STRING_STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - data2); -} -
--- a/src/bluetooth/marshal.h Thu Sep 18 08:19:49 2008 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ - -#ifndef __marshal_MARSHAL_H__ -#define __marshal_MARSHAL_H__ - -#include <glib-object.h> - -G_BEGIN_DECLS - -/* VOID:STRING,UINT,INT (marshal.list:1) */ -extern void marshal_VOID__STRING_UINT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:STRING,STRING (marshal.list:2) */ -extern void marshal_VOID__STRING_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __marshal_MARSHAL_H__ */ -
--- a/src/mtp_up/mtp.c Thu Sep 18 08:19:49 2008 +0300 +++ b/src/mtp_up/mtp.c Thu Sep 18 08:19:56 2008 +0300 @@ -192,12 +192,17 @@ g_free(from_path); g_free(tmp); - parent_id = mtp_device->default_music_folder; #if DEBUG g_print("Uploading track '%s'\n",filename); #endif +#ifdef HAVE_LIBMTP_030 + gentrack->parent_id = mtp_device->default_music_folder; + ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL); +#else + parent_id = mtp_device->default_music_folder; ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id); +#endif LIBMTP_destroy_track_t(gentrack); if (ret == 0) g_print("Track upload finished!\n");
--- a/src/scrobbler/scrobbler.c Thu Sep 18 08:19:49 2008 +0300 +++ b/src/scrobbler/scrobbler.c Thu Sep 18 08:19:56 2008 +0300 @@ -604,6 +604,15 @@ return -1; } + if(!strncmp(sc_srv_res, "BADSESSION", 10)) { + pdebug("Invalid session, re-handshaking", DEBUG); + + sc_free_res(); + sc_handshake(); + + return -1; + } + if (!strncmp(sc_srv_res, "FAILED", 6)) { if ((ch = strstr(sc_srv_res, "INTERVAL"))) { sc_submit_interval = strtol(ch + 8, NULL, 10);