[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/audiofileio decode/AbstractAudioRe...
|
From: |
Ben Levitt |
|
Subject: |
[Traverso-commit] traverso/src/audiofileio decode/AbstractAudioRe... |
|
Date: |
Sat, 04 Aug 2007 04:21:28 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/08/04 04:21:28
Modified files:
src/audiofileio/decode: AbstractAudioReader.h
FlacAudioReader.cpp MadAudioReader.cpp
ResampleAudioReader.cpp
SFAudioReader.cpp SFAudioReader.h
WPAudioReader.cpp WPAudioReader.h
src/audiofileio/encode: AbstractAudioWriter.cpp
AbstractAudioWriter.h
Log message:
Fix compiler warnings: mostly signedness and unused vars.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/AbstractAudioReader.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/FlacAudioReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/MadAudioReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/ResampleAudioReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/SFAudioReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/SFAudioReader.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/WPAudioReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/WPAudioReader.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/AbstractAudioWriter.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/AbstractAudioWriter.h?cvsroot=traverso&r1=1.2&r2=1.3
Patches:
Index: decode/AbstractAudioReader.h
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/decode/AbstractAudioReader.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/AbstractAudioReader.h 31 Jul 2007 18:45:12 -0000 1.1
+++ decode/AbstractAudioReader.h 4 Aug 2007 04:21:27 -0000 1.2
@@ -55,9 +55,9 @@
QString m_fileName;
nframes_t m_readPos;
- nframes_t m_channels;
+ int m_channels;
nframes_t m_length;
- nframes_t m_rate;
+ int m_rate;
};
#endif
Index: decode/FlacAudioReader.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/decode/FlacAudioReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/FlacAudioReader.cpp 31 Jul 2007 18:45:12 -0000 1.1
+++ decode/FlacAudioReader.cpp 4 Aug 2007 04:21:27 -0000 1.2
@@ -165,7 +165,7 @@
static FLAC__SeekableStreamDecoderTellStatus
tell_callback(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64
*absolute_byte_offset, void *client_data);
static FLAC__SeekableStreamDecoderLengthStatus
length_callback(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64
*stream_length, void *client_data);
static FLAC__bool eof_callback(const
FLAC__SeekableStreamDecoder *decoder, void *client_data);
- static void error_callback(const FLAC__SeekableStreamDecoder
*decoder, FLAC__StreamDecoderErrorStatus s, void *client_data){ printf("!!! %d
!!!\n", s); };
+ static void error_callback(const FLAC__SeekableStreamDecoder
*decoder, FLAC__StreamDecoderErrorStatus s, void *client_data){
Q_UNUSED(decoder); Q_UNUSED(client_data); printf("!!! %d !!!\n", s); };
static void metadata_callback(const FLAC__SeekableStreamDecoder
*decoder, const ::FLAC__StreamMetadata *metadata, void *client_data);
static FLAC__StreamDecoderWriteStatus write_callback(const
FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const
FLAC__int32 * const buffer[], void *client_data);
#else
@@ -194,17 +194,20 @@
FLAC__StreamDecoderWriteStatus FlacPrivate::write_callback(const
FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *
const buffer[], void *client_data)
#endif
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
- unsigned i, c, pos = 0;
- int frames = frame->header.blocksize;
+ uint c;
+ nframes_t pos = 0;
+ nframes_t frames = frame->header.blocksize;
if (fp->bufferUsed > 0) {
// This shouldn't be happening
PERROR("internalBuffer is already non-empty");
}
- if (fp->bufferSize < frames * frame->header.channels) {
+ if ((nframes_t)fp->bufferSize < frames * frame->header.channels) {
if (fp->internalBuffer) {
delete fp->internalBuffer;
}
@@ -212,7 +215,7 @@
fp->bufferSize = frames * frame->header.channels;
}
- for (i=0; i < frames; i++) {
+ for (nframes_t i=0; i < frames; i++) {
// in FLAC channel 0 is left, 1 is right
for (c=0; c < frame->header.channels; c++) {
audio_sample_t value =
(audio_sample_t)((float)buffer[c][i] /
(float)((uint)1<<(frame->header.bits_per_sample-1)));
@@ -229,6 +232,8 @@
#ifdef LEGACY_FLAC
FLAC__SeekableStreamDecoderReadStatus FlacPrivate::read_callback(const
FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes,
void *client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
long retval = fp->file->read((char *)buffer, (*bytes));
@@ -242,6 +247,8 @@
#else
FLAC__StreamDecoderReadStatus FlacPrivate::read_callback(const
FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void
*client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
long retval = fp->file->read((char *)buffer, (*bytes));
@@ -257,6 +264,8 @@
#ifdef LEGACY_FLAC
FLAC__SeekableStreamDecoderSeekStatus FlacPrivate::seek_callback(const
FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void
*client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
if(!fp->file->seek(absolute_byte_offset))
@@ -267,6 +276,8 @@
#else
FLAC__StreamDecoderSeekStatus FlacPrivate::seek_callback(const
FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void
*client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
if(!fp->file->seek(absolute_byte_offset))
@@ -279,6 +290,8 @@
#ifdef LEGACY_FLAC
FLAC__SeekableStreamDecoderTellStatus FlacPrivate::tell_callback(const
FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void
*client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
(*absolute_byte_offset) = fp->file->pos();
@@ -287,6 +300,8 @@
#else
FLAC__StreamDecoderTellStatus FlacPrivate::tell_callback(const
FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void
*client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
(*absolute_byte_offset) = fp->file->pos();
@@ -297,6 +312,8 @@
#ifdef LEGACY_FLAC
FLAC__SeekableStreamDecoderLengthStatus FlacPrivate::length_callback(const
FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *stream_length, void
*client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
(*stream_length) = fp->file->size();
@@ -305,6 +322,8 @@
#else
FLAC__StreamDecoderLengthStatus FlacPrivate::length_callback(const
FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
(*stream_length) = fp->file->size();
@@ -319,6 +338,8 @@
void FlacPrivate::metadata_callback(const FLAC__StreamDecoder *decoder, const
FLAC__StreamMetadata *metadata, void *client_data)
#endif
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
switch (metadata->type)
@@ -344,6 +365,8 @@
FLAC__bool FlacPrivate::eof_callback(const FLAC__StreamDecoder *decoder, void
*client_data)
#endif
{
+ Q_UNUSED(decoder);
+
FlacPrivate *fp = (FlacPrivate*)client_data;
return fp->file->atEnd();
@@ -523,13 +546,13 @@
memcpy(buffer[0] + framesCoppied,
m_flac->internalBuffer + m_flac->bufferStart, framesToCopy);
break;
case 2:
- for (int i = 0; i < framesToCopy; i++) {
+ for (nframes_t i = 0; i < framesToCopy; i++) {
buffer[0][framesCoppied + i] =
m_flac->internalBuffer[m_flac->bufferStart + i * 2];
buffer[1][framesCoppied + i] =
m_flac->internalBuffer[m_flac->bufferStart + i * 2 + 1];
}
break;
default:
- for (int i = 0; i < framesToCopy; i++) {
+ for (nframes_t i = 0; i < framesToCopy; i++) {
for (int c = 0; c < get_num_channels();
c++) {
buffer[c][framesCoppied + i] =
m_flac->internalBuffer[m_flac->bufferStart + i * get_num_channels() + c];
}
Index: decode/MadAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/MadAudioReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/MadAudioReader.cpp 31 Jul 2007 18:45:12 -0000 1.1
+++ decode/MadAudioReader.cpp 4 Aug 2007 04:21:27 -0000 1.2
@@ -843,7 +843,7 @@
int offset = d->outputPos;
nframes_t nframes = synth->pcm.length;
bool overflow = false;
- int i;
+ nframes_t i;
if (writeBuffers && (m_readPos + d->outputPos + nframes) > m_length) {
nframes = m_length - (m_readPos + offset);
Index: decode/ResampleAudioReader.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/decode/ResampleAudioReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/ResampleAudioReader.cpp 31 Jul 2007 18:45:12 -0000 1.1
+++ decode/ResampleAudioReader.cpp 4 Aug 2007 04:21:27 -0000 1.2
@@ -213,7 +213,7 @@
m_overflowUsed = 0;
}
- if (m_srcData.input_frames_used < bufferUsed) {
+ if ((nframes_t)m_srcData.input_frames_used < bufferUsed) {
for (int c = 0; c < m_channels; c++) {
memmove(m_fileBuffers[c], m_fileBuffers[c] +
m_srcData.input_frames_used, m_overflowUsed * sizeof(audio_sample_t));
}
Index: decode/SFAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/SFAudioReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/SFAudioReader.cpp 31 Jul 2007 18:45:13 -0000 1.1
+++ decode/SFAudioReader.cpp 4 Aug 2007 04:21:27 -0000 1.2
@@ -118,7 +118,7 @@
}
m_tmpBuffer = new audio_sample_t[frameCount * m_channels];
}
- nframes_t framesRead = sf_readf_float(m_sf, m_tmpBuffer, frameCount);
+ int framesRead = sf_readf_float(m_sf, m_tmpBuffer, frameCount);
// De-interlace
switch (m_channels) {
Index: decode/SFAudioReader.h
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/SFAudioReader.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/SFAudioReader.h 31 Jul 2007 18:45:13 -0000 1.1
+++ decode/SFAudioReader.h 4 Aug 2007 04:21:27 -0000 1.2
@@ -41,7 +41,7 @@
SNDFILE* m_sf;
SF_INFO m_sfinfo;
audio_sample_t *m_tmpBuffer;
- int m_tmpBufferSize;
+ nframes_t m_tmpBufferSize;
};
#endif
Index: decode/WPAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/WPAudioReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/WPAudioReader.cpp 31 Jul 2007 18:45:13 -0000 1.1
+++ decode/WPAudioReader.cpp 4 Aug 2007 04:21:27 -0000 1.2
@@ -115,13 +115,13 @@
memcpy(buffer[0], m_tmpBuffer, framesRead *
sizeof(audio_sample_t));
break;
case 2:
- for (int f = 0; f < framesRead; f++) {
+ for (nframes_t f = 0; f < framesRead; f++) {
buffer[0][f] = ((float*)m_tmpBuffer)[f
* 2];
buffer[1][f] = ((float*)m_tmpBuffer)[f
* 2 + 1];
}
break;
default:
- for (int f = 0; f < framesRead; f++) {
+ for (nframes_t f = 0; f < framesRead; f++) {
for (int c = 0; c < m_channels; c++) {
buffer[c][f] =
((float*)m_tmpBuffer)[f * m_channels + c];
}
@@ -131,18 +131,18 @@
else {
switch (m_channels) {
case 1:
- for (int f = 0; f < framesRead; f++) {
+ for (nframes_t f = 0; f < framesRead; f++) {
buffer[0][f] =
(float)((float)m_tmpBuffer[f]/ (float)((uint)1<<(m_bitsPerSample-1)));
}
break;
case 2:
- for (int f = 0; f < framesRead; f++) {
+ for (nframes_t f = 0; f < framesRead; f++) {
buffer[0][f] =
(float)((float)m_tmpBuffer[f * 2]/ (float)((uint)1<<(m_bitsPerSample-1)));
buffer[1][f] =
(float)((float)m_tmpBuffer[f * 2 + 1]/ (float)((uint)1<<(m_bitsPerSample-1)));
}
break;
default:
- for (int f = 0; f < framesRead; f++) {
+ for (nframes_t f = 0; f < framesRead; f++) {
for (int c = 0; c < m_channels; c++) {
buffer[c][f] =
(float)((float)m_tmpBuffer[f + m_channels + c]/
(float)((uint)1<<(m_bitsPerSample-1)));
}
Index: decode/WPAudioReader.h
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/WPAudioReader.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decode/WPAudioReader.h 31 Jul 2007 18:45:13 -0000 1.1
+++ decode/WPAudioReader.h 4 Aug 2007 04:21:27 -0000 1.2
@@ -42,7 +42,7 @@
bool m_isFloat;
int m_bitsPerSample;
int32_t *m_tmpBuffer;
- int m_tmpBufferSize;
+ nframes_t m_tmpBufferSize;
};
#endif
Index: encode/AbstractAudioWriter.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/encode/AbstractAudioWriter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- encode/AbstractAudioWriter.cpp 3 Aug 2007 23:05:03 -0000 1.2
+++ encode/AbstractAudioWriter.cpp 4 Aug 2007 04:21:27 -0000 1.3
@@ -65,6 +65,14 @@
}
+bool AbstractAudioWriter::set_format_attribute(const QString& key, const
QString& value)
+{
+ Q_UNUSED(key);
+ Q_UNUSED(value);
+ return false;
+}
+
+
nframes_t AbstractAudioWriter::pos()
{
return m_writePos;
Index: encode/AbstractAudioWriter.h
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/encode/AbstractAudioWriter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- encode/AbstractAudioWriter.h 3 Aug 2007 23:05:03 -0000 1.2
+++ encode/AbstractAudioWriter.h 4 Aug 2007 04:21:27 -0000 1.3
@@ -39,7 +39,7 @@
void set_num_channels(int channels);
void set_bits_per_sample(int bits);
void set_rate(int rate);
- virtual bool set_format_attribute(const QString& key, const QString&
value) { return false; }
+ virtual bool set_format_attribute(const QString& key, const QString&
value);
nframes_t pos();
bool open(const QString& filename);
@@ -58,8 +58,8 @@
bool m_isOpen;
int m_sampleWidth;
nframes_t m_writePos;
- nframes_t m_channels;
- nframes_t m_rate;
+ int m_channels;
+ int m_rate;
};
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/audiofileio decode/AbstractAudioRe...,
Ben Levitt <=