diff data/fileio/AudioFileReader.cpp @ 1038:cc27f35aa75c cxx11

Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 59e7fe1b1003
children 843f67be0ed9
line wrap: on
line diff
--- a/data/fileio/AudioFileReader.cpp	Tue Mar 03 09:33:59 2015 +0000
+++ b/data/fileio/AudioFileReader.cpp	Tue Mar 03 15:18:24 2015 +0000
@@ -16,14 +16,14 @@
 #include "AudioFileReader.h"
 
 void
-AudioFileReader::getDeInterleavedFrames(int start, int count,
+AudioFileReader::getDeInterleavedFrames(sv_frame_t start, sv_frame_t count,
                                         std::vector<SampleBlock> &frames) const
 {
     SampleBlock interleaved;
     getInterleavedFrames(start, count, interleaved);
     
     int channels = getChannelCount();
-    int rc = interleaved.size() / channels;
+    sv_frame_t rc = interleaved.size() / channels;
 
     frames.clear();
 
@@ -31,7 +31,7 @@
         frames.push_back(SampleBlock());
     }
 
-    for (int i = 0; i < rc; ++i) {
+    for (sv_frame_t i = 0; i < rc; ++i) {
         for (int c = 0; c < channels; ++c) {
             frames[c].push_back(interleaved[i * channels + c]);
         }