diff options
Diffstat (limited to 'libs/audiographer/audiographer/sndfile')
4 files changed, 9 insertions, 9 deletions
diff --git a/libs/audiographer/audiographer/sndfile/sndfile.h b/libs/audiographer/audiographer/sndfile/sndfile.h index 4db2298a90..939e5f8a2c 100644 --- a/libs/audiographer/audiographer/sndfile/sndfile.h +++ b/libs/audiographer/audiographer/sndfile/sndfile.h @@ -16,7 +16,7 @@ class Sndfile : public SndfileWriter<T>, public SndfileReader<T> public: Sndfile (std::string const & filename, SndfileBase::Mode mode = SndfileBase::ReadWrite, int format = 0, - ChannelCount channels = 0, nframes_t samplerate = 0) + ChannelCount channels = 0, framecnt_t samplerate = 0) : SndfileHandle (filename, mode, format, channels, samplerate) {} @@ -27,4 +27,4 @@ class Sndfile : public SndfileWriter<T>, public SndfileReader<T> } // namespace -#endif // AUDIOGRAPHER_SNDFILE_H
\ No newline at end of file +#endif // AUDIOGRAPHER_SNDFILE_H diff --git a/libs/audiographer/audiographer/sndfile/sndfile_reader.h b/libs/audiographer/audiographer/sndfile/sndfile_reader.h index f5f7adcb3a..f7a04f22d6 100644 --- 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,7 +37,7 @@ 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()) { @@ -54,4 +54,4 @@ class SndfileReader } // namespace -#endif // AUDIOGRAPHER_SNDFILE_READER_H
\ No newline at end of file +#endif // AUDIOGRAPHER_SNDFILE_READER_H diff --git a/libs/audiographer/audiographer/sndfile/sndfile_writer.h b/libs/audiographer/audiographer/sndfile/sndfile_writer.h index a6f338487a..7b3c2968ff 100644 --- a/libs/audiographer/audiographer/sndfile/sndfile_writer.h +++ b/libs/audiographer/audiographer/sndfile/sndfile_writer.h @@ -27,7 +27,7 @@ class SndfileWriter , public FlagDebuggable<> { public: - SndfileWriter (std::string const & path, int format, ChannelCount channels, nframes_t samplerate, boost::shared_ptr<BroadcastInfo> broadcast_info) + SndfileWriter (std::string const & path, int format, ChannelCount channels, framecnt_t samplerate, boost::shared_ptr<BroadcastInfo> broadcast_info) : SndfileHandle (path, Write, format, channels, samplerate) , path (path) { @@ -54,7 +54,7 @@ class SndfileWriter % c.channels() % channels())); } - nframes_t written = write (c.data(), c.frames()); + framecnt_t const written = write (c.data(), c.frames()); if (throw_level (ThrowProcess) && written != c.frames()) { throw Exception (*this, boost::str (boost::format ("Could not write data to output file (%1%)") diff --git a/libs/audiographer/audiographer/sndfile/tmp_file.h b/libs/audiographer/audiographer/sndfile/tmp_file.h index e312007247..a4e7b2679a 100644 --- a/libs/audiographer/audiographer/sndfile/tmp_file.h +++ b/libs/audiographer/audiographer/sndfile/tmp_file.h @@ -13,7 +13,7 @@ class TmpFile : public SndfileWriter<T>, public SndfileReader<T> { public: - TmpFile (int format, ChannelCount channels, nframes_t samplerate) + TmpFile (int format, ChannelCount channels, framecnt_t samplerate) : SndfileHandle (fileno (tmpfile()), true, SndfileBase::ReadWrite, format, channels, samplerate) {} @@ -24,4 +24,4 @@ class TmpFile : public SndfileWriter<T>, public SndfileReader<T> } // namespace -#endif // AUDIOGRAPHER_TMP_FILE_H
\ No newline at end of file +#endif // AUDIOGRAPHER_TMP_FILE_H |