coding style fixes

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

24 files changed, 95 insertions, 126 deletions

diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 2cc294c3b..47739d352 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -26,36 +26,31 @@
 #include <stdlib.h>
 #include <string.h>
 #include <iostream>
-
 #include <qmmp/buffer.h>
 #include <qmmp/visual.h>
 #include <qmmp/statehandler.h>
 #include "outputalsa.h"
 
 
-OutputALSA::OutputALSA() : m_inited(false)
+OutputALSA::OutputALSA()
 {
     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.toLatin1().data());
-    pcm_handle = nullptr;
-    m_prebuf = nullptr;
-    m_prebuf_size = 0;
-    m_prebuf_fill = 0;
-    m_can_pause = false;
-    m_chunk_size = 0;
-    m_alsa_channels[SND_CHMAP_NA]   = Qmmp::CHAN_NULL;
-    m_alsa_channels[SND_CHMAP_MONO] = Qmmp::CHAN_FRONT_CENTER;
-    m_alsa_channels[SND_CHMAP_FL]   = Qmmp::CHAN_FRONT_LEFT;
-    m_alsa_channels[SND_CHMAP_FR]   = Qmmp::CHAN_FRONT_RIGHT;
-    m_alsa_channels[SND_CHMAP_RL]   = Qmmp::CHAN_REAR_LEFT;
-    m_alsa_channels[SND_CHMAP_RR]   = Qmmp::CHAN_REAR_RIGHT;
-    m_alsa_channels[SND_CHMAP_FC]   = Qmmp::CHAN_FRONT_CENTER;
-    m_alsa_channels[SND_CHMAP_LFE]  = Qmmp::CHAN_LFE;
-    m_alsa_channels[SND_CHMAP_SL]   = Qmmp::CHAN_SIDE_LEFT;
-    m_alsa_channels[SND_CHMAP_SR]   = Qmmp::CHAN_SIDE_RIGHT;
-    m_alsa_channels[SND_CHMAP_RC]   = Qmmp::CHAN_REAR_CENTER;
+    m_alsa_channels = {
+        { SND_CHMAP_NA, Qmmp::CHAN_NULL },
+        { SND_CHMAP_MONO, Qmmp::CHAN_FRONT_CENTER },
+        { SND_CHMAP_FL, Qmmp::CHAN_FRONT_LEFT },
+        { SND_CHMAP_FR, Qmmp::CHAN_FRONT_RIGHT },
+        { SND_CHMAP_RL, Qmmp::CHAN_REAR_LEFT },
+        { SND_CHMAP_RR, Qmmp::CHAN_REAR_RIGHT },
+        { SND_CHMAP_FC, Qmmp::CHAN_FRONT_CENTER },
+        { SND_CHMAP_LFE, Qmmp::CHAN_LFE },
+        { SND_CHMAP_SL, Qmmp::CHAN_SIDE_LEFT },
+        { SND_CHMAP_SR, Qmmp::CHAN_SIDE_RIGHT },
+        { SND_CHMAP_RC, Qmmp::CHAN_REAR_CENTER }
+    };
 }
 
 OutputALSA::~OutputALSA()
@@ -252,11 +247,11 @@ qint64 OutputALSA::latency()
 
 void OutputALSA::drain()
 {
-    long m = 0;
     snd_pcm_uframes_t l = snd_pcm_bytes_to_frames(pcm_handle, m_prebuf_fill);
     while (l > 0)
     {
-        if ((m = alsa_write(m_prebuf, l)) >= 0)
+        long m = alsa_write(m_prebuf, l);
+        if (m >= 0)
         {
             l -= m;
             m = snd_pcm_frames_to_bytes(pcm_handle, m); // convert frames to bytes
diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h
index be28d4dd9..e0b8740b0 100644
--- a/src/plugins/Output/alsa/outputalsa.h
+++ b/src/plugins/Output/alsa/outputalsa.h
@@ -52,17 +52,17 @@ private:
     long alsa_write(unsigned char *data, long size);
     void uninitialize();
 
-    bool m_inited;
+    bool m_inited = false;
     bool m_use_mmap;
     //alsa
-    snd_pcm_t *pcm_handle;
+    snd_pcm_t *pcm_handle = nullptr;
     char *pcm_name;
-    snd_pcm_uframes_t m_chunk_size;
+    snd_pcm_uframes_t m_chunk_size = 0;
     //prebuffer
-    uchar *m_prebuf;
-    qint64 m_prebuf_size;
-    qint64 m_prebuf_fill;
-    bool m_can_pause;
+    uchar *m_prebuf = nullptr;
+    qint64 m_prebuf_size = 0;
+    qint64 m_prebuf_fill = 0;
+    bool m_can_pause = false;
     //channel conversions
     QHash <quint16, Qmmp::ChannelPosition> m_alsa_channels;
 };
diff --git a/src/plugins/Output/directsound/outputdirectsound.cpp b/src/plugins/Output/directsound/outputdirectsound.cpp
index 620b1d38a..1567a4e15 100644
--- a/src/plugins/Output/directsound/outputdirectsound.cpp
+++ b/src/plugins/Output/directsound/outputdirectsound.cpp
@@ -47,13 +47,6 @@ OutputDirectSound::DSoundChannels OutputDirectSound::m_dsound_pos[10]  = {
 

 OutputDirectSound::OutputDirectSound() : Output()

 {

-    m_ds = nullptr;

-    m_primaryBuffer = nullptr;

-    m_dsBuffer = nullptr;

-    m_dsBufferAt = 0;

-    m_latency = 0;

-    m_bytesPerSecond = 0;

-    m_reset = false;

     instance = this;

 }

 

@@ -277,7 +270,7 @@ void OutputDirectSound::resume()
     HRESULT result = m_dsBuffer->Play(0,0,DSBPLAY_LOOPING);

     if(result == DSERR_BUFFERLOST)

     {

-        result = m_dsBuffer->Play(0,0,DSBPLAY_LOOPING);

+        m_dsBuffer->Play(0,0,DSBPLAY_LOOPING);

         m_dsBuffer->Restore();

     }

 }

diff --git a/src/plugins/Output/directsound/outputdirectsound.h b/src/plugins/Output/directsound/outputdirectsound.h
index 9ee2f878f..21bfadcac 100644
--- a/src/plugins/Output/directsound/outputdirectsound.h
+++ b/src/plugins/Output/directsound/outputdirectsound.h
@@ -62,10 +62,10 @@ private:
     void uninitialize();

     DWORD bytesToWrite();

 

-    IDirectSound8 *m_ds;

-    IDirectSoundBuffer *m_primaryBuffer;

-    IDirectSoundBuffer8 *m_dsBuffer;

-    DWORD m_dsBufferAt;

+    IDirectSound8 *m_ds = nullptr;

+    IDirectSoundBuffer *m_primaryBuffer = nullptr;

+    IDirectSoundBuffer8 *m_dsBuffer = nullptr;

+    DWORD m_dsBufferAt = 0;

 

     typedef struct

     {

@@ -74,9 +74,9 @@ private:
     } DSoundChannels;

 

     static DSoundChannels m_dsound_pos[10];

-    qint64 m_latency;

-    qint32 m_bytesPerSecond;

-    bool m_reset;

+    qint64 m_latency = 0;

+    qint32 m_bytesPerSecond = 0;

+    bool m_reset = false;

 };

 

 /**

diff --git a/src/plugins/Output/null/outputnull.cpp b/src/plugins/Output/null/outputnull.cpp
index b70d65fe6..902573563 100644
--- a/src/plugins/Output/null/outputnull.cpp
+++ b/src/plugins/Output/null/outputnull.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,9 +23,7 @@
 
 
 OutputNull::OutputNull() : Output()
-{
-   m_bytes_per_second = 0;
-}
+{}
 
 OutputNull::~OutputNull()
 {}
diff --git a/src/plugins/Output/null/outputnull.h b/src/plugins/Output/null/outputnull.h
index 26b461753..501917b9b 100644
--- a/src/plugins/Output/null/outputnull.h
+++ b/src/plugins/Output/null/outputnull.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -40,7 +40,7 @@ public:
     void reset() override;
 
 private:
-    qint64 m_bytes_per_second;
+    qint64 m_bytes_per_second = 0;
 };
 
 
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();
 
diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp
index 0c5f1cd63..7d5a8e385 100644
--- a/src/plugins/Output/oss4/outputoss4.cpp
+++ b/src/plugins/Output/oss4/outputoss4.cpp
@@ -69,7 +69,6 @@ Qmmp::ChannelPosition OutputOSS4::m_oss_pos[16] =
 
 OutputOSS4::OutputOSS4() : Output()
 {
-    m_audio_fd = -1;
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_audio_device = settings.value("OSS4/device", DEFAULT_DEV).toString();
     m_instance = this;
diff --git a/src/plugins/Output/oss4/outputoss4.h b/src/plugins/Output/oss4/outputoss4.h
index 189e85613..2fec3c29e 100644
--- a/src/plugins/Output/oss4/outputoss4.h
+++ b/src/plugins/Output/oss4/outputoss4.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -54,7 +54,7 @@ private:
     void post();
     void sync();
     QString m_audio_device;
-    int m_audio_fd;
+    int m_audio_fd = -1;
     static OutputOSS4 *m_instance;
     static Qmmp::ChannelPosition m_oss_pos[16];
 
diff --git a/src/plugins/Output/oss4/settingsdialog.h b/src/plugins/Output/oss4/settingsdialog.h
index e4fc71e7e..86adc3dfd 100644
--- a/src/plugins/Output/oss4/settingsdialog.h
+++ b/src/plugins/Output/oss4/settingsdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Ilya Kotov                                      *
+ *   Copyright (C) 2010-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
 {
 Q_OBJECT
 public:
-    SettingsDialog(QWidget *parent);
+    explicit SettingsDialog(QWidget *parent);
     ~SettingsDialog();
 
 private slots:
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index e31e174ff..e64c02b33 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -30,21 +30,19 @@ VolumePulseAudio *OutputPulseAudio::volumeControl = nullptr;
 
 OutputPulseAudio::OutputPulseAudio(): Output()
 {
-    m_loop = nullptr;
-    m_ctx = nullptr;
-    m_stream = nullptr;
-
-    m_pa_channels[Qmmp::CHAN_NULL] = PA_CHANNEL_POSITION_INVALID;
-    m_pa_channels[Qmmp::CHAN_FRONT_CENTER] = PA_CHANNEL_POSITION_MONO;
-    m_pa_channels[Qmmp::CHAN_FRONT_LEFT] = PA_CHANNEL_POSITION_FRONT_LEFT;
-    m_pa_channels[Qmmp::CHAN_FRONT_RIGHT] = PA_CHANNEL_POSITION_FRONT_RIGHT;
-    m_pa_channels[Qmmp::CHAN_REAR_LEFT] = PA_CHANNEL_POSITION_REAR_LEFT;
-    m_pa_channels[Qmmp::CHAN_REAR_RIGHT] = PA_CHANNEL_POSITION_REAR_RIGHT;
-    m_pa_channels[Qmmp::CHAN_FRONT_CENTER] = PA_CHANNEL_POSITION_FRONT_CENTER;
-    m_pa_channels[Qmmp::CHAN_LFE] = PA_CHANNEL_POSITION_LFE;
-    m_pa_channels[Qmmp::CHAN_SIDE_LEFT] = PA_CHANNEL_POSITION_SIDE_LEFT;
-    m_pa_channels[Qmmp::CHAN_SIDE_RIGHT] = PA_CHANNEL_POSITION_SIDE_RIGHT;
-    m_pa_channels[Qmmp::CHAN_REAR_CENTER] = PA_CHANNEL_POSITION_REAR_CENTER;
+    m_pa_channels = {
+        { Qmmp::CHAN_NULL, PA_CHANNEL_POSITION_INVALID  },
+        { Qmmp::CHAN_FRONT_CENTER, PA_CHANNEL_POSITION_MONO  },
+        { Qmmp::CHAN_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_LEFT  },
+        { Qmmp::CHAN_FRONT_RIGHT, PA_CHANNEL_POSITION_FRONT_RIGHT  },
+        { Qmmp::CHAN_REAR_LEFT, PA_CHANNEL_POSITION_REAR_LEFT  },
+        { Qmmp::CHAN_REAR_RIGHT, PA_CHANNEL_POSITION_REAR_RIGHT  },
+        { Qmmp::CHAN_FRONT_CENTER, PA_CHANNEL_POSITION_FRONT_CENTER  },
+        { Qmmp::CHAN_LFE, PA_CHANNEL_POSITION_LFE  },
+        { Qmmp::CHAN_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_LEFT  },
+        { Qmmp::CHAN_SIDE_RIGHT, PA_CHANNEL_POSITION_SIDE_RIGHT  },
+        { Qmmp::CHAN_REAR_CENTER, PA_CHANNEL_POSITION_REAR_CENTER  }
+    };
 
     instance = this;
 }
@@ -323,19 +321,19 @@ void OutputPulseAudio::info_cb(pa_context *ctx, const pa_sink_input_info *info,
         volumeControl->updateVolume(info->volume, info->mute > 0);
 
     if(data)
-        *(bool *) data = true;
+        *static_cast<bool *>(data) = true;
 }
 
 void OutputPulseAudio::context_success_cb(pa_context *, int success, void *data)
 {
     if(data)
-        *(bool *)data = success != 0;
+        *static_cast<bool *>(data) = success != 0;
 }
 
 void OutputPulseAudio::stream_success_cb(pa_stream *, int success, void *data)
 {
     if(data)
-        *(bool *)data = success != 0;
+        *static_cast<bool *>(data) = success != 0;
 }
 
 //volume control
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h
index 392c50b55..3f583f942 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.h
@@ -66,9 +66,9 @@ private:
     static void context_success_cb(pa_context *, int success, void *data);
     static void stream_success_cb(pa_stream *, int success, void *data);
 
-    pa_mainloop *m_loop;
-    pa_context *m_ctx;
-    pa_stream *m_stream;
+    pa_mainloop *m_loop = nullptr;
+    pa_context *m_ctx = nullptr;
+    pa_stream *m_stream = nullptr;
     QHash <Qmmp::ChannelPosition, pa_channel_position_t> m_pa_channels;
 };
 
diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp
index 39ee1fafb..42eafe456 100644
--- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp
+++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 
-OutputQtMultimedia::OutputQtMultimedia() : Output(), m_buffer(nullptr), m_bytes_per_second(0)
+OutputQtMultimedia::OutputQtMultimedia() : Output(), m_buffer(nullptr)
 {
 }
 
@@ -154,10 +154,8 @@ void OutputQtMultimedia::resume()
     QMetaObject::invokeMethod(m_control, "resume", Qt::QueuedConnection);
 }
 
-OutputControl::OutputControl(QAudioOutput *o)
-{
-    m_output = o;
-}
+OutputControl::OutputControl(QAudioOutput *o) : m_output(o)
+{}
 
 void OutputControl::suspend()
 {
diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h
index 6a1a4f413..e360dca63 100644
--- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h
+++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h
@@ -50,7 +50,7 @@ private:
     QAudioOutput *m_output = nullptr;
     OutputControl *m_control = nullptr;
     QIODevice *m_buffer;
-    qint64 m_bytes_per_second;
+    qint64 m_bytes_per_second = 0;
 };
 
 class OutputControl : public QObject
@@ -58,7 +58,7 @@ class OutputControl : public QObject
     Q_OBJECT
 
 public:
-    OutputControl(QAudioOutput *o);
+    explicit OutputControl(QAudioOutput *o);
 
 public slots:
     void suspend();
diff --git a/src/plugins/Output/qtmultimedia/settingsdialog.h b/src/plugins/Output/qtmultimedia/settingsdialog.h
index 3c5dd4923..87fc10fdd 100644
--- a/src/plugins/Output/qtmultimedia/settingsdialog.h
+++ b/src/plugins/Output/qtmultimedia/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
 {
 Q_OBJECT
 public:
-    SettingsDialog(QWidget *parent);
+    explicit SettingsDialog(QWidget *parent);
     ~SettingsDialog();
 
 private:
diff --git a/src/plugins/Output/shout/shoutoutput.cpp b/src/plugins/Output/shout/shoutoutput.cpp
index b86e62a36..6252f945f 100644
--- a/src/plugins/Output/shout/shoutoutput.cpp
+++ b/src/plugins/Output/shout/shoutoutput.cpp
@@ -25,13 +25,8 @@
 #include <qmmp/qmmp.h>
 #include "shoutoutput.h"
 
-ShoutOutput::ShoutOutput(ShoutClient *m)
+ShoutOutput::ShoutOutput(ShoutClient *m) : m_client(m)
 {
-    m_client = m;
-    m_soxr = nullptr;
-    m_ratio = 0;
-    m_soxr_buf = nullptr;
-    m_soxr_buf_frames = 0;
     qsrand(time(nullptr));
 }
 
diff --git a/src/plugins/Output/shout/shoutoutput.h b/src/plugins/Output/shout/shoutoutput.h
index 6536f0a60..554c3fa9c 100644
--- a/src/plugins/Output/shout/shoutoutput.h
+++ b/src/plugins/Output/shout/shoutoutput.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2017 by Ilya Kotov                                      *
+ *   Copyright (C) 2017-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,7 +29,7 @@
 class ShoutOutput : public Output
 {
 public:
-    ShoutOutput(ShoutClient *m);
+    explicit ShoutOutput(ShoutClient *m);
     ~ShoutOutput();
 
     bool initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat) override;
@@ -49,10 +49,10 @@ private:
     vorbis_comment   m_vc; //struct that stores all the user comments
     vorbis_dsp_state m_vd; //central working state for the packet->PCM decoder
     vorbis_block     m_vb; //local working space for packet->PCM decode
-    soxr_t m_soxr;
-    float *m_soxr_buf;
-    size_t m_soxr_buf_frames;
-    double m_ratio;
+    soxr_t m_soxr = nullptr;
+    float *m_soxr_buf = nullptr;
+    size_t m_soxr_buf_frames = 0;
+    double m_ratio = 0;
 };
 
 #endif // SHOUTOUTPUT_H
diff --git a/src/plugins/Output/wasapi/outputwasapi.cpp b/src/plugins/Output/wasapi/outputwasapi.cpp
index 1a803bf68..2db27cfc4 100644
--- a/src/plugins/Output/wasapi/outputwasapi.cpp
+++ b/src/plugins/Output/wasapi/outputwasapi.cpp
@@ -56,11 +56,6 @@ OutputWASAPI::DWASAPIChannels OutputWASAPI::m_wasapi_pos[10]  = {
 

 OutputWASAPI::OutputWASAPI() : Output()

 {

-    m_pEnumerator = nullptr;

-    m_pDevice = nullptr;

-    m_pAudioClient = nullptr;

-    m_pRenderClient = nullptr;

-    m_pSimpleAudioVolume = nullptr;

     instance = this;

     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);

     m_id = settings.value("WASAPI/device", "default").toString();

diff --git a/src/plugins/Output/wasapi/outputwasapi.h b/src/plugins/Output/wasapi/outputwasapi.h
index 10fd10cee..0c03a7e10 100644
--- a/src/plugins/Output/wasapi/outputwasapi.h
+++ b/src/plugins/Output/wasapi/outputwasapi.h
@@ -1,5 +1,5 @@
 /***************************************************************************

- *   Copyright (C) 2016 by Ilya Kotov                                      *

+ *   Copyright (C) 2016-2020 by Ilya Kotov                                 *

  *   forkotov02@ya.ru                                                      *

  *                                                                         *

  *   This program is free software; you can redistribute it and/or modify  *

@@ -60,16 +60,16 @@ private:
     void status();

     void uninitialize();

 

-    IMMDeviceEnumerator *m_pEnumerator;

-    IMMDevice *m_pDevice;

-    IAudioClient *m_pAudioClient;

-    IAudioRenderClient *m_pRenderClient;

-    ISimpleAudioVolume *m_pSimpleAudioVolume;

+    IMMDeviceEnumerator *m_pEnumerator = nullptr;

+    IMMDevice *m_pDevice = nullptr;

+    IAudioClient *m_pAudioClient = nullptr;

+    IAudioRenderClient *m_pRenderClient = nullptr;

+    ISimpleAudioVolume *m_pSimpleAudioVolume = nullptr;

 

-    UINT32 m_bufferFrames;

-    int m_frameSize;

+    UINT32 m_bufferFrames = 0;

+    int m_frameSize = 0;

     QString m_id;

-    bool m_exclusive;

+    bool m_exclusive = false;

 

     typedef struct

     {

diff --git a/src/plugins/Output/wasapi/settingsdialog.cpp b/src/plugins/Output/wasapi/settingsdialog.cpp
index d91d9ca9a..2d91c66e1 100644
--- a/src/plugins/Output/wasapi/settingsdialog.cpp
+++ b/src/plugins/Output/wasapi/settingsdialog.cpp
@@ -71,11 +71,14 @@ void SettingsDialog::enumDevices()
     IPropertyStore *pProps = nullptr;

     UINT count = 0;

 

-    result = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &pEndpoints);

-    if(result != S_OK)

+    if(pEnumerator)

     {

-        qWarning("SettingsDialog: IMMDeviceEnumerator::EnumAudioEndpoints failed, error code = 0x%lx", result);

-        pEndpoints = nullptr;

+        result = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &pEndpoints);

+        if(result != S_OK)

+        {

+            qWarning("SettingsDialog: IMMDeviceEnumerator::EnumAudioEndpoints failed, error code = 0x%lx", result);

+            pEndpoints = nullptr;

+        }

     }

 

     if(pEndpoints)

diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp
index b1f2713b1..f617ed310 100644
--- a/src/plugins/Output/waveout/outputwaveout.cpp
+++ b/src/plugins/Output/waveout/outputwaveout.cpp
@@ -74,10 +74,7 @@ free_memory (void)
 }

 

 OutputWaveOut::OutputWaveOut() : Output()

-{

-    m_totalWritten = 0;

-    m_frameSize = 0;

-}

+{}

 

 OutputWaveOut::~OutputWaveOut()

 {

diff --git a/src/plugins/Output/waveout/outputwaveout.h b/src/plugins/Output/waveout/outputwaveout.h
index 8cf188798..4e83de731 100644
--- a/src/plugins/Output/waveout/outputwaveout.h
+++ b/src/plugins/Output/waveout/outputwaveout.h
@@ -49,8 +49,8 @@ private:
     // helper functions

     void status();

     void uninitialize();

-    qint64 m_totalWritten;

-    qint32 m_frameSize;

+    qint64 m_totalWritten = 0;

+    qint32 m_frameSize = 0;

 };

 

 class VolumeWaveOut : public Volume