From 6db4985b556f847f5cde128e7e6114c761f01018 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Fri, 4 Dec 2009 17:41:23 +0000
Subject: added projectM 2.0 support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1417 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Visual/projectm/CMakeLists.txt     | 7 +++++++
 src/plugins/Visual/projectm/projectm.pro       | 2 ++
 src/plugins/Visual/projectm/projectmwidget.cpp | 9 +++++++++
 3 files changed, 18 insertions(+)

diff --git a/src/plugins/Visual/projectm/CMakeLists.txt b/src/plugins/Visual/projectm/CMakeLists.txt
index 398068cde..118802dc7 100644
--- a/src/plugins/Visual/projectm/CMakeLists.txt
+++ b/src/plugins/Visual/projectm/CMakeLists.txt
@@ -30,7 +30,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # projectM
+pkg_search_module(PROJECTM libprojectM>=2.0.0)
+
+IF(PROJECTM_FOUND)
+ADD_DEFINITIONS(-DPROJECTM_20)
+ELSE(PROJECTM_FOUND)
 pkg_search_module(PROJECTM libprojectM)
+ENDIF(PROJECTM_FOUND)
+
 
 SET(libprojectm_SRCS
     projectmwidget.cpp
diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro
index 1214f5bf5..5adc8fff2 100644
--- a/src/plugins/Visual/projectm/projectm.pro
+++ b/src/plugins/Visual/projectm/projectm.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+#DEFINES += PROJECTM_20
+
 TARGET =$$PLUGINS_PREFIX/Visual/projectm
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Visual/libprojectm.so
 
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
index 05e07f6f6..ed2b93e19 100644
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -90,9 +90,18 @@ void ProjectMWidget::initializeGL()
         QStringList filters;
         filters << "*.prjm" << "*.milk";
         QFileInfoList l = presetDir.entryInfoList(filters);
+#ifdef PROJECTM_20
+        RatingList list;
+        list.push_back(3);
+        list.push_back(3);
+#endif
         foreach (QFileInfo info, l)
         {
+#if PROJECTM_20
+            m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), list);
+#else
             m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), 1);
+#endif
         }
         createActions();
         updateTitle();
-- 
cgit v1.2.3-13-gbd6f