changeset 2967:165ccb8de035

audlegacy-plugins begins.

--- a/configure.ac	Fri Oct 17 16:48:31 2008 -0500
+++ b/configure.ac	Mon Nov 24 21:42:16 2008 +0900
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([audacious-plugins], [1.9.0], [[e-mail]])
+AC_INIT([audlegacy-plugins], [1.9.0], [[e-mail]])
 AC_PREREQ([2.59])
 
 AC_CANONICAL_HOST
@@ -133,9 +133,9 @@
 
 dnl Check for Audacious
 
-PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 1.9.0],
-    [ADD_PC_REQUIRES([audacious >= 1.9.0])],
-    [AC_MSG_ERROR([Cannot find Audacious 1.9.0 or later, have you installed audacious yet?])]
+PKG_CHECK_MODULES(AUDLEGACY, [audlegacy >= 1.9.0],
+    [ADD_PC_REQUIRES([audlegacy >= 1.9.0])],
+    [AC_MSG_ERROR([Cannot find Audlegacy 1.9.0 or later, have you installed audlegacy yet?])]
 )
 
 dnl Check for GTK/GLib/GThread/Pango/DBus
@@ -201,7 +201,7 @@
 
 BUILDSYS_SHARED_LIB
 BUILDSYS_PROG_IMPLIB
-test "x$PROG_IMPLIB_NEEDED" = "xyes" && LIBS="$LIBS -L\${libdir} -laudacious.exe"
+test "x$PROG_IMPLIB_NEEDED" = "xyes" && LIBS="$LIBS -L\${libdir} -laudlegacy.exe"
 
 dnl Ok, first we find out what flags we need to use.
 AC_MSG_CHECKING([for what extension and flags to use for plugin compilation])
@@ -407,7 +407,7 @@
 if test "x$enable_mp3" = "xyes"; then
   AC_MSG_CHECKING(mad.h suitability)
   ac_save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $MAD_CFLAGS $AUDACIOUS_CFLAGS"
+  CFLAGS="$CFLAGS $MAD_CFLAGS $AUDLEGACY_CFLAGS"
   AC_TRY_RUN(
       [
           #include <mad.h>
@@ -1265,8 +1265,8 @@
 AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes")
 AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes")
 
-CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
-CXXFLAGS="$CXXFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
+CFLAGS="$CFLAGS $AUDLEGACY_CFLAGS $DBUS_CFLAGS"
+CXXFLAGS="$CXXFLAGS $AUDLEGACY_CFLAGS $DBUS_CFLAGS"
 
 AC_MSG_CHECKING(if __ELF__ is defined)
 AC_EGREP_CPP(yes,
@@ -1612,7 +1612,7 @@
 AM_CONDITIONAL(HAVE_SOLARIS, test "x$have_solaris" = xyes)
 AM_CONDITIONAL(HAVE_SUN, test "x$have_sun" = xyes)
 
-plugindir=`pkg-config audacious --variable=plugin_dir`
+plugindir=`pkg-config audlegacy --variable=plugin_dir`
 AC_SUBST(plugindir)
 
 dnl XXX
@@ -1653,7 +1653,7 @@
     AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
 fi
 
-AC_DEFINE(BMP_RCPATH, ".audacious", [Config dir to use])
+AC_DEFINE(BMP_RCPATH, ".audlegacy", [Config dir to use])
 
 AC_SUBST(BEEP_DEFINES)
 

--- a/src/skins/ui_main_evlisteners.c	Fri Oct 17 16:48:31 2008 -0500
+++ b/src/skins/ui_main_evlisteners.c	Mon Nov 24 21:42:16 2008 +0900
@@ -17,6 +17,8 @@
  * The Audacious team does not consider modular code linking to
  * Audacious or using our public API to be a derived work.
  */
+#define UPDATEVIS 1
+
 #if 0
 #include "ui_playlist_evlisteners.h"
 #endif
@@ -61,8 +63,8 @@
 {
     if (!audacious_drct_get_playing())
         return FALSE;
-#if 0
-    input_update_vis(audacious_drct_get_time());
+#if UPDATEVIS
+    aud_input_update_vis(audacious_drct_get_time());
 #endif
     return TRUE;
 }
@@ -133,8 +135,8 @@
 
     update_vis_timeout_source =
         g_timeout_add(10, (GSourceFunc) update_vis_func, NULL);
-#if 0
-    vis_playback_start();
+#if UPDATEVIS
+    aud_vis_playback_start();
 #endif
     ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
 }
@@ -144,9 +146,9 @@
 {
     if (song_info_timeout_source)
         g_source_remove(song_info_timeout_source);
-#if 0
-    vis_playback_stop();
-    free_vis_data();
+#if UPDATEVIS
+    aud_vis_playback_stop();
+    aud_free_vis_data();
 #endif
     ui_skinned_playstatus_set_buffering(mainwin_playstatus, FALSE);
 }
@@ -166,8 +168,8 @@
 static void
 ui_main_evlistener_playback_seek(gpointer hook_data, gpointer user_data)
 {
-#if 0
-    free_vis_data();
+#if UPDATEVIS
+    aud_free_vis_data();
 #endif
 }
 

--- a/src/skins/ui_playlist.c	Fri Oct 17 16:48:31 2008 -0500
+++ b/src/skins/ui_playlist.c	Mon Nov 24 21:42:16 2008 +0900
@@ -23,7 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-/* #define AUD_DEBUG 1 */
+#define AUD_DEBUG 1
+#define CONDSCAN 1
 
 #include "ui_playlist.h"
 
@@ -59,6 +60,8 @@
 #include "icons-stock.h"
 #include "images/audacious_playlist.xpm"
 
+#include <audacious/main.h>
+
 GtkWidget *playlistwin;
 
 static GMutex *resize_mutex = NULL;
@@ -86,6 +89,10 @@
 static gboolean playlistwin_resizing = FALSE;
 static gint playlistwin_resize_x, playlistwin_resize_y;
 
+/* #if CONDSCAN */
+/* extern GCond *cond_scan; */
+/* #endif */
+
 gboolean
 playlistwin_is_shaded(void)
 {
@@ -250,8 +257,11 @@
 {
     if (UI_SKINNED_IS_PLAYLIST(playlistwin_list))
         UI_SKINNED_PLAYLIST(playlistwin_list)->first = toprow;
-#if 0
-    g_cond_signal(cond_scan);
+#if CONDSCAN
+    GCond *cond_scan = aud_get_cond_scan();
+    AUDDBG("cond_scan = %p\n", cond_scan);
+    if(cond_scan)
+        g_cond_signal(cond_scan);
 #endif
     playlistwin_update_list(aud_playlist_get_active());
 }
@@ -958,8 +968,11 @@
 
     if (event->direction == GDK_SCROLL_UP)
         playlistwin_scroll(-config.scroll_pl_by);
-#if 0
-    g_cond_signal(cond_scan);
+#if CONDSCAN
+    GCond *cond_scan = aud_get_cond_scan();
+    AUDDBG("cond_scan = %p\n", cond_scan);
+    if(cond_scan)
+        g_cond_signal(cond_scan);
 #endif
 }
 
@@ -1239,9 +1252,12 @@
     default:
         return FALSE;
     }
-#if 0
+#if CONDSCAN
     if (refresh) {
-        g_cond_signal(cond_scan);
+        GCond *cond_scan = aud_get_cond_scan();
+        AUDDBG("cond_scan = %p\n", cond_scan);
+        if(cond_scan)
+            g_cond_signal(cond_scan);
         playlistwin_update_list(aud_playlist_get_active());
     }
 #endif