diff options
| -rw-r--r-- | src/qmmp/outputfactory.h | 2 | ||||
| -rw-r--r-- | src/qmmp/outputwriter.cpp | 21 | ||||
| -rw-r--r-- | src/qmmp/outputwriter_p.h | 32 |
3 files changed, 19 insertions, 36 deletions
diff --git a/src/qmmp/outputfactory.h b/src/qmmp/outputfactory.h index 6263d4533..1fa5da2c2 100644 --- a/src/qmmp/outputfactory.h +++ b/src/qmmp/outputfactory.h @@ -61,7 +61,7 @@ public: virtual Output *create() = 0; /*! * Creates volume control object provided by plugin. - * Returns \b 0 if volume control is not supported by plugin. + * Returns \b nullptr if volume control is not supported by plugin. */ virtual Volume *createVolume() = 0; /*! diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp index c549612a4..d2bf74ce2 100644 --- a/src/qmmp/outputwriter.cpp +++ b/src/qmmp/outputwriter.cpp @@ -35,26 +35,7 @@ extern "C" { OutputWriter::OutputWriter (QObject* parent) : QThread (parent) { m_handler = StateHandler::instance(); - m_frequency = 0; - m_channels = 0; - m_output = nullptr; - m_format = Qmmp::PCM_UNKNOWM; - m_totalWritten = 0; - m_currentMilliseconds = -1; - m_bytesPerMillisecond = 0; - m_user_stop = false; - m_finish = false; - m_kbps = 0; - m_skip = false; - m_pause = false; - m_prev_pause = false; - m_useEq = false; - m_muted = false; m_settings = QmmpSettings::instance(); - m_format_converter = nullptr; - m_channel_converter = nullptr; - m_output_buf = nullptr; - m_output_size = 0; } OutputWriter::~OutputWriter() @@ -365,7 +346,7 @@ void OutputWriter::run() if(m >= 0) { m_totalWritten += m; - l+= m; + l += m; } else break; diff --git a/src/qmmp/outputwriter_p.h b/src/qmmp/outputwriter_p.h index e0309d74e..7ec46d97b 100644 --- a/src/qmmp/outputwriter_p.h +++ b/src/qmmp/outputwriter_p.h @@ -102,27 +102,29 @@ private: void startVisualization(); void stopVisualization(); - bool m_skip; + bool m_skip = false; QMutex m_mutex; Recycler m_recycler; StateHandler *m_handler; - quint32 m_frequency; - int m_channels, m_kbps; + quint32 m_frequency = 0; + int m_channels = 0, m_kbps = 0; ChannelMap m_chan_map; - Qmmp::AudioFormat m_format; - qint64 m_bytesPerMillisecond; - std::atomic_bool m_user_stop, m_pause, m_muted; - bool m_prev_pause; - std::atomic_bool m_finish; - bool m_useEq; - qint64 m_totalWritten, m_currentMilliseconds; + Qmmp::AudioFormat m_format = Qmmp::PCM_UNKNOWM; + qint64 m_bytesPerMillisecond = 0; + std::atomic_bool m_user_stop = ATOMIC_VAR_INIT(false); + std::atomic_bool m_pause = ATOMIC_VAR_INIT(false); + std::atomic_bool m_muted = ATOMIC_VAR_INIT(false); + std::atomic_bool m_finish = ATOMIC_VAR_INIT(false); + bool m_prev_pause = false; + bool m_useEq = false; + qint64 m_totalWritten = 0, m_currentMilliseconds = -1; QmmpSettings *m_settings; - Output *m_output; + Output *m_output = nullptr; AudioParameters m_in_params; - AudioConverter *m_format_converter; - ChannelConverter *m_channel_converter; - unsigned char *m_output_buf; - size_t m_output_size; //samples + AudioConverter *m_format_converter = nullptr; + ChannelConverter *m_channel_converter = nullptr; + unsigned char *m_output_buf = nullptr; + size_t m_output_size = 0; //samples }; #endif // OUTPUTWRITER_P_H |