merge and resolve conflict with master

[ardour.git] / libs / audiographer / audiographer / sndfile / sndfile_reader.h

diff --git a/libs/audiographer/audiographer/sndfile/sndfile_reader.h b/libs/audiographer/audiographer/sndfile/sndfile_reader.h
index f5f7adcb3a722853e16d71ca1b489e9038c6a33d..aa3c0cc89920115738e0306b65c8ab89e4e5ccb0 100644 (file)
--- a/libs/audiographer/audiographer/sndfile/sndfile_reader.h
+++ b/libs/audiographer/audiographer/sndfile/sndfile_reader.h
@@ -29,7 +29,7 @@ class SndfileReader
         *  Note that the data read is output to the outputs, as well as read into the context
         *  \return number of frames read
         */
-       nframes_t read (ProcessContext<T> & context)
+       framecnt_t read (ProcessContext<T> & context)
        {
                if (throw_level (ThrowStrict) && context.channels() != channels() ) {
                        throw Exception (*this, boost::str (boost::format
@@ -37,13 +37,13 @@ class SndfileReader
                                % context.channels() % channels()));
                }
                
-               nframes_t frames_read = SndfileHandle::read (context.data(), context.frames());
+               framecnt_t const frames_read = SndfileHandle::read (context.data(), context.frames());
                ProcessContext<T> c_out = context.beginning (frames_read);
                
                if (frames_read < context.frames()) {
                        c_out.set_flag (ProcessContext<T>::EndOfInput);
                }
-               output (c_out);
+               this->output (c_out);
                return frames_read;
        }
        
@@ -54,4 +54,4 @@ class SndfileReader
 
 } // namespace
 
-#endif // AUDIOGRAPHER_SNDFILE_READER_H
\ No newline at end of file
+#endif // AUDIOGRAPHER_SNDFILE_READER_H