Remove wrong asserts

[ardour.git] / libs / ardour / resampled_source.cc

diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc
index ca59d20b58b8f00c6be7477f230d64a6d5e245b6..24eb12ad23bf0b2f206348e96354f5688b4e0331 100644 (file)
--- a/libs/ardour/resampled_source.cc
+++ b/libs/ardour/resampled_source.cc
@@ -21,7 +21,7 @@
 #include "ardour/resampled_source.h"
 #include "pbd/failed_constructor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -73,7 +73,7 @@ framecnt_t
 ResampledImportableSource::read (Sample* output, framecnt_t nframes)
 {
        int err;
-       size_t bs = floor (blocksize / source->channels()) *  source->channels();
+       size_t bs = floor ((float)(blocksize / source->channels())) *  source->channels();
 
        /* If the input buffer is empty, refill it. */
        if (_src_data.input_frames == 0) {
@@ -81,7 +81,7 @@ ResampledImportableSource::read (Sample* output, framecnt_t nframes)
                _src_data.input_frames = source->read (_input, bs);
 
                /* The last read will not be a full buffer, so set end_of_input. */
-               if ((framecnt_t) _src_data.input_frames < bs) {
+               if ((size_t) _src_data.input_frames < bs) {
                        _end_of_input = true;
                }