Mercurial > audlegacy-plugins
changeset 364:50347c06ec68 trunk
[svn] - make scrobbler behave better
- put xspf check back in configure.ac (oops)
| author | nenolod |
|---|---|
| date | Mon, 11 Dec 2006 06:07:12 -0800 |
| parents | 958855dae693 |
| children | b6916d136a12 |
| files | ChangeLog configure.ac src/scrobbler/configure.c src/scrobbler/plugin.c |
| diffstat | 4 files changed, 28 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 11 05:19:44 2006 -0800 +++ b/ChangeLog Mon Dec 11 06:07:12 2006 -0800 @@ -1,3 +1,13 @@ +2006-12-11 13:19:44 +0000 William Pitcock <nenolod@nenolod.net> + revision [794] + - fix other plugins dependant on the playlist framework + + trunk/src/console/Audacious_Driver.cxx | 2 +- + trunk/src/cue/cuesheet.c | 18 +++++++++++------- + trunk/src/scrobbler/plugin.c | 2 +- + 3 files changed, 13 insertions(+), 9 deletions(-) + + 2006-12-11 13:15:01 +0000 William Pitcock <nenolod@nenolod.net> revision [792] - nevermind, m3u did need an update.
--- a/configure.ac Mon Dec 11 05:19:44 2006 -0800 +++ b/configure.ac Mon Dec 11 06:07:12 2006 -0800 @@ -966,6 +966,10 @@ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS paranormal" fi +if test "$have_xspf" = "yes"; then + CONTAINER_PLUGINS="$CONTAINER_PLUGINS xspf" +fi + dnl *** ProjectM (GL Milkdrop port) AC_ARG_ENABLE(projectm,
--- a/src/scrobbler/configure.c Mon Dec 11 05:19:44 2006 -0800 +++ b/src/scrobbler/configure.c Mon Dec 11 06:07:12 2006 -0800 @@ -267,6 +267,7 @@ if (username) { gtk_entry_set_text(GTK_ENTRY(ge_entry1), username); g_free(username); + username = NULL; } // hatena bmp_cfg_db_get_string(db, "audioscrobbler", "ha_username", @@ -274,6 +275,7 @@ if (username) { gtk_entry_set_text(GTK_ENTRY(ha_entry1), username); g_free(username); + username = NULL; } bmp_cfg_db_close(db); }
--- a/src/scrobbler/plugin.c Mon Dec 11 05:19:44 2006 -0800 +++ b/src/scrobbler/plugin.c Mon Dec 11 06:07:12 2006 -0800 @@ -101,10 +101,12 @@ sc_going = 0; } else + { sc_init(username, password); - g_free(username); - g_free(password); + g_free(username); + g_free(password); + } if ((!ge_username || !ge_password) || (!*ge_username || !*ge_password)) { @@ -113,10 +115,12 @@ ge_going = 0; } else + { gerpok_sc_init(ge_username, ge_password); - g_free(ge_username); - g_free(ge_password); + g_free(ge_username); + g_free(ge_password); + } if ((!ha_username || !ha_password) || (!*ha_username || !*ha_password)) { @@ -125,10 +129,12 @@ ha_going = 0; } else + { hatena_sc_init(ha_username, ha_password); - g_free(ha_username); - g_free(ha_password); + g_free(ha_username); + g_free(ha_password); + } m_scrobbler = g_mutex_new(); hs_mutex = g_mutex_new();