diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-10-29 16:45:19 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-10-29 16:45:19 +0000 |
| commit | 9597e224068505196d6802f05edc6d182a69cd4b (patch) | |
| tree | 36fde9e2a7ce9a8bb903ee2c3fb7e73dd4a744fe /src/plugins/Input | |
| parent | d6d77d7629e743b0de89c5f5afbaec6e3e16b7fa (diff) | |
| download | qmmp-9597e224068505196d6802f05edc6d182a69cd4b.tar.gz qmmp-9597e224068505196d6802f05edc6d182a69cd4b.tar.bz2 qmmp-9597e224068505196d6802f05edc6d182a69cd4b.zip | |
some optimizations
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6815 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input')
| -rw-r--r-- | src/plugins/Input/cdaudio/decoder_cdaudio.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/Input/flac/decoder_flac.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/decoder_wavpack.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 9fa35dbd5..66c753832 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -129,6 +129,8 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) return tracks; } qDebug("DecoderCDAudio: found cd audio capable drive \"%s\"", *cd_drives); + device_path = QString(*cd_drives); + cdio_free_device_list(cd_drives); //free device list } else { @@ -136,9 +138,6 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) cdio_free_device_list(cd_drives); return tracks; } - device_path = QString(*cd_drives); - if (cd_drives && *cd_drives) //free device list - cdio_free_device_list(cd_drives); } else { diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 43e0a7972..a848a12ea 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -230,7 +230,6 @@ static void flac_callback_error (const FLAC__StreamDecoder *, DecoderFLAC::DecoderFLAC(const QString &path, QIODevice *i) : Decoder(i) { - m_data = 0; m_path = path; m_data = new flac_data; m_data->decoder = NULL; diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 9a6a18c1f..4467b6ebb 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -41,12 +41,12 @@ DecoderWavPack::DecoderWavPack(const QString &path) m_context = 0; m_parser = 0; m_output_buf = 0; - m_parser = 0; m_length_in_bytes = 0; m_totalBytes = 0; m_frame_size = 0; m_offset = 0; m_bps = 0; + m_track = 0; } DecoderWavPack::~DecoderWavPack() |