diff options
| -rw-r--r-- | src/plugins/Input/aac/decoder_aac.h | 5 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.h | 3 | ||||
| -rw-r--r-- | src/plugins/Input/flac/decoder_flac.h | 4 | ||||
| -rw-r--r-- | src/plugins/Input/sid/decoder_sid.h | 3 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.h | 3 | ||||
| -rw-r--r-- | src/qmmp/fileinfo.cpp | 6 |
7 files changed, 9 insertions, 17 deletions
diff --git a/src/plugins/Input/aac/decoder_aac.h b/src/plugins/Input/aac/decoder_aac.h index 37cfe385a..523c020a7 100644 --- a/src/plugins/Input/aac/decoder_aac.h +++ b/src/plugins/Input/aac/decoder_aac.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -57,8 +57,7 @@ private: int m_sample_buf_at; qint64 m_sample_buf_size; int m_bitrate; - ulong m_input_at, m_output_at; - double m_frameSize; + ulong m_input_at; qint64 m_totalTime; }; diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 504d1e980..a2596353a 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -328,7 +328,7 @@ qint64 DecoderFFmpeg::ffmpeg_decode() { int out_size = 0; int got_frame = 0; - if((m_pkt.stream_index == wma_idx)) + if(m_pkt.stream_index == wma_idx) { avcodec_get_frame_defaults(m_decoded_frame); diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h index 80df13c96..39724ecb4 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2013 by Ilya Kotov * + * Copyright (C) 2006-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -54,7 +54,6 @@ private: AVFormatContext *ic; AVCodecContext *c; - uint wma_st_buff, wma_idx2; int m_bitrate, wma_idx; QString m_path; diff --git a/src/plugins/Input/flac/decoder_flac.h b/src/plugins/Input/flac/decoder_flac.h index 62a4a2968..e64e376eb 100644 --- a/src/plugins/Input/flac/decoder_flac.h +++ b/src/plugins/Input/flac/decoder_flac.h @@ -83,11 +83,7 @@ private: void deinit(); uint findID3v2(char *data, ulong size); //retuns ID3v2 tag size - // FLAC Decoder - FLAC__StreamDecoder *m_flacDecoder; - struct flac_data *m_data; - qint64 m_totalTime; qint64 length_in_bytes; qint64 m_totalBytes; qint64 m_offset; diff --git a/src/plugins/Input/sid/decoder_sid.h b/src/plugins/Input/sid/decoder_sid.h index 69d8483cb..b391e73e4 100644 --- a/src/plugins/Input/sid/decoder_sid.h +++ b/src/plugins/Input/sid/decoder_sid.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -43,7 +43,6 @@ public: void seek(qint64); private: - qint64 m_totalTime; QString m_url; sidplayfp *m_player; SidDatabase *m_db; diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h index 375a94db8..c8e606f6c 100644 --- a/src/plugins/Output/alsa/outputalsa.h +++ b/src/plugins/Output/alsa/outputalsa.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2013 by Ilya Kotov * + * Copyright (C) 2006-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -83,7 +83,6 @@ private: snd_mixer_elem_t* getMixerElem(snd_mixer_t *m_mixer, char *name, int index); snd_mixer_t *m_mixer; snd_mixer_elem_t *pcm_element; - bool m_use_mmap; }; #endif // OUTPUTALSA_H diff --git a/src/qmmp/fileinfo.cpp b/src/qmmp/fileinfo.cpp index 56d04393d..463fbbbcc 100644 --- a/src/qmmp/fileinfo.cpp +++ b/src/qmmp/fileinfo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2013 by Ilya Kotov * + * Copyright (C) 2008-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -44,8 +44,8 @@ void FileInfo::operator=(const FileInfo &info) bool FileInfo::operator==(const FileInfo &info) { return metaData () == info.metaData () && - length () == info.length (); - path() == info.path(); + length () == info.length () && + path() == info.path(); } bool FileInfo::operator!=(const FileInfo &info) |