diff options
author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/audiographer/src/general/sample_format_converter.cc | |
parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff) |
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/audiographer/src/general/sample_format_converter.cc')
-rw-r--r-- | libs/audiographer/src/general/sample_format_converter.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/audiographer/src/general/sample_format_converter.cc b/libs/audiographer/src/general/sample_format_converter.cc index a827f67078..a1aa4d88a9 100644 --- a/libs/audiographer/src/general/sample_format_converter.cc +++ b/libs/audiographer/src/general/sample_format_converter.cc @@ -21,7 +21,7 @@ SampleFormatConverter<TOut>::SampleFormatConverter (ChannelCount channels) : template <> void -SampleFormatConverter<float>::init (nframes_t max_frames, int /* type */, int data_width) +SampleFormatConverter<float>::init (framecnt_t max_frames, int /* type */, int data_width) { if (throw_level (ThrowObject) && data_width != 32) { throw Exception (*this, "Unsupported data width"); @@ -32,7 +32,7 @@ SampleFormatConverter<float>::init (nframes_t max_frames, int /* type */, int da template <> void -SampleFormatConverter<int32_t>::init (nframes_t max_frames, int type, int data_width) +SampleFormatConverter<int32_t>::init (framecnt_t max_frames, int type, int data_width) { if(throw_level (ThrowObject) && data_width < 24) { throw Exception (*this, "Trying to use SampleFormatConverter<int32_t> for data widths < 24"); @@ -51,7 +51,7 @@ SampleFormatConverter<int32_t>::init (nframes_t max_frames, int type, int data_w template <> void -SampleFormatConverter<int16_t>::init (nframes_t max_frames, int type, int data_width) +SampleFormatConverter<int16_t>::init (framecnt_t max_frames, int type, int data_width) { if (throw_level (ThrowObject) && data_width != 16) { throw Exception (*this, "Unsupported data width"); @@ -62,7 +62,7 @@ SampleFormatConverter<int16_t>::init (nframes_t max_frames, int type, int data_w template <> void -SampleFormatConverter<uint8_t>::init (nframes_t max_frames, int type, int data_width) +SampleFormatConverter<uint8_t>::init (framecnt_t max_frames, int type, int data_width) { if (throw_level (ThrowObject) && data_width != 8) { throw Exception (*this, "Unsupported data width"); @@ -73,7 +73,7 @@ SampleFormatConverter<uint8_t>::init (nframes_t max_frames, int type, int data_w template <typename TOut> void -SampleFormatConverter<TOut>::init_common (nframes_t max_frames ) +SampleFormatConverter<TOut>::init_common (framecnt_t max_frames) { reset(); if (max_frames > data_out_size) { @@ -141,11 +141,11 @@ template<> void SampleFormatConverter<float>::process (ProcessContext<float> & c_in) { - nframes_t frames = c_in.frames(); + framecnt_t frames = c_in.frames(); float * data = c_in.data(); if (clip_floats) { - for (nframes_t x = 0; x < frames; ++x) { + for (framecnt_t x = 0; x < frames; ++x) { if (data[x] > 1.0f) { data[x] = 1.0f; } else if (data[x] < -1.0f) { @@ -172,7 +172,7 @@ SampleFormatConverter<float>::process (ProcessContext<float> const & c_in) template<typename TOut> void -SampleFormatConverter<TOut>::check_frame_and_channel_count(nframes_t frames, ChannelCount channels_) +SampleFormatConverter<TOut>::check_frame_and_channel_count (framecnt_t frames, ChannelCount channels_) { if (throw_level (ThrowStrict) && channels_ != channels) { throw Exception (*this, boost::str (boost::format |