diff options
52 files changed, 139 insertions, 117 deletions
diff --git a/src/plugins/Effect/srconverter/settingsdialog.cpp b/src/plugins/Effect/srconverter/settingsdialog.cpp index 349feab03..c335a576d 100644 --- a/src/plugins/Effect/srconverter/settingsdialog.cpp +++ b/src/plugins/Effect/srconverter/settingsdialog.cpp @@ -19,7 +19,8 @@ ***************************************************************************/ #include <QSettings> -#include <QDir> + +#include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -28,7 +29,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) { ui.setupUi(this); setAttribute(Qt::WA_DeleteOnClose, TRUE); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); ui.srSpinBox->setValue(settings.value("SRC/sample_rate",48000).toInt()); ui.engineComboBox->setCurrentIndex(settings.value("SRC/engine", 0).toInt()); } @@ -40,7 +41,7 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::accept() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("SRC/sample_rate",ui.srSpinBox->value()); settings.setValue("SRC/engine", ui.engineComboBox->currentIndex()); QDialog::accept(); diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp index b8f729da9..f6523ccd8 100644 --- a/src/plugins/Effect/srconverter/srconverter.cpp +++ b/src/plugins/Effect/srconverter/srconverter.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include <QSettings> -#include <QDir> #include <math.h> #include <stdlib.h> +#include <qmmp/qmmp.h> #include "srconverter.h" @@ -34,7 +34,7 @@ SRConverter::SRConverter(QObject* parent) : Effect(parent) m_srcOut = 0; m_src_state = 0; m_srcError = 0; - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_overSamplingFs = settings.value("SRC/sample_rate",48000).toInt(); m_converter_type = converter_type_array[settings.value("SRC/engine", 0).toInt()]; } diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp index fda997f85..e424c9387 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp @@ -21,13 +21,14 @@ #include "qmmpfiledialogimpl.h" #include <QDirModel> -#include <QDir> #include <QApplication> #include <QFileInfo> #include <QStyle> #include <QSettings> #include <QMessageBox> +#include <qmmp/qmmp.h> + #define HISTORY_SIZE 8 @@ -82,7 +83,7 @@ QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QD SLOT(updateSelection ())); PathCompleter* completer = new PathCompleter (m_model, fileListView, this); fileNameLineEdit->setCompleter (completer); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); closeOnAddToolButton->setChecked(settings.value("QMMPFileDialog/close_on_add", FALSE).toBool()); restoreGeometry(settings.value("QMMPFileDialog/geometry").toByteArray()); m_history = settings.value("QMMPFileDialog/history").toStringList(); @@ -315,7 +316,7 @@ void QmmpFileDialogImpl::on_fileTypeComboBox_activated(int index) void QmmpFileDialogImpl::hideEvent (QHideEvent *event) { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("QMMPFileDialog/close_on_add", closeOnAddToolButton->isChecked()); settings.setValue("QMMPFileDialog/geometry", saveGeometry()); settings.setValue("QMMPFileDialog/history", m_history); diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index 2d4f0e951..1340c0d5a 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -32,7 +32,7 @@ Notifier::Notifier(QObject *parent) { m_popupWidget = 0; QFile::remove(QDir::homePath()+"/.psi/tune"); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Notifier"); m_desktop = settings.value("desktop_notification", TRUE).toBool(); m_psi = settings.value("psi_notification", FALSE).toBool(); diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index 8e640abdf..98c4e3462 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -68,7 +68,7 @@ PopupWidget::PopupWidget(QWidget *parent) hlayout->addLayout (vlayout); setLayout(hlayout); resize(sizeHint()); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Notifier"); int delay = settings.value("message_delay", 2000).toInt(); uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt(); diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp index 297fae316..d7f2e2660 100644 --- a/src/plugins/General/notifier/settingsdialog.cpp +++ b/src/plugins/General/notifier/settingsdialog.cpp @@ -19,7 +19,8 @@ ***************************************************************************/ #include <QSettings> -#include <QDir> + +#include <qmmp/qmmp.h> #include "popupwidget.h" #include "settingsdialog.h" @@ -39,7 +40,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) m_buttons.insert(PopupWidget::LEFT, ui.leftButton); m_buttons.insert(PopupWidget::CENTER, ui.centerButton); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Notifier"); ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt(); @@ -55,7 +56,7 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::accept() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Notifier"); settings.setValue ("message_delay", ui.messageDelaySpinBox->value()); uint pos = PopupWidget::BOTTOMLEFT; diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index 1c3118659..1d034dfe0 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -19,7 +19,8 @@ ***************************************************************************/ #include <QSettings> -#include <QDir> + +#include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -27,7 +28,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Tray"); ui.messageCheckBox->setChecked(settings.value("show_message",TRUE).toBool()); ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); @@ -41,7 +42,7 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::accept() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Tray"); settings.setValue ("show_message", ui.messageCheckBox->isChecked()); settings.setValue ("message_delay", ui.messageDelaySpinBox->value()); diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index 8e4f05b51..9c6453acb 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -51,7 +51,7 @@ StatusIcon::StatusIcon(QObject *parent) menu->addAction(tr("Exit"), this, SLOT(exit())); m_tray->setContextMenu(menu); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Tray"); m_showMessage = settings.value("show_message",TRUE).toBool(); m_messageDelay = settings.value("message_delay", 2000).toInt(); 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()); diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 0a73431f6..5974efa06 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -40,7 +40,7 @@ OutputALSA::OutputALSA(QObject * parent) : Output(parent), m_inited(FALSE) { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString dev_name = settings.value("ALSA/device","default").toString(); m_use_mmap = settings.value("ALSA/use_mmap", FALSE).toBool(); pcm_name = strdup(dev_name.toAscii().data()); @@ -64,7 +64,7 @@ void OutputALSA::configure(quint32 freq, int chan, int prec) uint exact_rate = freq; /* Sample rate returned by */ /* load settings from config */ - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("ALSA"); uint buffer_time = settings.value("buffer_time",500).toUInt()*1000; uint period_time = settings.value("period_time",100).toUInt()*1000; @@ -360,7 +360,7 @@ VolumeControlALSA::VolumeControlALSA(QObject *parent) : VolumeControl(parent) { //alsa mixer mixer = 0; - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString card = settings.value("ALSA/mixer_card","hw:0").toString(); QString dev = settings.value("ALSA/mixer_device", "PCM").toString(); setupMixer(card, dev); diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp index 2062c6584..f4025a9dc 100644 --- a/src/plugins/Output/alsa/settingsdialog.cpp +++ b/src/plugins/Output/alsa/settingsdialog.cpp @@ -18,7 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include <QSettings> -#include <QDir> + +#include <qmmp/qmmp.h> extern "C" { @@ -36,7 +37,7 @@ SettingsDialog::SettingsDialog ( QWidget *parent ) getCards(); connect (ui.deviceComboBox, SIGNAL(activated(int)),SLOT(setText(int))); connect(ui.mixerCardComboBox, SIGNAL(activated(int)), SLOT(showMixerDevices(int))); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("ALSA"); ui.deviceComboBox->setEditText(settings.value("device","default").toString()); ui.bufferSpinBox->setValue(settings.value("buffer_time",500).toInt()); @@ -181,7 +182,7 @@ void SettingsDialog::setText(int n) void SettingsDialog::accept() { qDebug("SettingsDialog (ALSA):: writeSettings()"); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("ALSA"); settings.setValue("device", ui.deviceComboBox->currentText ()); settings.setValue("buffer_time",ui.bufferSpinBox->value()); diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp index 90c3c9ac6..28746d1d9 100644 --- a/src/plugins/Visual/analyzer/analyzer.cpp +++ b/src/plugins/Visual/analyzer/analyzer.cpp @@ -37,7 +37,7 @@ Analyzer::Analyzer (QWidget *parent) : Visual (parent), m_fps ( 20 ) { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); restoreGeometry(settings.value("Analyzer/geometry").toByteArray()); setFixedSize(2*300-30,105); m_pixmap = QPixmap (75,20); @@ -178,7 +178,7 @@ void Analyzer::showEvent (QShowEvent *) void Analyzer::closeEvent (QCloseEvent *event) { //save geometry - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Analyzer/geometry", saveGeometry()); Visual::closeEvent(event); //removes visualization before class deleting } diff --git a/src/plugins/Visual/analyzer/settingsdialog.cpp b/src/plugins/Visual/analyzer/settingsdialog.cpp index 479e1f299..8ad1ec603 100644 --- a/src/plugins/Visual/analyzer/settingsdialog.cpp +++ b/src/plugins/Visual/analyzer/settingsdialog.cpp @@ -19,7 +19,8 @@ ***************************************************************************/ #include <QSettings> -#include <QDir> + +#include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -27,7 +28,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); ui.analyzerComboBox->setCurrentIndex(settings.value("Analyzer/analyzer_falloff", 3).toInt()-1); ui.peaksCheckBox->setChecked(settings.value("Analyzer/show_peaks", TRUE).toBool()); ui.peaksComboBox->setCurrentIndex(settings.value("Analyzer/peaks_falloff", 3).toInt()-1); @@ -46,7 +47,7 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::accept() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Analyzer/analyzer_falloff", ui.analyzerComboBox->currentIndex() + 1); settings.setValue("Analyzer/peaks_falloff", ui.peaksComboBox->currentIndex() + 1); settings.setValue("Analyzer/refresh_rate", ui.fpsComboBox->currentIndex() + 1); diff --git a/src/qmmp/constants.h b/src/qmmp/constants.h index ed99fb28e..494e75f47 100644 --- a/src/qmmp/constants.h +++ b/src/qmmp/constants.h @@ -1,14 +1,6 @@ #ifndef CONSTANTS_H #define CONSTANTS_H -#ifndef QMMP_STR_VERSION -#define QMMP_STR_VERSION "0.2.0" -#endif - -#ifndef QMMP_VERSION -#define QMMP_VERSION 0.2.0 -#endif - #ifndef LIB_DIR #define LIB_DIR "/lib" #endif diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp index e9aa42b27..82afe31c1 100644 --- a/src/qmmp/decoder.cpp +++ b/src/qmmp/decoder.cpp @@ -192,7 +192,7 @@ QStringList Decoder::m_files; void Decoder::checkFactories() { - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); if (!m_factories) { @@ -374,7 +374,7 @@ void Decoder::setEnabled(DecoderFactory* factory, bool enable) return; QString name = factory->properties().shortName; - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList disabledList = settings.value("Decoder/disabled_plugins").toStringList(); if (enable) @@ -393,7 +393,7 @@ bool Decoder::isEnabled(DecoderFactory* factory) if (!m_factories->contains(factory)) return FALSE; QString name = factory->properties().shortName; - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList disabledList = settings.value("Decoder/disabled_plugins").toStringList(); return !disabledList.contains(name); } diff --git a/src/qmmp/downloader.cpp b/src/qmmp/downloader.cpp index 88d3fe1b3..29a907b84 100644 --- a/src/qmmp/downloader.cpp +++ b/src/qmmp/downloader.cpp @@ -217,7 +217,7 @@ void Downloader::run() qDebug("Downloader: starting download thread"); m_handle = curl_easy_init(); //proxy - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); if (settings.value ("Proxy/use_proxy", FALSE).toBool()) curl_easy_setopt(m_handle, CURLOPT_PROXY, strdup((settings.value("Proxy/host").toString()+":"+ diff --git a/src/qmmp/effect.cpp b/src/qmmp/effect.cpp index 28814d434..7d0b15ded 100644 --- a/src/qmmp/effect.cpp +++ b/src/qmmp/effect.cpp @@ -22,6 +22,7 @@ #include <QDir> #include <QApplication> +#include "qmmp.h" #include "effectfactory.h" #include "constants.h" #include "effect.h" @@ -123,7 +124,7 @@ void Effect::setEnabled(EffectFactory* factory, bool enable) return; QString name = factory->properties().shortName; - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QStringList effList = settings.value("Effect/enabled_plugins").toStringList(); if(enable) @@ -142,7 +143,7 @@ bool Effect::isEnabled(EffectFactory* factory) if(!factories->contains(factory)) return FALSE; QString name = factory->properties().shortName; - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList effList = settings.value("Effect/enabled_plugins").toStringList(); return effList.contains(name); } diff --git a/src/qmmp/output.cpp b/src/qmmp/output.cpp index f063a509d..860e8b823 100644 --- a/src/qmmp/output.cpp +++ b/src/qmmp/output.cpp @@ -300,14 +300,14 @@ void Output::setCurrentFactory(OutputFactory* factory) checkFactories(); if (!m_factories->contains(factory)) return; - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.setValue ("Output/current_plugin", factory->properties().shortName); } OutputFactory *Output::currentFactory() { checkFactories(); - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); #ifdef Q_OS_LINUX QString name = settings.value("Output/current_plugin", "alsa").toString(); #else diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index 1dca9c96b..9b018eee1 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -17,7 +17,13 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "qmmp.h" +#include <QDir> + +#include "qmmp.h" +QString Qmmp::configFile() +{ + return QDir::homePath() +"/.qmmp/qmmprc"; +} diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h index dfa704a6d..cf1ca6073 100644 --- a/src/qmmp/qmmp.h +++ b/src/qmmp/qmmp.h @@ -20,6 +20,15 @@ #ifndef QMMP_H #define QMMP_H +#define QMMP_MAJOR_VERSION 0 +#define QMMP_MINOR_VERSION 3 +#define QMMP_PATCH_VERSION 0 + +#define QMMP_VERSION_INT 0x000300 +#define QMMP_VERSION_STR "0.3.0" +#define QMMP_VERSION 0.3.0 + + /** @author Ilya Kotov <forkotov02@hotmail.ru> */ @@ -28,6 +37,7 @@ class Qmmp public: enum State {Playing = 0, Paused, Stopped, Buffering, NormalError, FatalError}; enum MetaData {TITLE = 0, ARTIST, ALBUM, COMMENT, GENRE, YEAR, TRACK, URL}; + static QString configFile(); }; diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp index 1b4378334..c8874e1d9 100644 --- a/src/qmmp/visual.cpp +++ b/src/qmmp/visual.cpp @@ -98,7 +98,7 @@ void Visual::setEnabled(VisualFactory* factory, bool enable) return; QString name = factory->properties().shortName; - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList visList = settings.value("Visualization/enabled_plugins").toStringList(); if (enable) @@ -135,7 +135,7 @@ bool Visual::isEnabled(VisualFactory* factory) if (!m_factories->contains(factory)) return FALSE; QString name = factory->properties().shortName; - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList visList = settings.value("Visualization/enabled_plugins").toStringList(); return visList.contains(name); } diff --git a/src/qmmp/volumecontrol.cpp b/src/qmmp/volumecontrol.cpp index 2dd22562d..c15028c2d 100644 --- a/src/qmmp/volumecontrol.cpp +++ b/src/qmmp/volumecontrol.cpp @@ -39,7 +39,7 @@ VolumeControl::~VolumeControl() VolumeControl *VolumeControl::create(QObject *parent) { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if (settings.value("Volume/software_volume", FALSE).toBool()) return new SoftwareVolume(parent); VolumeControl *control = Output::currentFactory()->createVolumeControl(parent); @@ -82,7 +82,7 @@ SoftwareVolume *SoftwareVolume::m_instance = 0; SoftwareVolume::SoftwareVolume(QObject *parent) : VolumeControl(parent) { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_left = settings.value("Volume/left", 80).toInt(); m_right = settings.value("Volume/right", 80).toInt(); QTimer::singleShot(125, this, SLOT(checkVolume())); @@ -92,7 +92,7 @@ SoftwareVolume::SoftwareVolume(QObject *parent) SoftwareVolume::~SoftwareVolume() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Volume/left", m_left); settings.setValue("Volume/right", m_right); m_instance = 0; @@ -118,6 +118,6 @@ SoftwareVolume *SoftwareVolume::instance() void SoftwareVolume::setEnabled(bool b) { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Volume/software_volume", b); } diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp index 9e1bd8602..9ec68290a 100644 --- a/src/qmmpui/filedialog.cpp +++ b/src/qmmpui/filedialog.cpp @@ -25,6 +25,7 @@ #include <QApplication> #include <QPluginLoader> #include <QMetaObject> +#include <qmmp/qmmp.h> #include "qtfiledialog.h" @@ -50,7 +51,7 @@ void FileDialog::setEnabled(FileDialogFactory *factory) registerBuiltinFactories(); registerExternalFactories(); } - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.setValue("FileDialog", factories.key(factory)); } @@ -61,7 +62,7 @@ bool FileDialog::isEnabled(FileDialogFactory *factory) registerBuiltinFactories(); registerExternalFactories(); } - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QString f_dialogName = settings.value("FileDialog", "qt_dialog").toString(); return factories.value(f_dialogName) == factory; } @@ -202,7 +203,7 @@ FileDialog* FileDialog::instance() registerExternalFactories(); } - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QString f_dialogName = settings.value("FileDialog", "qt_dialog").toString(); QStringList names = factories.keys(); diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp index 7bed340e1..6d43d3c68 100644 --- a/src/qmmpui/general.cpp +++ b/src/qmmpui/general.cpp @@ -22,6 +22,7 @@ #include <QObject> #include <QList> #include <QApplication> +#include <qmmp/qmmp.h> #include "general.h" @@ -101,7 +102,7 @@ void General::setEnabled(GeneralFactory* factory, bool enable) return; QString name = files.at(factories->indexOf(factory)).section('/',-1); - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList genList = settings.value("General/plugin_files").toStringList(); if (enable) @@ -120,7 +121,7 @@ bool General::isEnabled(GeneralFactory* factory) if (!factories->contains(factory)) return FALSE; QString name = files.at(factories->indexOf(factory)).section('/',-1); - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList genList = settings.value("General/plugin_files").toStringList(); return genList.contains(name); } diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp index bfbaa354c..23ce0b0c7 100644 --- a/src/qmmpui/playlistitem.cpp +++ b/src/qmmpui/playlistitem.cpp @@ -38,7 +38,7 @@ PlayListItem::PlayListItem(FileInfo *info, QSettings *settings) : AbstractPlayli //use external settings or create new QSettings *s = settings; if (!s) - s = new QSettings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + s = new QSettings (Qmmp::configFile(), QSettings::IniFormat); m_use_meta = s->value ("PlayList/load_metadata", TRUE).toBool(); //TODO move to libqmmp //format diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index 9cb144772..1ceb70265 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.cpp @@ -370,7 +370,7 @@ void PlayListModel::showDetails() void PlayListModel::readSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_current = settings.value("Playlist/current",0).toInt(); QString line, param, value; @@ -439,7 +439,7 @@ void PlayListModel::writeSettings() file.write(QString("length=%1").arg(m->length()).toUtf8() +"\n"); } file.close(); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Playlist/current", m_current); } diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp index 373619574..713b23058 100644 --- a/src/qmmpui/playstate.cpp +++ b/src/qmmpui/playstate.cpp @@ -92,10 +92,6 @@ void ShufflePlayState::resetState() m_shuffled_current = 0; } - - - - NormalPlayState::NormalPlayState(PlayListModel * model) : PlayState(model) {} diff --git a/src/ui/addurldialog.cpp b/src/ui/addurldialog.cpp index 581aa9cac..61ba12eb5 100644 --- a/src/ui/addurldialog.cpp +++ b/src/ui/addurldialog.cpp @@ -27,6 +27,7 @@ #include <qmmpui/playlistparser.h> #include <qmmpui/playlistformat.h> #include <qmmpui/playlistmodel.h> +#include <qmmp/qmmp.h> #define HISTORY_SIZE 10 @@ -35,7 +36,7 @@ AddUrlDialog::AddUrlDialog( QWidget * parent, Qt::WindowFlags f) : QDialog(paren setupUi(this); setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_QuitOnClose, FALSE); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_history = settings.value("URLDialog/history").toStringList(); urlComboBox->addItems(m_history); m_http = new QHttp(this); @@ -62,7 +63,7 @@ AddUrlDialog::~AddUrlDialog() { if ( m_history.size() > HISTORY_SIZE) m_history.removeLast(); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("URLDialog/history", m_history); m_http->close(); } diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index d1a25ef1f..1b0afa273 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -96,7 +96,7 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::readSettings() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); ui.formatLineEdit->setText( settings.value ("PlayList/title_format", "%p - %t").toString()); ui.metadataCheckBox->setChecked( @@ -371,7 +371,7 @@ void ConfigDialog::loadPluginsInfo() void ConfigDialog::loadFonts() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QString fontname = settings.value ( "PlayList/Font","" ).toString(); QFont font; font.fromString(fontname); @@ -393,7 +393,7 @@ void ConfigDialog::setPlFont() { ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.plFontLabel->setFont(font); - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); settings.setValue ( "PlayList/Font", font.toString() ); } } @@ -407,7 +407,7 @@ void ConfigDialog::setMainFont() { ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.mainFontLabel->setFont(font); - QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat ); + QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); settings.setValue ( "MainWindow/Font", font.toString() ); } } @@ -538,7 +538,7 @@ void ConfigDialog::addTitleString( QAction * a) void ConfigDialog::saveSettings() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.setValue ("PlayList/title_format", ui.formatLineEdit->text().trimmed()); settings.setValue ("PlayList/load_metadata", ui.metadataCheckBox->isChecked()); settings.setValue ("PlayList/convert_underscore", ui.underscoresCheckBox->isChecked()); diff --git a/src/ui/display.cpp b/src/ui/display.cpp index 13a85989e..fc9b2b9bb 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -156,7 +156,7 @@ MainDisplay::MainDisplay (QWidget *parent) MainDisplay::~MainDisplay() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.setValue ("Playlist/visible",m_plButton->isChecked()); settings.setValue ("Equalizer/visible",m_eqButton->isChecked()); } diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp index a007a0763..873cd5dc8 100644 --- a/src/ui/eqtitlebar.cpp +++ b/src/ui/eqtitlebar.cpp @@ -48,7 +48,7 @@ EqTitleBar::EqTitleBar(QWidget *parent) m_shade = new Button(this, Skin::EQ_BT_SHADE1_N, Skin::EQ_BT_SHADE1_P); connect(m_shade, SIGNAL(clicked()), SLOT(shade())); m_shade->move(254,3); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if (settings.value("Equalizer/shaded", FALSE).toBool()) shade(); else @@ -61,7 +61,7 @@ EqTitleBar::EqTitleBar(QWidget *parent) EqTitleBar::~EqTitleBar() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Equalizer/shaded", m_shaded); } diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index 860830146..bc9f96467 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -131,7 +131,7 @@ void EqWidget::updateSkin() void EqWidget::readSettings() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup ("Equalizer"); //geometry move (settings.value ("pos", QPoint (100, 216)).toPoint()); @@ -193,7 +193,7 @@ void EqWidget::readSettings() void EqWidget::writeSettings() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup ("Equalizer"); //geometry settings.setValue ("pos", this->pos()); diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp index 8590a1b2a..5743fdd55 100644 --- a/src/ui/listwidget.cpp +++ b/src/ui/listwidget.cpp @@ -66,7 +66,7 @@ ListWidget::~ListWidget() void ListWidget::readSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString fontname = settings.value("PlayList/Font","").toString(); m_font.fromString(fontname); m_show_protocol = settings.value ("PlayList/show_protocol", FALSE).toBool(); diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp index 0779c93d2..b56a9d017 100644 --- a/src/ui/mainvisual.cpp +++ b/src/ui/mainvisual.cpp @@ -61,7 +61,7 @@ MainVisual::MainVisual (QWidget *parent) MainVisual::~MainVisual() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if (m_vis) { settings.setValue("Visualization/type",m_vis->name()); @@ -242,7 +242,7 @@ void MainVisual::updateSettings() else m_timer->setInterval (40); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); act = m_peaksFalloffGroup->checkedAction (); if (act) settings.setValue("Visualization/peaks_falloff", act->data().toInt()); @@ -376,7 +376,7 @@ void MainVisual::createMenu() void MainVisual::readSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString name = settings.value("Visualization/type","Analyzer").toString(); m_visModeGroup->actions ()[0]->setChecked(TRUE); @@ -435,7 +435,7 @@ Analyzer::Analyzer() double peaks_speed[] = { 0.05, 0.1, 0.2, 0.4, 0.8 }; double analyzer_speed[] = { 1.2, 1.8, 2.2, 2.8, 2.4 }; - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_peaks_falloff = peaks_speed[settings.value("Visualization/peaks_falloff", 3).toInt()-1]; m_analyzer_falloff = diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 3f7b996e4..146e2e6cc 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -314,7 +314,7 @@ void MainWindow::changeEvent (QEvent * event) void MainWindow::readSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if (!m_update) { settings.beginGroup("MainWindow"); @@ -348,7 +348,7 @@ void MainWindow::readSettings() void MainWindow::writeSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("MainWindow"); //geometry settings.setValue("pos", this->pos()); diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index a6718ab74..866fdcf33 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -399,7 +399,7 @@ void PlayList::readSettings() } else { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup ("PlayList"); //position move (settings.value ("pos", QPoint (100, 332)).toPoint()); @@ -411,7 +411,7 @@ void PlayList::readSettings() void PlayList::writeSettings() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup ("PlayList"); //position settings.setValue ("pos", this->pos()); diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp index 73e66f881..2e3b154ac 100644 --- a/src/ui/playlisttitlebar.cpp +++ b/src/ui/playlisttitlebar.cpp @@ -53,7 +53,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) resize(275,20); setMinimumWidth(275); readSettings(); - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); m_pl->resize (settings.value ("PlayList/size", QSize (275, 116)).toSize()); if (settings.value ("PlayList/shaded", FALSE).toBool()) shade(); @@ -64,7 +64,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) PlayListTitleBar::~PlayListTitleBar() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); settings.setValue ("PlayList/size", QSize (m_pl->width(), m_shaded ? m_height:m_pl->height())); settings.setValue ("PlayList/shaded", m_shaded); } @@ -209,7 +209,7 @@ void PlayListTitleBar::setModel(PlayListModel *model) void PlayListTitleBar::readSettings() { - QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QString fontname = settings.value("PlayList/Font","").toString(); if (fontname.isEmpty ()) fontname = QFont("Helvetica [Cronyx]", 8).toString(); diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp index b66ab05d0..535af46d6 100644 --- a/src/ui/skin.cpp +++ b/src/ui/skin.cpp @@ -29,6 +29,7 @@ #include <QImage> #include <QBuffer> +#include <qmmp/qmmp.h> #include "skin.h" Skin *Skin::pointer = 0; @@ -60,7 +61,7 @@ Skin::Skin (QObject *parent) : QObject (parent) { pointer = this; - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString path = settings.value("skin_path","").toString(); if (path.isEmpty() || !QDir(path).exists ()) path = ":/default"; @@ -76,7 +77,7 @@ Skin::~Skin() void Skin::setSkin (const QString& path) { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("skin_path",path); qDebug ("Skin: set skin %s",qPrintable(path)); //TODO don't clear lists diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp index 536778e62..fe92a25f0 100644 --- a/src/ui/textscroller.cpp +++ b/src/ui/textscroller.cpp @@ -24,6 +24,7 @@ #include <QMenu> #include <QMouseEvent> #include <QSettings> +#include <qmmp/qmmp.h> #include "skin.h" #include "textscroller.h" @@ -63,7 +64,7 @@ TextScroller::TextScroller ( QWidget *parent ) autoscrollAction->setCheckable (TRUE); connect(autoscrollAction, SIGNAL(toggled(bool)), SLOT(setAutoscroll(bool))); m_menu->addAction(autoscrollAction); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); autoscrollAction->setChecked(settings.value("TextScroller/autoscroll", TRUE).toBool()); setAutoscroll(autoscrollAction->isChecked()); } @@ -71,7 +72,7 @@ TextScroller::TextScroller ( QWidget *parent ) TextScroller::~TextScroller() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("TextScroller/autoscroll", m_autoscroll); } @@ -123,7 +124,7 @@ void TextScroller::setAutoscroll(bool enabled) void TextScroller::readSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString fontname = settings.value("MainWindow/Font","").toString(); m_font.fromString(fontname); diff --git a/src/ui/timeindicator.cpp b/src/ui/timeindicator.cpp index 9b81ba040..111ed2d07 100644 --- a/src/ui/timeindicator.cpp +++ b/src/ui/timeindicator.cpp @@ -20,6 +20,7 @@ #include <QPainter> #include <QSettings> #include <QMouseEvent> +#include <qmmp/qmmp.h> #include "skin.h" #include "timeindicator.h" @@ -97,7 +98,7 @@ void TimeIndicator::updateSkin() void TimeIndicator::readSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Display"); m_elapsed = settings.value("Elapsed",true).toBool(); settings.endGroup(); @@ -106,7 +107,7 @@ void TimeIndicator::readSettings() void TimeIndicator::writeSettings() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Display"); settings.setValue("Elapsed",m_elapsed); settings.endGroup(); diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp index d91bb3032..00a59e1bc 100644 --- a/src/ui/titlebar.cpp +++ b/src/ui/titlebar.cpp @@ -57,7 +57,7 @@ TitleBar::TitleBar(QWidget *parent) setActive(FALSE); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if (settings.value("Display/shaded", FALSE).toBool()) shade(); else @@ -68,7 +68,7 @@ TitleBar::TitleBar(QWidget *parent) TitleBar::~TitleBar() { - QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Display/shaded", m_shaded); } |