Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...
[ardour.git] / libs / ardour / sndfilesource.cc
index 8f795db111e1093a98e2087bef2ca604e8983215..b35d36a71333664e49b0992c51f737df24196f3a 100644 (file)
 
 */
 
+#include <cstring>
 #include <cerrno>
 #include <climits>
+#include <cstdarg>
 
 #include <pwd.h>
 #include <sys/utsname.h>
@@ -29,6 +31,7 @@
 #include <ardour/sndfilesource.h>
 #include <ardour/sndfile_helpers.h>
 #include <ardour/utils.h>
+#include <ardour/version.h>
 
 #include "i18n.h"
 
@@ -80,7 +83,7 @@ SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, Heade
        */
 
        file_is_new = true;
-       
+
        switch (hf) {
        case CAF:
                fmt = SF_FORMAT_CAF;
@@ -122,6 +125,10 @@ SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, Heade
        case FormatInt24:
                fmt |= SF_FORMAT_PCM_24;
                break;
+
+       case FormatInt16:
+               fmt |= SF_FORMAT_PCM_16;
+               break;
        }
        
        _info.channels = 1;
@@ -134,44 +141,21 @@ SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, Heade
 
        if (writable() && (_flags & Broadcast)) {
 
-               _broadcast_info = new SF_BROADCAST_INFO;
-               memset (_broadcast_info, 0, sizeof (*_broadcast_info));
-               
-               snprintf (_broadcast_info->description, sizeof (_broadcast_info->description), "BWF %s", _name.c_str());
-               
-               struct utsname utsinfo;
-
-               if (uname (&utsinfo)) {
-                       error << string_compose(_("FileSource: cannot get host information for BWF header (%1)"), strerror(errno)) << endmsg;
-                       return;
+               if (!_broadcast_info) {
+                       _broadcast_info = new BroadcastInfo;
                }
-               
-               snprintf (_broadcast_info->originator, sizeof (_broadcast_info->originator), "ardour:%s:%s:%s:%s:%s)", 
-                         Glib::get_real_name().c_str(),
-                         utsinfo.nodename,
-                         utsinfo.sysname,
-                         utsinfo.release,
-                         utsinfo.version);
-               
-               _broadcast_info->version = 1;  
-               _broadcast_info->time_reference_low = 0;  
-               _broadcast_info->time_reference_high = 0;  
-               
-               /* XXX do something about this field */
-               
-               snprintf (_broadcast_info->umid, sizeof (_broadcast_info->umid), "%s", "fnord");
-               
-               /* coding history is added by libsndfile */
 
-               if (sf_command (sf, SFC_SET_BROADCAST_INFO, _broadcast_info, sizeof (_broadcast_info)) != SF_TRUE) {
-                       char errbuf[256];
-                       sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-                       error << string_compose (_("cannot set broadcast info for audio file %1 (%2); dropping broadcast info for this file"), _path, errbuf) << endmsg;
+               _broadcast_info->set_from_session (s, 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())
+                             << endmsg;
                        _flags = Flag (_flags & ~Broadcast);
                        delete _broadcast_info;
                        _broadcast_info = 0;
                }
-               
        }
 }
 
@@ -182,8 +166,6 @@ SndFileSource::init ()
 
        // lets try to keep the object initalizations here at the top
        xfade_buf = 0;
-       interleave_buf = 0;
-       interleave_bufsize = 0;
        sf = 0;
        _broadcast_info = 0;
 
@@ -217,13 +199,21 @@ SndFileSource::open ()
        if ((sf = sf_open (_path.c_str(), (writable() ? SFM_RDWR : SFM_READ), &_info)) == 0) {
                char errbuf[256];
                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
+#ifndef HAVE_COREAUDIO
+               /* if we have CoreAudio, we will be falling back to that if libsndfile fails,
+                  so we don't want to see this message.
+               */
+
                error << string_compose(_("SndFileSource: cannot open file \"%1\" for %2 (%3)"), 
                                        _path, (writable() ? "read+write" : "reading"), errbuf) << endmsg;
+#endif
                return -1;
        }
 
        if (_channel >= _info.channels) {
+#ifndef HAVE_COREAUDIO
                error << string_compose(_("SndFileSource: file only contains %1 channels; %2 is invalid as a channel number"), _info.channels, _channel) << endmsg;
+#endif
                sf_close (sf);
                sf = 0;
                return -1;
@@ -231,14 +221,15 @@ SndFileSource::open ()
 
        _length = _info.frames;
 
-       _broadcast_info = new SF_BROADCAST_INFO;
-       memset (_broadcast_info, 0, sizeof (*_broadcast_info));
+       if (!_broadcast_info) {
+               _broadcast_info = new BroadcastInfo;
+       }
        
-       bool timecode_info_exists;
+       bool bwf_info_exists = _broadcast_info->load_from_file (sf);
 
-       set_timeline_position (get_timecode_info (sf, _broadcast_info, timecode_info_exists));
+       set_timeline_position (bwf_info_exists ? _broadcast_info->get_time_reference() : header_position_offset);
 
-       if (!timecode_info_exists) {
+       if (_length != 0 && !bwf_info_exists) {
                delete _broadcast_info;
                _broadcast_info = 0;
                _flags = Flag (_flags & ~Broadcast);
@@ -268,17 +259,8 @@ SndFileSource::~SndFileSource ()
                touch_peakfile ();
        }
 
-       if (interleave_buf) {
-               delete [] interleave_buf;
-       }
-
-       if (_broadcast_info) {
-               delete _broadcast_info;
-       }
-
-       if (xfade_buf) {
-               delete [] xfade_buf;
-       }
+       delete _broadcast_info;
+       delete [] xfade_buf;
 }
 
 float
@@ -314,6 +296,11 @@ SndFileSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const
                file_cnt = cnt;
        }
        
+       if (file_cnt != cnt) {
+               nframes_t delta = cnt - file_cnt;
+               memset (dst+file_cnt, 0, sizeof (Sample) * delta);
+       }
+
        if (file_cnt) {
 
                if (sf_seek (sf, (sf_count_t) start, SEEK_SET|SFM_READ) != (sf_count_t) start) {
@@ -325,26 +312,19 @@ SndFileSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const
                
                if (_info.channels == 1) {
                        nframes_t ret = sf_read_float (sf, dst, file_cnt);
-                       _read_data_count = cnt * sizeof(float);
+                       _read_data_count = ret * sizeof(float);
+                       if (ret != file_cnt) {
+                               char errbuf[256];
+                               sf_error_str (0, errbuf, sizeof (errbuf) - 1);
+                               cerr << string_compose(_("SndFileSource: @ %1 could not read %2 within %3 (%4) (len = %5)"), start, file_cnt, _name.substr (1), errbuf, _length) << endl;
+                       }
                        return ret;
                }
        }
 
-       if (file_cnt != cnt) {
-               nframes_t delta = cnt - file_cnt;
-               memset (dst+file_cnt, 0, sizeof (Sample) * delta);
-       }
-
        real_cnt = cnt * _info.channels;
 
-       if (interleave_bufsize < real_cnt) {
-               
-               if (interleave_buf) {
-                       delete [] interleave_buf;
-               }
-               interleave_bufsize = real_cnt;
-               interleave_buf = new float[interleave_bufsize];
-       }
+       Sample* interleave_buf = get_interleave_buffer (real_cnt);
        
        nread = sf_read_float (sf, interleave_buf, real_cnt);
        ptr = interleave_buf + _channel;
@@ -397,11 +377,11 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt)
        update_length (oldlen, cnt);
 
        if (_build_peakfiles) {
-               compute_and_write_peaks (data, frame_pos, cnt, false);
+               compute_and_write_peaks (data, frame_pos, cnt, false, true);
        }
 
        _write_data_count = cnt;
-       
+
        return cnt;
 }
 
@@ -489,7 +469,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
        update_length (file_pos, cnt);
 
        if (_build_peakfiles) {
-               compute_and_write_peaks (data, file_pos, cnt, false);
+               compute_and_write_peaks (data, file_pos, cnt, false, true);
        }
 
        file_pos += cnt;
@@ -533,39 +513,20 @@ SndFileSource::setup_broadcast_info (nframes_t when, struct tm& now, time_t tnow
                return 0;
        }
 
-       /* random code is 9 digits */
-       
-       int random_code = random() % 999999999;
+       _broadcast_info->set_originator_ref ();
+       _broadcast_info->set_origination_time (&now);
        
-       snprintf (_broadcast_info->originator_reference, sizeof (_broadcast_info->originator_reference), "%2s%3s%12s%02d%02d%02d%9d",
-                 Config->get_bwf_country_code().c_str(),
-                 Config->get_bwf_organization_code().c_str(),
-                 bwf_serial_number,
-                 now.tm_hour,
-                 now.tm_min,
-                 now.tm_sec,
-                 random_code);
-       
-       snprintf (_broadcast_info->origination_date, sizeof (_broadcast_info->origination_date), "%4d-%02d-%02d",
-                 1900 + now.tm_year,
-                 now.tm_mon,
-                 now.tm_mday);
-       
-       snprintf (_broadcast_info->origination_time, sizeof (_broadcast_info->origination_time), "%02d:%02d:%02d",
-                 now.tm_hour,
-                 now.tm_min,
-                 now.tm_sec);
-
        /* now update header position taking header offset into account */
        
        set_header_timeline_position ();
 
-       if (sf_command (sf, SFC_SET_BROADCAST_INFO, _broadcast_info, sizeof (*_broadcast_info)) != SF_TRUE) {
-               error << string_compose (_("cannot set broadcast info for audio file %1; Dropping broadcast info for this file"), _path) << endmsg;
+       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())
+                     << endmsg;
                _flags = Flag (_flags & ~Broadcast);
                delete _broadcast_info;
                _broadcast_info = 0;
-               return -1;
        }
 
        return 0;
@@ -578,11 +539,12 @@ SndFileSource::set_header_timeline_position ()
                return;
        }
 
-       _broadcast_info->time_reference_high = (timeline_position >> 32);
-       _broadcast_info->time_reference_low = (timeline_position & 0xffffffff);
+       _broadcast_info->set_time_reference (timeline_position);
 
-       if (sf_command (sf, SFC_SET_BROADCAST_INFO, _broadcast_info, sizeof (*_broadcast_info)) != SF_TRUE) {
-               error << string_compose (_("cannot set broadcast info for audio file %1; Dropping broadcast info for this file"), _path) << endmsg;
+       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())
+                     << endmsg;
                _flags = Flag (_flags & ~Broadcast);
                delete _broadcast_info;
                _broadcast_info = 0;
@@ -815,13 +777,8 @@ SndFileSource::setup_standard_crossfades (nframes_t rate)
 
        xfade_frames = (nframes_t) floor ((Config->get_destructive_xfade_msecs () / 1000.0) * rate);
 
-       if (out_coefficient) {
-               delete [] out_coefficient;
-       }
-
-       if (in_coefficient) {
-               delete [] in_coefficient;
-       }
+       delete [] out_coefficient;
+       delete [] in_coefficient;
 
        out_coefficient = new gain_t[xfade_frames];
        in_coefficient = new gain_t[xfade_frames];
@@ -846,8 +803,7 @@ SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, str
 {
        SNDFILE *sf;
        SF_INFO sf_info;
-       SF_BROADCAST_INFO binfo;
-       bool timecode_exists;
+       BroadcastInfo binfo;
 
        sf_info.format = 0; // libsndfile says to clear this before sf_open().
 
@@ -864,39 +820,16 @@ SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, str
                                           sndfile_major_format(sf_info.format),
                                           sndfile_minor_format(sf_info.format));
 
-       memset (&binfo, 0, sizeof (binfo));
-       info.timecode  = get_timecode_info (sf, &binfo, timecode_exists);
+       info.timecode = binfo.load_from_file (sf) ? binfo.get_time_reference() : 0;
 
-       if (!timecode_exists) {
-               info.timecode = 0;
-       }
-       
        sf_close (sf);
 
        return true;
 }
 
-int64_t
-SndFileSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binfo, bool& exists)
-{
-       if (sf_command (sf, SFC_GET_BROADCAST_INFO, binfo, sizeof (*binfo)) != SF_TRUE) {
-               exists = false;
-               return (header_position_offset);
-       } 
-       
-       /* XXX 64 bit alert: when JACK switches to a 64 bit frame count, this needs to use the high bits
-          of the time reference.
-       */
-       
-       exists = true;
-       int64_t ret = (uint32_t) binfo->time_reference_high;
-       ret <<= 32;
-       ret |= (uint32_t) binfo->time_reference_low;
-       return ret;
-}
-
 bool
 SndFileSource::one_of_several_channels () const
 {
        return _info.channels > 1;
 }
+