comparison data/fileio/MP3FileReader.cpp @ 1307:c84629395040 mp3-gapless

Handle trimming the padding from end as well

     m_completion = 0;
     m_done = false;
     m_reporter = reporter;
 
     if (m_gaplessMode == Gapless) {
-        CodedAudioFileReader::setSamplesToTrim(DEFAULT_DECODER_DELAY, 0);
+        CodedAudioFileReader::setFramesToTrim(DEFAULT_DECODER_DELAY, 0);
     }
     
     struct stat stat;
     if (::stat(m_path.toLocal8Bit().data(), &stat) == -1 || stat.st_size == 0) {
 	m_error = QString("File %1 does not exist.").arg(m_path);

 {
     DecoderData *data = (DecoderData *)dp;
     return data->reader->filter(stream, frame);
 }
 
-static string toMagic(uint32_t fourcc)
+static string toMagic(unsigned long fourcc)
 {
     string magic("....");
     for (int i = 0; i < 4; ++i) {
         magic[3-i] = char((fourcc >> (8*i)) & 0xff);
     }

 
             for (int skip = 0; skip < 5 + 12; ++skip) {
                 (void)mad_bit_read(&ptr, 8);
             }
 
-            uint32_t delay = mad_bit_read(&ptr, 12);
-            uint32_t padding = mad_bit_read(&ptr, 12);
+            auto delay = mad_bit_read(&ptr, 12);
+            auto padding = mad_bit_read(&ptr, 12);
 
             sv_frame_t delayToDrop = DEFAULT_DECODER_DELAY + delay;
             sv_frame_t paddingToDrop = padding - DEFAULT_DECODER_DELAY;
             if (paddingToDrop < 0) paddingToDrop = 0;
 

 
             SVDEBUG << "MP3FileReader: Will be trimming " << delayToDrop
                     << " samples from start and " << paddingToDrop
                     << " from end" << endl;
 
-            CodedAudioFileReader::setSamplesToTrim(delayToDrop, paddingToDrop);
+            CodedAudioFileReader::setFramesToTrim(delayToDrop, paddingToDrop);
             
         } else {
             SVDEBUG << "MP3FileReader: Xing frame has no LAME metadata" << endl;
         }