From 90cfa63b4fb1b52ed15027441c6a979a830d8ca3 Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget.fedora@gmail.com>
Date: Tue, 21 Dec 2010 09:29:00 +0000
Subject: Moved user config paths. Please see the ChangeLog.

---
 muse2/synti/deicsonze/deicsonze.cpp    | 2 +-
 muse2/synti/deicsonze/deicsonzegui.cpp | 2 +-
 muse2/synti/simpledrums2/ssplugin.cpp  | 2 +-
 muse2/synti/vam/vamgui.cpp             | 7 ++++---
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'muse2/synti')

diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 049daeed..0168432a 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -166,7 +166,7 @@ DeicsOnze::DeicsOnze() : Mess(2) {
   
   //Load configuration
   QString defaultConf = 
-    (QString(getenv("HOME")) + QString("/." DEICSONZESTR ".dco"));
+    (configPath + QString("/" DEICSONZESTR ".dco"));
   FILE* f;
   f = fopen(defaultConf.toAscii().data(), "r");
   if(f) {
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index 84cf4d22..58fbb903 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -553,7 +553,7 @@ void DeicsOnzeGui::saveConfiguration() {
 // saveDefaultConfiguration
 //-----------------------------------------------------------
 void DeicsOnzeGui::saveDefaultConfiguration() {
-  QString filename = QString(getenv("HOME")) + QString("/." DEICSONZESTR ".dco");
+  QString filename = configPath + QString("/" DEICSONZESTR ".dco");
   if(!filename.isEmpty()) {
     QFile f(filename);
     f.open(QIODevice::WriteOnly);
diff --git a/muse2/synti/simpledrums2/ssplugin.cpp b/muse2/synti/simpledrums2/ssplugin.cpp
index 2d8382e6..9d32b2c3 100644
--- a/muse2/synti/simpledrums2/ssplugin.cpp
+++ b/muse2/synti/simpledrums2/ssplugin.cpp
@@ -97,7 +97,7 @@ void SS_initPlugins()
 
       const char* ladspaPath = getenv("LADSPA_PATH");
       if (ladspaPath == 0)
-            ladspaPath = "/usr/lib/ladspa:/usr/local/lib/ladspa";
+            ladspaPath = "/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa";
 
       const char* p = ladspaPath;
       while (*p != '\0') {
diff --git a/muse2/synti/vam/vamgui.cpp b/muse2/synti/vam/vamgui.cpp
index ab7c3ddb..50b6552c 100644
--- a/muse2/synti/vam/vamgui.cpp
+++ b/muse2/synti/vam/vamgui.cpp
@@ -43,6 +43,7 @@
 #include <QSlider>
 #include <QSocketNotifier>
 
+#include "muse/globals.h"
 #include "muse/xml.h"
 #include "muse/midi.h"
 #include "muse/midictrl.h"
@@ -559,7 +560,7 @@ void VAMGui::loadPresetsPressed()
 {
 #if 1   // TODO
 	QString iname;
-	QString s(getenv("HOME"));
+	QString s(configPath);
 	
 /*      QString filename = QFileDialog::getOpenFileName(lastdir, QString("*.[Ss][Ff]2"),
                                                       this,
@@ -674,7 +675,7 @@ void VAMGui::doSavePresets(const QString& fn, bool showWarning)
 void VAMGui::savePresetsPressed()
 {
 #if 1 // TODO
-	QString s(getenv("MUSE"));
+	QString s(configPath);
 	QString fn = QFileDialog::getSaveFileName(this, tr("MusE: Save VAM Presets"), 
                                                   s, "Presets (*.vam)");
 	if (fn.isEmpty())
@@ -692,7 +693,7 @@ void VAMGui::savePresetsToFilePressed()
 {
 	if (!presetFileName ) {
  
-      QString s(getenv("MUSE"));
+      QString s(configPath);
       QString fn = QFileDialog::getSaveFileName(this, tr("MusE: Save VAM Presets"), 
                                                 s, "Presets (*.vam)");
       presetFileName = new QString(fn);
-- 
cgit v1.2.3