comparison data/fileio/MP3FileReader.cpp @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t

 //#define DEBUG_ID3TAG 1
 
 #include <QFileInfo>
 
 MP3FileReader::MP3FileReader(FileSource source, DecodeMode decodeMode, 
-                             CacheMode mode, size_t targetRate,
+                             CacheMode mode, int targetRate,
+                             bool normalised,
                              ProgressReporter *reporter) :
-    CodedAudioFileReader(mode, targetRate),
+    CodedAudioFileReader(mode, targetRate, normalised),
     m_source(source),
     m_path(source.getLocalFilename()),
     m_decodeThread(0)
 {
     m_channelCount = 0;

         ::close(fd);
 	return;
     }
     
     ssize_t sz = 0;
-    size_t offset = 0;
+    int offset = 0;
     while (offset < m_fileSize) {
         sz = ::read(fd, m_filebuffer + offset, m_fileSize - offset);
         if (sz < 0) {
             m_error = QString("Read error for file %1 (after %2 bytes)")
                 .arg(m_path).arg(offset);

 
     delete[] m_reader->m_filebuffer;
     m_reader->m_filebuffer = 0;
 
     if (m_reader->m_samplebuffer) {
-        for (size_t c = 0; c < m_reader->m_channelCount; ++c) {
+        for (int c = 0; c < m_reader->m_channelCount; ++c) {
             delete[] m_reader->m_samplebuffer[c];
         }
         delete[] m_reader->m_samplebuffer;
         m_reader->m_samplebuffer = 0;
     }

 
     m_reader->endSerialised();
 } 
 
 bool
-MP3FileReader::decode(void *mm, size_t sz)
+MP3FileReader::decode(void *mm, int sz)
 {
     DecoderData data;
     struct mad_decoder decoder;
 
     data.start = (unsigned char const *)mm;

 
     if (!isDecodeCacheInitialised()) {
         initialiseDecodeCache();
     }
 
-    if (m_samplebuffersize < frames) {
+    if (int(m_samplebuffersize) < frames) {
         if (!m_samplebuffer) {
             m_samplebuffer = new float *[channels];
             for (int c = 0; c < channels; ++c) {
                 m_samplebuffer[c] = 0;
             }

 
     return MAD_FLOW_CONTINUE;
 }
 
 enum mad_flow
-MP3FileReader::error(void *dp,
-		     struct mad_stream *stream,
+MP3FileReader::error(void * /* dp */,
+		     struct mad_stream * /* stream */,
 		     struct mad_frame *)
 {
-    DecoderData *data = (DecoderData *)dp;
+//    DecoderData *data = (DecoderData *)dp;
 
 //    fprintf(stderr, "decoding error 0x%04x (%s) at byte offset %lu\n",
 //	    stream->error, mad_stream_errorstr(stream),
 //	    (unsigned long)(stream->this_frame - data->start));