diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-09-12 04:13:51 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-09-12 04:13:51 +0000 |
| commit | 1769f2b3b98758579780340bf08e9a20f32754b9 (patch) | |
| tree | cedad7d5477ef594046ff7117c298a69653ed3a8 /src | |
| parent | 47fa6f9b5972d258d8dede9df89b5e512d5f347b (diff) | |
| download | qmmp-1769f2b3b98758579780340bf08e9a20f32754b9.tar.gz qmmp-1769f2b3b98758579780340bf08e9a20f32754b9.tar.bz2 qmmp-1769f2b3b98758579780340bf08e9a20f32754b9.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/Visual/projectm/projectm.pro | 15 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/projectmwidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/projectmwidget.h | 6 |
3 files changed, 18 insertions, 5 deletions
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 |