From 1769f2b3b98758579780340bf08e9a20f32754b9 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 12 Sep 2013 04:13:51 +0000
Subject: projectM: added config.inp autosearch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3707 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Visual/projectm/projectm.pro       | 15 +++++++++++++++
 src/plugins/Visual/projectm/projectmwidget.cpp |  2 +-
 src/plugins/Visual/projectm/projectmwidget.h   |  6 ++----
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro
index a9e1a0eeb..1da0c7999 100644
--- a/src/plugins/Visual/projectm/projectm.pro
+++ b/src/plugins/Visual/projectm/projectm.pro
@@ -44,3 +44,18 @@ isEmpty(LIB_DIR){
 }
 target.path = $$LIB_DIR/qmmp/Visual
 INSTALLS += target
+
+#projectM config path
+exists("/usr/share/projectM/config.inp") {
+
+}
+
+PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
+                        /usr/local/share/projectM/config.inp
+
+for(path, PROJECTM_CONFIG_FILES) {
+  exists($$path) {
+     message ("found projectm configuration: "$$path)
+     DEFINES += PROJECTM_CONFIG_FILE=\\\"$$path\\\"
+  }
+}
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
index 47dddf848..7de1ca867 100644
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2013 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   Copyright (C) 2007 by  projectM team                                  *
diff --git a/src/plugins/Visual/projectm/projectmwidget.h b/src/plugins/Visual/projectm/projectmwidget.h
index 30baaf0fb..61d77df3c 100644
--- a/src/plugins/Visual/projectm/projectmwidget.h
+++ b/src/plugins/Visual/projectm/projectmwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2013 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -58,11 +58,9 @@ private slots:
     void updateTitle();
 
 private:
+    void createActions();
     projectM *m_projectM;
     QMenu *m_menu;
-    void createActions();
-
-
 };
 
 #endif
-- 
cgit v1.2.3-13-gbd6f