Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

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

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 8fad3b37059873a1c1d291ada94d4859d7ccb509..ee4d976f160472fd3f3c2cdef9a20ddaa932e683 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -143,7 +143,7 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig
        _info.channels = 1;
        _info.samplerate = rate;
        _info.format = fmt;
-        
+
         /* do not open the file here - do that in write_unlocked() as needed
          */
 }
@@ -183,7 +183,7 @@ SndFileSource::open ()
        _descriptor = new SndFileDescriptor (_path, writable(), &_info);
        _descriptor->Closed.connect_same_thread (file_manager_connection, boost::bind (&SndFileSource::file_closed, this));
        SNDFILE* sf = _descriptor->allocate ();
-       
+
        if (sf == 0) {
                char errbuf[256];
                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
@@ -227,16 +227,16 @@ SndFileSource::open ()
 
        if (writable()) {
                sf_command (sf, SFC_SET_UPDATE_HEADER_AUTO, 0, SF_FALSE);
-                
+
                 if (_flags & Broadcast) {
-                        
+
                         if (!_broadcast_info) {
                                 _broadcast_info = new BroadcastInfo;
                         }
-                        
+
                         _broadcast_info->set_from_session (_session, header_position_offset);
                         _broadcast_info->set_description (string_compose ("BWF %1", _name));
-                        
+
                         if (!_broadcast_info->write_to_file (sf)) {
                                 error << string_compose (_("cannot set broadcast info for audio file %1 (%2); dropping broadcast info for this file"),
                                                          _path, _broadcast_info->get_error())
@@ -269,6 +269,8 @@ SndFileSource::sample_rate () const
 framecnt_t
 SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const
 {
+       assert (cnt >= 0);
+       
        int32_t nread;
        float *ptr;
        uint32_t real_cnt;
@@ -306,6 +308,8 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con
                file_cnt = cnt;
        }
 
+       assert (file_cnt >= 0);
+
        if (file_cnt != cnt) {
                framepos_t delta = cnt - file_cnt;
                memset (dst+file_cnt, 0, sizeof (Sample) * delta);
@@ -323,7 +327,6 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con
 
                if (_info.channels == 1) {
                        framecnt_t ret = sf_read_float (sf, dst, file_cnt);
-                       _read_data_count = ret * sizeof(float);
                        if (ret != file_cnt) {
                                char errbuf[256];
                                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
@@ -349,8 +352,6 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con
                ptr += _info.channels;
        }
 
-       _read_data_count = cnt * sizeof(float);
-
        _descriptor->release ();
        return nread;
 }
@@ -397,16 +398,12 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt)
                compute_and_write_peaks (data, frame_pos, cnt, false, true);
        }
 
-       _write_data_count = cnt;
-
        return cnt;
 }
 
 framecnt_t
 SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt)
 {
-       framepos_t old_file_pos;
-
        if (!writable()) {
                warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg;
                return 0;
@@ -482,7 +479,6 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt)
                }
        }
 
-       old_file_pos = file_pos;
        update_length (file_pos, cnt);
 
        if (_build_peakfiles) {
@@ -526,7 +522,7 @@ SndFileSource::flush_header ()
                error << string_compose (_("could not allocate file %1 to write header"), _path) << endmsg;
                return -1;
        }
-       
+
        int const r = sf_command (sf, SFC_UPDATE_HEADER_NOW, 0, 0) != SF_TRUE;
        _descriptor->release ();
 
@@ -582,7 +578,7 @@ SndFileSource::set_header_timeline_position ()
        _broadcast_info->set_time_reference (_timeline_position);
 
        SNDFILE* sf = _descriptor->allocate ();
-       
+
        if (sf == 0 || !_broadcast_info->write_to_file (sf)) {
                error << string_compose (_("cannot set broadcast info for audio file %1 (%2); dropping broadcast info for this file"),
                                           _path, _broadcast_info->get_error())
@@ -599,7 +595,7 @@ framecnt_t
 SndFileSource::write_float (Sample* data, framepos_t frame_pos, framecnt_t cnt)
 {
        SNDFILE* sf = _descriptor->allocate ();
-       
+
        if (sf == 0 || sf_seek (sf, frame_pos, SEEK_SET|SFM_WRITE) < 0) {
                char errbuf[256];
                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
@@ -770,7 +766,7 @@ SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in)
                for (framecnt_t n = 0; n < xfade; ++n) {
                        xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]);
                }
-               
+
        } else if (xfade) {
 
                /* long xfade length, has to be computed across several calls */
@@ -866,10 +862,10 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri
        info.samplerate  = sf_info.samplerate;
        info.channels    = sf_info.channels;
        info.length      = sf_info.frames;
-        
+
         string major = sndfile_major_format(sf_info.format);
         string minor = sndfile_minor_format(sf_info.format);
-        
+
         if (major.length() + minor.length() < 16) { /* arbitrary */
                 info.format_name = string_compose("%1/%2", major, minor);
         } else {
@@ -906,7 +902,7 @@ SndFileSource::file_closed ()
           to make sure its time is as new as the audio
           file.
        */
-       
+
        touch_peakfile ();
 }