# HG changeset patch
# User yaz
# Date 1181313194 25200
# Node ID 5896bd827cbc23091853f4e35cf39f96ca3c73c0
# Parent  93dee80e9365c6135b001eaab5e551066733d140
[svn] - move transport plugins into Transport subdirectory.

diff -r 93dee80e9365 -r 5896bd827cbc ChangeLog
--- a/ChangeLog	Fri Jun 08 06:27:15 2007 -0700
+++ b/ChangeLog	Fri Jun 08 07:33:14 2007 -0700
@@ -1,3 +1,10 @@
+2007-06-08 13:27:15 +0000  Tomasz Mon <desowin@atheme.org>
+  revision [2538]
+  - fix scrobble from queue
+  trunk/src/scrobbler/scrobbler.c |   44 +++++++++++++++++++++++++++++++++++++---
+  1 file changed, 41 insertions(+), 3 deletions(-)
+
+
 2007-06-08 11:37:56 +0000  Tomasz Mon <desowin@atheme.org>
   revision [2536]
   - keep old passwords if user doesn't change them in configuration
diff -r 93dee80e9365 -r 5896bd827cbc configure.ac
--- a/configure.ac	Fri Jun 08 06:27:15 2007 -0700
+++ b/configure.ac	Fri Jun 08 07:33:14 2007 -0700
@@ -133,7 +133,8 @@
 EFFECT_PLUGINS="audiocompress ladspa voice_removal sndstretch stereo_plugin echo_plugin"
 GENERAL_PLUGINS="song_change alarm"
 VISUALIZATION_PLUGINS="blur_scope spectrum"
-CONTAINER_PLUGINS="m3u pls stdio"
+CONTAINER_PLUGINS="m3u pls"
+TRANSPORT_PLUGINS="stdio"
 
 dnl Check for Audacious
 
@@ -165,6 +166,11 @@
     [AC_MSG_ERROR([Cannot find dbus-glib >= 0.60])]
 ])
 
+PKG_CHECK_MODULES(MOWGLI, [libmowgli >= 0.2.0],
+    [ADD_PC_REQUIRES([libmowgli >= 0.2.0])],
+    [AC_MSG_ERROR([Cannot find libmowgli >= 0.2.0])]
+)
+
 dnl IPv6 support
 dnl ========================
 AC_ARG_ENABLE(ipv6,
@@ -1157,15 +1163,17 @@
 check_hex="070907"
 
 have_curl="no"
+have_lastfm="no"
 PKG_CHECK_MODULES(CURL, [libcurl >= 7.9.7],
 [
-	CONTAINER_PLUGINS="$CONTAINER_PLUGINS curl"
+	TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS curl"
 	have_curl="yes"
 ], [scrobbler="no"])
 
 if test "x$scrobbler" = "xyes"; then
 	GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler"
-	CONTAINER_PLUGINS="$CONTAINER_PLUGINS lastfm"
+	TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS lastfm"
+	have_lastfm="yes"
 fi
 
 AC_SUBST(CURL_CFLAGS)
@@ -1182,7 +1190,7 @@
 
 if test "x$have_mms" = "xyes"; then
     have_mms=yes
-    PKG_CHECK_MODULES(MMS, [libmms >= 0.3], [CONTAINER_PLUGINS="$CONTAINER_PLUGINS mms" ], [have_mms="no"])
+    PKG_CHECK_MODULES(MMS, [libmms >= 0.3], [TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms" ], [have_mms="no"])
 else
     have_mms=no
     AC_MSG_RESULT([*** mms plugin disabled by request ***])
@@ -1347,6 +1355,7 @@
 GENERAL_PLUGIN_DIR=General
 VISUALIZATION_PLUGIN_DIR=Visualization
 CONTAINER_PLUGIN_DIR=Container
+TRANSPORT_PLUGIN_DIR=Transport
 
 AC_SUBST(INPUT_PLUGIN_DIR)
 AC_SUBST(OUTPUT_PLUGIN_DIR)
@@ -1354,6 +1363,7 @@
 AC_SUBST(GENERAL_PLUGIN_DIR)
 AC_SUBST(VISUALIZATION_PLUGIN_DIR)
 AC_SUBST(CONTAINER_PLUGIN_DIR)
+AC_SUBST(TRANSPORT_PLUGIN_DIR)
 AC_SUBST(pluginsubs)
 
 dnl XXX Work around some autoconf bugs.
@@ -1388,6 +1398,7 @@
 AC_SUBST(OUTPUT_PLUGINS)
 AC_SUBST(VISUALIZATION_PLUGINS)
 AC_SUBST(CONTAINER_PLUGINS)
+AC_SUBST(TRANSPORT_PLUGINS)
 AC_SUBST(GCC42_CFLAGS)
 
 AC_CONFIG_FILES([
@@ -1481,6 +1492,7 @@
 echo "  stdio transport:                        yes"
 echo "  curl-based http/https:                  $have_curl"
 echo "  libmms-based mms:                       $have_mms"
+echo "  lastfm transport:                       $have_lastfm"
 echo
 echo "  Container"
 echo "  ---------"
diff -r 93dee80e9365 -r 5896bd827cbc mk/rules.mk.in
--- a/mk/rules.mk.in	Fri Jun 08 06:27:15 2007 -0700
+++ b/mk/rules.mk.in	Fri Jun 08 07:33:14 2007 -0700
@@ -364,3 +364,5 @@
 GCC42_CFLAGS ?= @GCC42_CFLAGS@
 CDIO_LIBS ?= @CDIO_LIBS@
 CDIO_CFLAGS ?= @CDIO_CFLAGS@
+TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
+TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
diff -r 93dee80e9365 -r 5896bd827cbc src/Makefile
--- a/src/Makefile	Fri Jun 08 06:27:15 2007 -0700
+++ b/src/Makefile	Fri Jun 08 07:33:14 2007 -0700
@@ -6,6 +6,7 @@
 	$(EFFECT_PLUGINS) \
 	$(VISUALIZATION_PLUGINS) \
 	$(GENERAL_PLUGINS) \
-	$(CONTAINER_PLUGINS)
+	$(CONTAINER_PLUGINS) \
+	$(TRANSPORT_PLUGINS)
 
 include ../mk/objective.mk
diff -r 93dee80e9365 -r 5896bd827cbc src/curl/Makefile
--- a/src/curl/Makefile	Fri Jun 08 06:27:15 2007 -0700
+++ b/src/curl/Makefile	Fri Jun 08 07:33:14 2007 -0700
@@ -5,7 +5,7 @@
 
 OBJECTIVE_LIBS = libcurl$(SHARED_SUFFIX)
 
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
 
 LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS)
 
diff -r 93dee80e9365 -r 5896bd827cbc src/lastfm/Makefile
--- a/src/lastfm/Makefile	Fri Jun 08 06:27:15 2007 -0700
+++ b/src/lastfm/Makefile	Fri Jun 08 07:33:14 2007 -0700
@@ -5,7 +5,7 @@
 
 OBJECTIVE_LIBS = liblastfm$(SHARED_SUFFIX)
 
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
 
 LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS)
 
diff -r 93dee80e9365 -r 5896bd827cbc src/mms/Makefile
--- a/src/mms/Makefile	Fri Jun 08 06:27:15 2007 -0700
+++ b/src/mms/Makefile	Fri Jun 08 07:33:14 2007 -0700
@@ -3,8 +3,7 @@
 
 OBJECTIVE_LIBS = libmms$(SHARED_SUFFIX)
 
-# XXX
-LIBDIR = $(plugindir)/$(CONTAINER_PLUGIN_DIR)
+LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
 
 SOURCES = mms.c
 
diff -r 93dee80e9365 -r 5896bd827cbc src/stdio/Makefile
--- a/src/stdio/Makefile	Fri Jun 08 06:27:15 2007 -0700
+++ b/src/stdio/Makefile	Fri Jun 08 07:33:14 2007 -0700
@@ -3,8 +3,7 @@
 
 OBJECTIVE_LIBS = libstdio$(SHARED_SUFFIX)
 
-# XXX
-LIBDIR = $(plugindir)/$(CONTAINER_PLUGIN_DIR)
+LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
 
 SOURCES = stdio.c