# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1206970374 -10800
# Node ID 4669aafd8dd196a12d34a238518be1b5ef4b6b97
# Parent  7b284f323ad87f10c84f5109172a2ab6e54328ee# Parent  862477de235bd4311e5a3ea1e36faf36dbfcb8c8
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 7b284f323ad8 -r 4669aafd8dd1 configure.ac
--- a/configure.ac	Mon Mar 31 16:03:22 2008 +0300
+++ b/configure.ac	Mon Mar 31 16:32:54 2008 +0300
@@ -1448,9 +1448,9 @@
 	PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 1.2.0], [have_projectm1="yes"], [have_projectm1="no"])
 fi
 
-if test "x$have_projectm1" = "xyes"; then
-	PKG_CHECK_MODULES(LIBPROJECTM1, [libprojectM < 1.1], [have_projectm1="yes"], [have_projectm1="no"])
-	if test "x$libprjM" = "xno"; then
+if test "$have_projectm1" = "yes"; then
+	PKG_CHECK_MODULES(LIBPROJECTM1, [libprojectM >= 1.1], [have_projectm1="yes"], [have_projectm1="no"])
+	if test x$libprjM = xno; then
 	        AC_MSG_WARN([*** libprojectM not found.
 	                        libprojectM is needed to build this package.
 	                        You can download libprojectM at http://projectm.sf.net/])
diff -r 7b284f323ad8 -r 4669aafd8dd1 src/projectm-1.0/gtk_projectm_impl.cxx
--- a/src/projectm-1.0/gtk_projectm_impl.cxx	Mon Mar 31 16:03:22 2008 +0300
+++ b/src/projectm-1.0/gtk_projectm_impl.cxx	Mon Mar 31 16:32:54 2008 +0300
@@ -86,7 +86,7 @@
     g_return_if_fail(priv != NULL);
     g_return_if_fail(priv->pm != NULL);
 
-    priv->pm->pcm->addPCM16(pcm_data);
+    priv->pm->pcm()->addPCM16(pcm_data);
 }
 
 extern "C" void