diff options
Diffstat (limited to 'src/plugins')
32 files changed, 40 insertions, 40 deletions
diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp index f0d21e50a..9a370af09 100644 --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.cpp @@ -319,7 +319,7 @@ bool Converter::convert(Decoder *decoder, FILE *file, bool use16bit) forever { // decode - len = decoder->read((char *)(output_buf + output_at), buf_size - output_at); + len = decoder->read((output_buf + output_at), buf_size - output_at); if (len > 0) { diff --git a/src/plugins/General/rgscan/rgscanner.cpp b/src/plugins/General/rgscan/rgscanner.cpp index 44d05c9c5..2afacd921 100644 --- a/src/plugins/General/rgscan/rgscanner.cpp +++ b/src/plugins/General/rgscan/rgscanner.cpp @@ -179,7 +179,7 @@ void RGScanner::run() const int buf_size = 8192; //samples double out_left[buf_size], out_right[buf_size]; //replay gain buffers float float_buf[buf_size]; //float buffer - char char_buf[buf_size*ap.sampleSize()]; //char buffer + unsigned char char_buf[buf_size*ap.sampleSize()]; //char buffer qint64 totalSamples = m_decoder->totalTime() * ap.sampleRate() * ap.channels() / 1000; qint64 sample_counter = 0; qint64 samples = 0; diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index 6d60280e8..049802261 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.cpp @@ -144,7 +144,7 @@ bool DecoderAAC::initialize() return true; } -qint64 DecoderAAC::read(char *audio, qint64 maxSize) +qint64 DecoderAAC::read(unsigned char *audio, qint64 maxSize) { NeAACDecFrameInfo frame_info; qint64 size = 0, to_read, read; diff --git a/src/plugins/Input/aac/decoder_aac.h b/src/plugins/Input/aac/decoder_aac.h index 523c020a7..f873118f8 100644 --- a/src/plugins/Input/aac/decoder_aac.h +++ b/src/plugins/Input/aac/decoder_aac.h @@ -47,7 +47,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *audio, qint64 maxSize); + qint64 read(unsigned char *audio, qint64 maxSize); void seek(qint64 time); private: diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 6fe9b96e2..1b0be129c 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -469,7 +469,7 @@ int DecoderCDAudio::bitrate() return m_bitrate; } -qint64 DecoderCDAudio::read(char *audio, qint64 maxSize) +qint64 DecoderCDAudio::read(unsigned char *audio, qint64 maxSize) { if(!m_buffer_at) { diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.h b/src/plugins/Input/cdaudio/decoder_cdaudio.h index 50a87c161..cdc21f3c1 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.h +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.h @@ -54,7 +54,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *audio, qint64 maxSize); + qint64 read(unsigned char *audio, qint64 maxSize); void seek(qint64 time); private: diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index cfc7696e0..ddb308e69 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -124,7 +124,7 @@ void DecoderCUE::seek(qint64 pos) audioParameters().sampleSize() * pos/1000; } -qint64 DecoderCUE::read(char *data, qint64 size) +qint64 DecoderCUE::read(unsigned char *data, qint64 size) { if(length_in_bytes - m_totalBytes < m_sz) //end of cue track return 0; diff --git a/src/plugins/Input/cue/decoder_cue.h b/src/plugins/Input/cue/decoder_cue.h index 75ff17052..08834cf60 100644 --- a/src/plugins/Input/cue/decoder_cue.h +++ b/src/plugins/Input/cue/decoder_cue.h @@ -38,7 +38,7 @@ public: bool initialize(); qint64 totalTime(); void seek(qint64); - qint64 read(char *data, qint64 size); + qint64 read(unsigned char *data, qint64 size); int bitrate(); const QString nextURL() const; void next(); diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 3e4304d89..278c31883 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -300,7 +300,7 @@ int DecoderFFmpeg::bitrate() return m_bitrate; } -qint64 DecoderFFmpeg::read(char *audio, qint64 maxSize) +qint64 DecoderFFmpeg::read(unsigned char *audio, qint64 maxSize) { m_skipBytes = 0; diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h index 39724ecb4..35dd036bd 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h @@ -44,7 +44,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *audio, qint64 maxSize); + qint64 read(unsigned char *audio, qint64 maxSize); void seek(qint64 time); private: diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 1b2cb89ed..723a147ab 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -84,7 +84,7 @@ static size_t pack_pcm_signed (FLAC__byte *output, return samples * channels * bps / 8; } -static int flac_decode (void *void_data, char *buf, int buf_len) +static int flac_decode (void *void_data, unsigned char *buf, int buf_len) { DecoderFLAC *dflac = (DecoderFLAC *) void_data; unsigned to_copy; @@ -460,7 +460,7 @@ void DecoderFLAC::seek(qint64 time) } -qint64 DecoderFLAC::read(char *data, qint64 size) +qint64 DecoderFLAC::read(unsigned char *data, qint64 size) { if(m_parser) { diff --git a/src/plugins/Input/flac/decoder_flac.h b/src/plugins/Input/flac/decoder_flac.h index 215d2d7e3..c69cba210 100644 --- a/src/plugins/Input/flac/decoder_flac.h +++ b/src/plugins/Input/flac/decoder_flac.h @@ -67,7 +67,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *data, qint64 maxSize); + qint64 read(unsigned char *data, qint64 maxSize); void seek(qint64 time); const QString nextURL() const; void next(); diff --git a/src/plugins/Input/gme/decoder_gme.cpp b/src/plugins/Input/gme/decoder_gme.cpp index 043099b54..822852302 100644 --- a/src/plugins/Input/gme/decoder_gme.cpp +++ b/src/plugins/Input/gme/decoder_gme.cpp @@ -92,7 +92,7 @@ int DecoderGme::bitrate() return 8; } -qint64 DecoderGme::read(char *data, qint64 size) +qint64 DecoderGme::read(unsigned char *data, qint64 size) { if(gme_track_ended(m_emu)) return 0; diff --git a/src/plugins/Input/gme/decoder_gme.h b/src/plugins/Input/gme/decoder_gme.h index 5fdb090fe..29a88a96d 100644 --- a/src/plugins/Input/gme/decoder_gme.h +++ b/src/plugins/Input/gme/decoder_gme.h @@ -39,7 +39,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *data, qint64 size); + qint64 read(unsigned char *data, qint64 size); void seek(qint64); private: diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index 820e37ea1..c17f14f42 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -343,7 +343,7 @@ int DecoderMAD::bitrate() return int(m_bitrate); } -qint64 DecoderMAD::read(char *data, qint64 size) +qint64 DecoderMAD::read(unsigned char *data, qint64 size) { if(decodeFrame()) return madOutput(data, size); @@ -530,7 +530,7 @@ bool DecoderMAD::decodeFrame() return true; } -qint64 DecoderMAD::madOutput(char *data, qint64 size) +qint64 DecoderMAD::madOutput(unsigned char *data, qint64 size) { unsigned int samples_per_channel, channels; mad_fixed_t const *left, *right; diff --git a/src/plugins/Input/mad/decoder_mad.h b/src/plugins/Input/mad/decoder_mad.h index 2e91ed334..a846a96ed 100644 --- a/src/plugins/Input/mad/decoder_mad.h +++ b/src/plugins/Input/mad/decoder_mad.h @@ -45,14 +45,14 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *data, qint64 size); + qint64 read(unsigned char *data, qint64 size); qint64 read(float *data, qint64 samples); void seek(qint64); private: // helper functions bool decodeFrame(); - qint64 madOutput(char *data, qint64 size); + qint64 madOutput(unsigned char *data, qint64 size); qint64 madOutputFloat(float *data, qint64 samples); bool fillBuffer(); void deinit(); diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp index 9bd6daad0..35ec524cb 100644 --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -105,7 +105,7 @@ int DecoderModPlug::bitrate() return m_bitrate; } -qint64 DecoderModPlug::read(char *audio, qint64 maxSize) +qint64 DecoderModPlug::read(unsigned char *audio, qint64 maxSize) { long len = m_soundFile->Read (audio, maxSize) * m_sampleSize; if (m_usePreamp) diff --git a/src/plugins/Input/modplug/decoder_modplug.h b/src/plugins/Input/modplug/decoder_modplug.h index 53b175149..91f4c349d 100644 --- a/src/plugins/Input/modplug/decoder_modplug.h +++ b/src/plugins/Input/modplug/decoder_modplug.h @@ -37,7 +37,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *audio, qint64 maxSize); + qint64 read(unsigned char *audio, qint64 maxSize); void seek(qint64 time); private: diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 3861bffa6..c6eefa73d 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -27,7 +27,7 @@ #include "decoder_mpc.h" // this function used from xmms -inline static void copyBuffer(MPC_SAMPLE_FORMAT* pInBuf, char* pOutBuf, unsigned pLength) +inline static void copyBuffer(MPC_SAMPLE_FORMAT* pInBuf, unsigned char* pOutBuf, unsigned pLength) { unsigned pSize = 16; int clipMin = -1 << (pSize - 1); @@ -226,7 +226,7 @@ int DecoderMPC::bitrate() return m_bitrate; } -qint64 DecoderMPC::read(char *audio, qint64 maxSize) +qint64 DecoderMPC::read(unsigned char *audio, qint64 maxSize) { #ifdef MPC_OLD_API mpc_uint32_t vbrAcc = 0; diff --git a/src/plugins/Input/mpc/decoder_mpc.h b/src/plugins/Input/mpc/decoder_mpc.h index 7a7debec3..a932d0504 100644 --- a/src/plugins/Input/mpc/decoder_mpc.h +++ b/src/plugins/Input/mpc/decoder_mpc.h @@ -55,7 +55,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *audio, qint64 maxSize); + qint64 read(unsigned char *audio, qint64 maxSize); void seek(qint64 time); private: diff --git a/src/plugins/Input/opus/decoder_opus.cpp b/src/plugins/Input/opus/decoder_opus.cpp index e6c6a7733..d55b75be9 100644 --- a/src/plugins/Input/opus/decoder_opus.cpp +++ b/src/plugins/Input/opus/decoder_opus.cpp @@ -158,7 +158,7 @@ void DecoderOpus::seek(qint64 time) op_pcm_seek(m_opusfile, time*48); } -qint64 DecoderOpus::read(char *data, qint64 maxSize) +qint64 DecoderOpus::read(unsigned char *data, qint64 maxSize) { int samples = maxSize / 2 / m_chan; samples = op_read(m_opusfile, (opus_int16 *)data, samples, 0); diff --git a/src/plugins/Input/opus/decoder_opus.h b/src/plugins/Input/opus/decoder_opus.h index ddbe666a1..e1d8a3287 100644 --- a/src/plugins/Input/opus/decoder_opus.h +++ b/src/plugins/Input/opus/decoder_opus.h @@ -39,7 +39,7 @@ public: int bitrate(); private: - virtual qint64 read(char *data, qint64 maxSize); + virtual qint64 read(unsigned char *data, qint64 maxSize); virtual void seek(qint64 time); // helper functions diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp index f9bfb0488..4f8bd1392 100644 --- a/src/plugins/Input/sid/decoder_sid.cpp +++ b/src/plugins/Input/sid/decoder_sid.cpp @@ -163,7 +163,7 @@ int DecoderSID::bitrate() return 8; } -qint64 DecoderSID::read(char *data, qint64 size) +qint64 DecoderSID::read(unsigned char *data, qint64 size) { size = qMin(size, qMax(m_length_in_bytes - m_read_bytes, qint64(0))); size -= size % 4; diff --git a/src/plugins/Input/sid/decoder_sid.h b/src/plugins/Input/sid/decoder_sid.h index b391e73e4..66704d0e9 100644 --- a/src/plugins/Input/sid/decoder_sid.h +++ b/src/plugins/Input/sid/decoder_sid.h @@ -39,7 +39,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *data, qint64 size); + qint64 read(unsigned char *data, qint64 size); void seek(qint64); private: diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index 46bfcdedd..a7a882500 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp @@ -91,7 +91,7 @@ int DecoderSndFile::bitrate() return m_bitrate; } -qint64 DecoderSndFile::read(char *audio, qint64 maxSize) +qint64 DecoderSndFile::read(unsigned char *audio, qint64 maxSize) { return sizeof(short)* sf_read_short (m_sndfile, (short *)audio, maxSize / sizeof(short)); } diff --git a/src/plugins/Input/sndfile/decoder_sndfile.h b/src/plugins/Input/sndfile/decoder_sndfile.h index 1708813d0..41c1ace57 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.h +++ b/src/plugins/Input/sndfile/decoder_sndfile.h @@ -37,7 +37,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *audio, qint64 maxSize); + qint64 read(unsigned char *audio, qint64 maxSize); void seek(qint64 time); private: diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index db9f8c8f8..7f77d485f 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -293,11 +293,11 @@ void DecoderVorbis::seek(qint64 time) ov_time_seek(&oggfile, (double) time/1000); } -qint64 DecoderVorbis::read(char *data, qint64 maxSize) +qint64 DecoderVorbis::read(unsigned char *data, qint64 maxSize) { len = -1; while (len < 0) - len = ov_read(&oggfile, data, maxSize, 0, 2, 1, &m_section); + len = ov_read(&oggfile, (char *)data, maxSize, 0, 2, 1, &m_section); if (m_section != m_last_section) updateTags(); diff --git a/src/plugins/Input/vorbis/decoder_vorbis.h b/src/plugins/Input/vorbis/decoder_vorbis.h index 83d95a4b0..f48fe763a 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.h +++ b/src/plugins/Input/vorbis/decoder_vorbis.h @@ -24,7 +24,7 @@ public: int bitrate(); private: - virtual qint64 read(char *data, qint64 maxSize); + virtual qint64 read(unsigned char *data, qint64 maxSize); virtual qint64 read(float *data, qint64 samples); virtual void seek(qint64 time); diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 9f04e830c..789515753 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -180,7 +180,7 @@ void DecoderWavPack::seek(qint64 time) WavpackSeekSample (m_context, time * audioParameters().sampleRate() / 1000); } -qint64 DecoderWavPack::read(char *data, qint64 size) +qint64 DecoderWavPack::read(unsigned char *data, qint64 size) { if(m_parser) { @@ -220,7 +220,7 @@ void DecoderWavPack::next() } } -qint64 DecoderWavPack::wavpack_decode(char *data, qint64 size) +qint64 DecoderWavPack::wavpack_decode(unsigned char *data, qint64 size) { ulong len = qMin(QMMP_BLOCK_FRAMES, (int)size / m_chan / 4); len = WavpackUnpackSamples (m_context, m_output_buf, len); diff --git a/src/plugins/Input/wavpack/decoder_wavpack.h b/src/plugins/Input/wavpack/decoder_wavpack.h index 1eddee0db..981f1dff4 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.h +++ b/src/plugins/Input/wavpack/decoder_wavpack.h @@ -38,7 +38,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *data, qint64 maxSize); + qint64 read(unsigned char *data, qint64 maxSize); void seek(qint64 time); const QString nextURL() const; void next(); @@ -46,7 +46,7 @@ public: private: // helper functions void deinit(); - qint64 wavpack_decode(char *data, qint64 size); + qint64 wavpack_decode(unsigned char *data, qint64 size); ChannelMap findChannelMap(int channels); WavpackContext *m_context; int32_t *m_output_buf; // output buffer diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp index 839067679..408755a35 100644 --- a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp +++ b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp @@ -82,7 +82,7 @@ int DecoderWildMidi::bitrate() return 8; } -qint64 DecoderWildMidi::read(char *data, qint64 size) +qint64 DecoderWildMidi::read(unsigned char *data, qint64 size) { - return WildMidi_GetOutput (midi_ptr, data, size); + return WildMidi_GetOutput (midi_ptr, (char *)data, size); } diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.h b/src/plugins/Input/wildmidi/decoder_wildmidi.h index 99becbaef..4cddd52da 100644 --- a/src/plugins/Input/wildmidi/decoder_wildmidi.h +++ b/src/plugins/Input/wildmidi/decoder_wildmidi.h @@ -36,7 +36,7 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - qint64 read(char *data, qint64 size); + qint64 read(unsigned char *data, qint64 size); void seek(qint64); private: |