aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/oss
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/oss')
-rw-r--r--src/plugins/Output/oss/outputoss.cpp4
-rw-r--r--src/plugins/Output/oss/outputoss.h6
-rw-r--r--src/plugins/Output/oss/settingsdialog.h2
3 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp
index 86d406926..2df3c1c24 100644
--- a/src/plugins/Output/oss/outputoss.cpp
+++ b/src/plugins/Output/oss/outputoss.cpp
@@ -44,7 +44,7 @@ extern "C"
#include <qmmp/visual.h>
#include "outputoss.h"
-OutputOSS::OutputOSS() : Output(), m_audio_fd(-1)
+OutputOSS::OutputOSS() : Output()
{
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_audio_device = settings.value("OSS/device","/dev/dsp").toString();
@@ -151,8 +151,6 @@ void OutputOSS::reset()
/***** MIXER *****/
VolumeOSS::VolumeOSS()
{
- m_master = true;
- m_mixer_fd = -1;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_mixer_device = settings.value("OSS/mixer_device","/dev/mixer").toString();
openMixer();
diff --git a/src/plugins/Output/oss/outputoss.h b/src/plugins/Output/oss/outputoss.h
index 59e366d5f..82fb18918 100644
--- a/src/plugins/Output/oss/outputoss.h
+++ b/src/plugins/Output/oss/outputoss.h
@@ -45,7 +45,7 @@ private:
void sync();
QString m_audio_device;
- int m_audio_fd;
+ int m_audio_fd = -1;
};
class VolumeOSS : public Volume
@@ -61,9 +61,9 @@ private:
//oss mixer
QString m_audio_device;
void openMixer();
- int m_mixer_fd;
+ int m_mixer_fd = -1;
QString m_mixer_device;
- bool m_master;
+ bool m_master = true;
};
diff --git a/src/plugins/Output/oss/settingsdialog.h b/src/plugins/Output/oss/settingsdialog.h
index f336898fb..34f3cdb96 100644
--- a/src/plugins/Output/oss/settingsdialog.h
+++ b/src/plugins/Output/oss/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = nullptr);
+ explicit SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();