global config file path

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@702 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 10 insertions, 7 deletions

diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index 9ede2f1d8..fa3f1d12b 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -108,7 +108,7 @@ QList<FileInfo *> DecoderMADFactory::createPlayList(const QString &fileName, boo
 
     if (useMetaData)
     {
-        QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+        QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
         settings.beginGroup("MAD");
 
         QTextCodec *codec = 0;
diff --git a/src/plugins/Input/mad/detailsdialog.cpp b/src/plugins/Input/mad/detailsdialog.cpp
index c2e55e5cb..885ff6e5e 100644
--- a/src/plugins/Input/mad/detailsdialog.cpp
+++ b/src/plugins/Input/mad/detailsdialog.cpp
@@ -33,6 +33,8 @@
 #include <taglib/mpegheader.h>
 #include <taglib/mpegproperties.h>
 
+#include <qmmp/qmmp.h>
+
 #include "detailsdialog.h"
 
 DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
@@ -47,7 +49,7 @@ DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
     if (!QFile::exists(m_path))
         return;
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     m_codec_v1 =
         QTextCodec::codecForName(settings.value("ID3v1_encoding", "ISO-8859-1" )
@@ -294,7 +296,7 @@ uint DetailsDialog::selectedTag()
 
 void DetailsDialog::closeEvent (QCloseEvent *)
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     if (ui.id3v1RadioButton->isChecked())
         settings.setValue("current_tag","ID3v1");
diff --git a/src/plugins/Input/mad/settingsdialog.cpp b/src/plugins/Input/mad/settingsdialog.cpp
index 8f1746b95..45c2e8536 100644
--- a/src/plugins/Input/mad/settingsdialog.cpp
+++ b/src/plugins/Input/mad/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 #include <QTextCodec>
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "settingsdialog.h"
 
@@ -34,7 +35,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         ui.id3v1EncComboBox->addItem(codec->name());
         ui.id3v2EncComboBox->addItem(codec->name());
     }
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     int pos = ui.id3v1EncComboBox->findText
         (settings.value("ID3v1_encoding","ISO-8859-1").toString());
@@ -57,7 +58,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::writeSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     settings.setValue("ID3v1_encoding", ui.id3v1EncComboBox->currentText());
     settings.setValue("ID3v2_encoding", ui.id3v2EncComboBox->currentText());
diff --git a/src/plugins/Input/mad/tagextractor.cpp b/src/plugins/Input/mad/tagextractor.cpp
index 1385c8a85..fe8f59788 100644
--- a/src/plugins/Input/mad/tagextractor.cpp
+++ b/src/plugins/Input/mad/tagextractor.cpp
@@ -55,7 +55,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag()
     TagLib::String genre = taglib_tag.genre();
     TagLib::String title = taglib_tag.title();
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     QByteArray name = settings.value("ID3v2_encoding","UTF-8").toByteArray ();
     bool utf = FALSE;