diff options
Diffstat (limited to 'src/plugins/Input/wildmidi')
| -rw-r--r-- | src/plugins/Input/wildmidi/decoder_wildmidi.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/Input/wildmidi/decoder_wildmidi.h | 10 | ||||
| -rw-r--r-- | src/plugins/Input/wildmidi/wildmidihelper.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/wildmidi/wildmidihelper.h | 6 |
4 files changed, 13 insertions, 18 deletions
diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp index f3c2e459c..7ff0c2690 100644 --- a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp +++ b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,12 +23,9 @@ #include "decoder_wildmidi.h" // Decoder class -DecoderWildMidi::DecoderWildMidi(const QString &path) : Decoder() -{ - m_path = path; - midi_ptr = nullptr; - m_sample_rate = 0; -} +DecoderWildMidi::DecoderWildMidi(const QString &path) : Decoder(), + m_path(path) +{} DecoderWildMidi::~DecoderWildMidi() { diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.h b/src/plugins/Input/wildmidi/decoder_wildmidi.h index 0f2ded8c4..5931ed21e 100644 --- a/src/plugins/Input/wildmidi/decoder_wildmidi.h +++ b/src/plugins/Input/wildmidi/decoder_wildmidi.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -29,7 +29,7 @@ extern "C"{ class DecoderWildMidi : public Decoder { public: - DecoderWildMidi(const QString &path); + explicit DecoderWildMidi(const QString &path); virtual ~DecoderWildMidi(); // Standard Decoder API @@ -40,9 +40,9 @@ public: void seek(qint64) override; private: - void *midi_ptr; - qint64 m_totalTime; - quint32 m_sample_rate; + void *midi_ptr = nullptr; + qint64 m_totalTime = 0; + quint32 m_sample_rate = 0; QString m_path; }; diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp index 186389b7d..3af943ba6 100644 --- a/src/plugins/Input/wildmidi/wildmidihelper.cpp +++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2013 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 * @@ -31,8 +31,6 @@ WildMidiHelper *WildMidiHelper::m_instance = nullptr; WildMidiHelper::WildMidiHelper(QObject *parent) : QObject(parent) { - m_inited = false; - m_sample_rate = 0; m_instance = this; } diff --git a/src/plugins/Input/wildmidi/wildmidihelper.h b/src/plugins/Input/wildmidi/wildmidihelper.h index 7d50775c7..b81d9eb27 100644 --- a/src/plugins/Input/wildmidi/wildmidihelper.h +++ b/src/plugins/Input/wildmidi/wildmidihelper.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2013 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 * @@ -41,10 +41,10 @@ public: private: static WildMidiHelper *m_instance; - bool m_inited; + bool m_inited = false; QMutex m_mutex; QList <void *> m_ptrs; - quint32 m_sample_rate; + quint32 m_sample_rate = 0; }; #endif // WILDMIDIHELPER_H |