aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output')
-rw-r--r--src/plugins/Output/alsa/outputalsa.cpp6
-rw-r--r--src/plugins/Output/alsa/settingsdialog.cpp7
2 files changed, 7 insertions, 6 deletions
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());