global config file path

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

12 files changed, 26 insertions, 21 deletions

diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp
index f9827fafa..78d2fc8ad 100644
--- a/src/plugins/Input/cue/cueparser.cpp
+++ b/src/plugins/Input/cue/cueparser.cpp
@@ -38,7 +38,7 @@ CUEParser::CUEParser(const QString &fileName)
     }
     QString album, genre, date, comment;
     QTextStream textStream (&file);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QTextCodec *codec = QTextCodec::codecForName(settings.value("CUE/encoding","ISO-8859-1").toByteArray ());
     textStream.setCodec(codec);
     QString artist;
diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp
index ad6731179..9c80736ed 100644
--- a/src/plugins/Input/cue/settingsdialog.cpp
+++ b/src/plugins/Input/cue/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 #include <QTextCodec>
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "settingsdialog.h"
 
@@ -33,7 +34,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     {
         ui.cueEncComboBox->addItem(codec->name());
     }
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("CUE");
     int pos = ui.cueEncComboBox->findText(settings.value("encoding","ISO-8859-1").toString());
     ui.cueEncComboBox->setCurrentIndex(pos);
@@ -46,7 +47,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::accept()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("CUE");
     settings.setValue("encoding", ui.cueEncComboBox->currentText());
     settings.endGroup();
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index e47187b84..d47ae5a6b 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -51,7 +51,7 @@ extern "C"
 
 bool DecoderFFmpegFactory::supports(const QString &source) const
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QStringList filters;
     filters << "*.wma" << "*.ape";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
@@ -71,7 +71,7 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *) const
 
 const DecoderProperties DecoderFFmpegFactory::properties() const
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QStringList filters;
     filters << "*.wma" << "*.ape";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp
index 58e11b54a..a68c43ad2 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.cpp
+++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp
@@ -19,9 +19,10 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QDir>
 #include <QStringList>
 
+#include <qmmp/qmmp.h>
+
 extern "C"
 {
 #if defined HAVE_FFMPEG_AVFORMAT_H
@@ -49,7 +50,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 {
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QStringList filters;
     filters << "*.wma" << "*.ape";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
@@ -89,7 +90,7 @@ void SettingsDialog::accept()
         filters << "*.tta";
     if (ui.alacCheckBox->isChecked())
         filters << "*.alac";
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("FFMPEG/filters", filters);
     QDialog::accept();
 }
diff --git a/src/plugins/Input/flac/cueparser.cpp b/src/plugins/Input/flac/cueparser.cpp
index 1441a999b..7f3dc9a28 100644
--- a/src/plugins/Input/flac/cueparser.cpp
+++ b/src/plugins/Input/flac/cueparser.cpp
@@ -32,7 +32,7 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName)
 {
     QString album, genre, date, comment;
     QTextStream textStream (array);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QTextCodec *codec = QTextCodec::codecForName(settings.value("CUE/encoding","ISO-8859-1").toByteArray ());
     textStream.setCodec(codec);
     m_filePath = fileName;
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;
diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp
index 6321f56b7..c0e5bc380 100644
--- a/src/plugins/Input/modplug/decoder_modplug.cpp
+++ b/src/plugins/Input/modplug/decoder_modplug.cpp
@@ -334,7 +334,7 @@ void DecoderModPlug::readSettings()
 {
     if (!m_soundFile)
         return;
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     CSoundFile::SetWaveConfig
     (
diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp
index a0cd1bd7a..bc70baed9 100644
--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp
+++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp
@@ -80,7 +80,7 @@ Decoder *DecoderModPlugFactory::create(QObject *parent, QIODevice *input,
 QList<FileInfo *> DecoderModPlugFactory::createPlayList(const QString &fileName, bool useMetaData)
 {
     QList <FileInfo*> list;
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     if (!useMetaData || settings.value("UseFileName", FALSE).toBool())
     {
         list << new FileInfo(fileName);
diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp
index 0bb8c192d..ce1da24a9 100644
--- a/src/plugins/Input/modplug/settingsdialog.cpp
+++ b/src/plugins/Input/modplug/settingsdialog.cpp
@@ -34,7 +34,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     //general
     ui.noiseCheckBox->setChecked(settings.value("NoiseReduction", FALSE).toBool());
@@ -110,7 +110,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::writeSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     //general
     settings.setValue("NoiseReduction", ui.noiseCheckBox->isChecked());