Merge branch 'master' into windows
[ardour.git] / libs / ardour / sndfilesource.cc
index 8f795db111e1093a98e2087bef2ca604e8983215..1c3144f16421177f140b7da1753ec7bfaa8cf92f 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
+#include <cstring>
 #include <cerrno>
 #include <climits>
+#include <cstdarg>
 
-#include <pwd.h>
-#include <sys/utsname.h>
 #include <sys/stat.h>
 
+#ifdef PLATFORM_WINDOWS
+#include <glibmm/convert.h>
+#endif
 #include <glibmm/miscutils.h>
 
-#include <ardour/sndfilesource.h>
-#include <ardour/sndfile_helpers.h>
-#include <ardour/utils.h>
+#include "ardour/sndfilesource.h"
+#include "ardour/sndfile_helpers.h"
+#include "ardour/utils.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
-using Glib::ustring;
+using std::string;
 
 gain_t* SndFileSource::out_coefficient = 0;
 gain_t* SndFileSource::in_coefficient = 0;
-nframes_t SndFileSource::xfade_frames = 64;
-const AudioFileSource::Flag SndFileSource::default_writable_flags = AudioFileSource::Flag (AudioFileSource::Writable|
-                                                                                          AudioFileSource::Removable|
-                                                                                          AudioFileSource::RemovableIfEmpty|
-                                                                                          AudioFileSource::CanRename);
+framecnt_t SndFileSource::xfade_frames = 64;
+const Source::Flag SndFileSource::default_writable_flags = Source::Flag (
+               Source::Writable |
+               Source::Removable |
+               Source::RemovableIfEmpty |
+               Source::CanRename );
 
 SndFileSource::SndFileSource (Session& s, const XMLNode& node)
-       : AudioFileSource (s, node)
+       : Source(s, node)
+       , AudioFileSource (s, node)
 {
-       init ();
+       init_sndfile ();
 
        if (open()) {
                throw failed_constructor ();
        }
 }
 
-SndFileSource::SndFileSource (Session& s, ustring path, int chn, Flag flags)
-          /* files created this way are never writable or removable */
-       : AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
+/** Files created this way are never writable or removable */
+SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flags)
+       : Source(s, DataType::AUDIO, path, flags)
+          /* note that the origin of an external file is itself */
+       , AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
 {
        _channel = chn;
 
-       init ();
+       init_sndfile ();
 
        if (open()) {
                throw failed_constructor ();
        }
 }
 
-SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, HeaderFormat hf, nframes_t rate, Flag flags)
-       : AudioFileSource (s, path, flags, sfmt, hf)
+/** This constructor is used to construct new files, not open existing ones. */
+SndFileSource::SndFileSource (Session& s, const string& path, const string& origin,
+                              SampleFormat sfmt, HeaderFormat hf, framecnt_t rate, Flag flags)
+       : Source(s, DataType::AUDIO, path, flags)
+       , AudioFileSource (s, path, origin, flags, sfmt, hf)
 {
        int fmt = 0;
 
-       init ();
+        init_sndfile ();
 
-       /* this constructor is used to construct new files, not open
-          existing ones.
-       */
+       _file_is_new = true;
 
-       file_is_new = true;
-       
        switch (hf) {
        case CAF:
                fmt = SF_FORMAT_CAF;
@@ -122,77 +133,37 @@ 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;
        _info.samplerate = rate;
        _info.format = fmt;
 
-       if (open()) {
-               throw failed_constructor();
-       }
-
-       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 (_flags & Destructive) {
+               if (open()) {
+                       throw failed_constructor();
                }
-               
-               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;
-                       _flags = Flag (_flags & ~Broadcast);
-                       delete _broadcast_info;
-                       _broadcast_info = 0;
-               }
-               
+       } else {
+               /* normal mode: do not open the file here - do that in write_unlocked() as needed
+                */
        }
 }
 
-void 
-SndFileSource::init ()
+void
+SndFileSource::init_sndfile ()
 {
-       ustring file;
+       string file;
+
+        _descriptor = 0;
 
        // 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;
 
-       if (is_embedded()) {
-               _name = _path;
-       } else {
-               _name = Glib::path_get_basename (_path);
-       }
-
        /* although libsndfile says we don't need to set this,
           valgrind and source code shows us that we do.
        */
@@ -203,42 +174,75 @@ SndFileSource::init ()
        _capture_end = false;
        file_pos = 0;
 
-       if (destructive()) {    
+       if (destructive()) {
                xfade_buf = new Sample[xfade_frames];
-               timeline_position = header_position_offset;
+               _timeline_position = header_position_offset;
        }
 
-       AudioFileSource::HeaderPositionOffsetChanged.connect (mem_fun (*this, &SndFileSource::handle_header_position_change));
+       AudioFileSource::HeaderPositionOffsetChanged.connect_same_thread (header_position_connection, boost::bind (&SndFileSource::handle_header_position_change, this));
 }
 
 int
 SndFileSource::open ()
 {
-       if ((sf = sf_open (_path.c_str(), (writable() ? SFM_RDWR : SFM_READ), &_info)) == 0) {
-               char errbuf[256];
+       string path_to_open;
+
+#ifdef PLATFORM_WINDOWS
+       path_to_open = Glib::locale_from_utf8(_path);
+#else
+       path_to_open = _path;
+#endif
+
+       _descriptor = new SndFileDescriptor (path_to_open.c_str(), 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[1024];
                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-               error << string_compose(_("SndFileSource: cannot open file \"%1\" for %2 (%3)"), 
-                                       _path, (writable() ? "read+write" : "reading"), errbuf) << endmsg;
+#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.
+               */
+
+                cerr << "failed to open " << path_to_open << " with name " << _name << endl;
+
+               error << string_compose(_("SndFileSource: cannot open file \"%1\" for %2 (%3)"),
+                                       path_to_open, (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;
-               sf_close (sf);
-               sf = 0;
+#endif
+               delete _descriptor;
+               _descriptor = 0;
                return -1;
        }
 
        _length = _info.frames;
 
-       _broadcast_info = new SF_BROADCAST_INFO;
-       memset (_broadcast_info, 0, sizeof (*_broadcast_info));
-       
-       bool timecode_info_exists;
+       if (!_broadcast_info) {
+               _broadcast_info = new BroadcastInfo;
+       }
+
+       bool bwf_info_exists = _broadcast_info->load_from_file (sf);
 
-       set_timeline_position (get_timecode_info (sf, _broadcast_info, timecode_info_exists));
+       if (_file_is_new && _length == 0 && writable() && !bwf_info_exists) {
+               /* newly created files will not have a BWF header at this point in time.
+                * Import will have called Source::set_timeline_position() if one exists
+                * in the original. */
+               header_position_offset = _timeline_position;
+       }
+
+       /* Set our timeline position to either the time reference from a BWF header or the current
+          start of the session.
+       */
+       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);
@@ -246,125 +250,142 @@ SndFileSource::open ()
 
        if (writable()) {
                sf_command (sf, SFC_SET_UPDATE_HEADER_AUTO, 0, SF_FALSE);
-       }
 
-       return 0;
-}
+                if (_flags & Broadcast) {
 
-SndFileSource::~SndFileSource ()
-{
-       GoingAway (); /* EMIT SIGNAL */
+                        if (!_broadcast_info) {
+                                _broadcast_info = new BroadcastInfo;
+                        }
 
-       if (sf) {
-               sf_close (sf);
-               sf = 0;
+                        _broadcast_info->set_from_session (_session, header_position_offset);
+                        _broadcast_info->set_description (string_compose ("BWF %1", _name));
 
-               /* stupid libsndfile updated the headers on close,
-                  so touch the peakfile if it exists and has data
-                  to make sure its time is as new as the audio
-                  file.
-               */
+                        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_to_open, _broadcast_info->get_error())
+                                      << endmsg;
+                                _flags = Flag (_flags & ~Broadcast);
+                                delete _broadcast_info;
+                                _broadcast_info = 0;
+                        }
+                }
+        }
 
-               touch_peakfile ();
-       }
-
-       if (interleave_buf) {
-               delete [] interleave_buf;
-       }
-
-       if (_broadcast_info) {
-               delete _broadcast_info;
-       }
+        _descriptor->release ();
+        _open = true;
+       return 0;
+}
 
-       if (xfade_buf) {
-               delete [] xfade_buf;
-       }
+SndFileSource::~SndFileSource ()
+{
+       delete _descriptor;
+       delete _broadcast_info;
+       delete [] xfade_buf;
 }
 
 float
-SndFileSource::sample_rate () const 
+SndFileSource::sample_rate () const
 {
        return _info.samplerate;
 }
 
-nframes_t
-SndFileSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) 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;
-       nframes_t file_cnt;
+       framepos_t file_cnt;
+
+        if (writable() && !_open) {
+                /* file has not been opened yet - nothing written to it */
+                memset (dst, 0, sizeof (Sample) * cnt);
+                return cnt;
+        }
+
+       SNDFILE* sf = _descriptor->allocate ();
+
+       if (sf == 0) {
+               error << string_compose (_("could not allocate file %1 for reading."), _path) << endmsg;
+               return 0;
+       }
 
        if (start > _length) {
 
                /* read starts beyond end of data, just memset to zero */
-               
+
                file_cnt = 0;
 
        } else if (start + cnt > _length) {
-               
+
                /* read ends beyond end of data, read some, memset the rest */
-               
+
                file_cnt = _length - start;
 
        } else {
-               
+
                /* read is entirely within data */
 
                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);
+       }
+
        if (file_cnt) {
 
                if (sf_seek (sf, (sf_count_t) start, SEEK_SET|SFM_READ) != (sf_count_t) start) {
                        char errbuf[256];
                        sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-                       error << string_compose(_("SndFileSource: could not seek to frame %1 within %2 (%3)"), start, _name.substr (1), errbuf) << endmsg;
+                       error << string_compose(_("SndFileSource: could not seek to frame %1 within %2 (%3)"), start, _name.val().substr (1), errbuf) << endmsg;
+                       _descriptor->release ();
                        return 0;
                }
-               
+
                if (_info.channels == 1) {
-                       nframes_t ret = sf_read_float (sf, dst, file_cnt);
-                       _read_data_count = cnt * sizeof(float);
+                       framecnt_t ret = sf_read_float (sf, dst, file_cnt);
+                       if (ret != file_cnt) {
+                               char errbuf[256];
+                               sf_error_str (0, errbuf, sizeof (errbuf) - 1);
+                               error << string_compose(_("SndFileSource: @ %1 could not read %2 within %3 (%4) (len = %5, ret was %6)"), start, file_cnt, _name.val().substr (1), errbuf, _length, ret) << endl;
+                       }
+                       _descriptor->release ();
                        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;
        nread /= _info.channels;
-       
+
        /* stride through the interleaved data */
-       
+
        for (int32_t n = 0; n < nread; ++n) {
                dst[n] = *ptr;
                ptr += _info.channels;
        }
 
-       _read_data_count = cnt * sizeof(float);
-               
+       _descriptor->release ();
        return nread;
 }
 
-nframes_t 
-SndFileSource::write_unlocked (Sample *data, nframes_t cnt)
+framecnt_t
+SndFileSource::write_unlocked (Sample *data, framecnt_t cnt)
 {
+        if (!_open && open()) {
+                return 0; // failure
+        }
+
        if (destructive()) {
                return destructive_write_unlocked (data, cnt);
        } else {
@@ -372,8 +393,8 @@ SndFileSource::write_unlocked (Sample *data, nframes_t cnt)
        }
 }
 
-nframes_t 
-SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt)
+framecnt_t
+SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt)
 {
        if (!writable()) {
                warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg;
@@ -385,31 +406,25 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt)
                /*NOTREACHED*/
                return 0;
        }
-       
-       nframes_t oldlen;
+
        int32_t frame_pos = _length;
 
        if (write_float (data, frame_pos, cnt) != cnt) {
                return 0;
        }
 
-       oldlen = _length;
-       update_length (oldlen, cnt);
+       update_length (_length + 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;
 }
 
-nframes_t
-SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
+framecnt_t
+SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt)
 {
-       nframes_t old_file_pos;
-
        if (!writable()) {
                warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg;
                return 0;
@@ -423,28 +438,28 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
 
                _capture_start = false;
                _capture_end = false;
-               
+
                /* move to the correct location place */
-               file_pos = capture_start_frame - timeline_position;
-               
+               file_pos = capture_start_frame - _timeline_position;
+
                // split cnt in half
-               nframes_t subcnt = cnt / 2;
-               nframes_t ofilepos = file_pos;
-               
+               framecnt_t subcnt = cnt / 2;
+               framecnt_t ofilepos = file_pos;
+
                // fade in
                if (crossfade (data, subcnt, 1) != subcnt) {
                        return 0;
                }
-               
+
                file_pos += subcnt;
                Sample * tmpdata = data + subcnt;
-               
+
                // fade out
                subcnt = cnt - subcnt;
                if (crossfade (tmpdata, subcnt, 0) != subcnt) {
                        return 0;
                }
-               
+
                file_pos = ofilepos; // adjusted below
 
        } else if (_capture_start) {
@@ -455,14 +470,14 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
 
                _capture_start = false;
                _capture_end = false;
-               
+
                /* move to the correct location place */
-               file_pos = capture_start_frame - timeline_position;
+               file_pos = capture_start_frame - _timeline_position;
 
                if (crossfade (data, cnt, 1) != cnt) {
                        return 0;
                }
-               
+
        } else if (_capture_end) {
 
                /* end of capture both occur within the data we are writing,
@@ -471,7 +486,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
 
                _capture_start = false;
                _capture_end = false;
-               
+
                if (crossfade (data, cnt, 0) != cnt) {
                        return 0;
                }
@@ -485,28 +500,27 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
                }
        }
 
-       old_file_pos = file_pos;
-       update_length (file_pos, 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;
-       
+
        return cnt;
 }
 
 int
-SndFileSource::update_header (nframes_t when, struct tm& now, time_t tnow)
-{      
+SndFileSource::update_header (framepos_t when, struct tm& now, time_t tnow)
+{
        set_timeline_position (when);
 
        if (_flags & Broadcast) {
                if (setup_broadcast_info (when, now, tnow)) {
                        return -1;
                }
-       } 
+       }
 
        return flush_header ();
 }
@@ -514,60 +528,88 @@ SndFileSource::update_header (nframes_t when, struct tm& now, time_t tnow)
 int
 SndFileSource::flush_header ()
 {
-       if (!writable() || (sf == 0)) {
+       if (!writable()) {
                warning << string_compose (_("attempt to flush a non-writable audio file source (%1)"), _path) << endmsg;
                return -1;
        }
-       return (sf_command (sf, SFC_UPDATE_HEADER_NOW, 0, 0) != SF_TRUE);
+
+        if (!_open) {
+               warning << string_compose (_("attempt to flush an un-opened audio file source (%1)"), _path) << endmsg;
+               return -1;
+        }
+
+       SNDFILE* sf = _descriptor->allocate ();
+       if (sf == 0) {
+               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 ();
+
+       return r;
+}
+
+void
+SndFileSource::flush ()
+{
+       if (!_open) {
+               warning << string_compose (_("attempt to flush an un-opened audio file source (%1)"), _path) << endmsg;
+               return;
+       }
+
+       if (!writable()) {
+               warning << string_compose (_("attempt to flush a non-writable audio file source (%1)"), _path) << endmsg;
+               return;
+       }
+
+       SNDFILE* sf = _descriptor->allocate ();
+       if (sf == 0) {
+               error << string_compose (_("could not allocate file %1 to flush contents"), _path) << endmsg;
+               return;
+       }
+
+       // Hopefully everything OK
+       sf_write_sync (sf);
+       _descriptor->release ();
 }
 
 int
-SndFileSource::setup_broadcast_info (nframes_t when, struct tm& now, time_t tnow)
+SndFileSource::setup_broadcast_info (framepos_t /*when*/, struct tm& now, time_t /*tnow*/)
 {
        if (!writable()) {
                warning << string_compose (_("attempt to store broadcast info in a non-writable audio file source (%1)"), _path) << endmsg;
                return -1;
        }
 
+        if (!_open) {
+               warning << string_compose (_("attempt to set BWF info for an un-opened audio file source (%1)"), _path) << endmsg;
+               return -1;
+        }
+
        if (!(_flags & Broadcast)) {
                return 0;
        }
 
-       /* random code is 9 digits */
-       
-       int random_code = random() % 999999999;
-       
-       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);
+       _broadcast_info->set_originator_ref_from_session (_session);
+       _broadcast_info->set_origination_time (&now);
 
        /* 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;
+       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())
+                     << endmsg;
                _flags = Flag (_flags & ~Broadcast);
                delete _broadcast_info;
                _broadcast_info = 0;
-               return -1;
        }
 
+       _descriptor->release ();
        return 0;
 }
 
@@ -578,53 +620,63 @@ 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;
+       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())
+                     << endmsg;
                _flags = Flag (_flags & ~Broadcast);
                delete _broadcast_info;
                _broadcast_info = 0;
        }
+
+       _descriptor->release ();
 }
 
-nframes_t
-SndFileSource::write_float (Sample* data, nframes_t frame_pos, nframes_t cnt)
+framecnt_t
+SndFileSource::write_float (Sample* data, framepos_t frame_pos, framecnt_t cnt)
 {
-       if (sf_seek (sf, frame_pos, SEEK_SET|SFM_WRITE) < 0) {
+       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);
-               error << string_compose (_("%1: cannot seek to %2 (libsndfile error: %3"), _path, frame_pos, errbuf) << endmsg;
+               error << string_compose (_("%1: cannot seek to %2 (libsndfile error: %3)"), _path, frame_pos, errbuf) << endmsg;
+               _descriptor->release ();
                return 0;
        }
-       
+
        if (sf_writef_float (sf, data, cnt) != (ssize_t) cnt) {
+               _descriptor->release ();
                return 0;
        }
-       
+
+       _descriptor->release ();
        return cnt;
 }
 
-nframes_t
+framepos_t
 SndFileSource::natural_position() const
 {
-       return timeline_position;
+       return _timeline_position;
 }
 
 bool
 SndFileSource::set_destructive (bool yn)
 {
        if (yn) {
-               _flags = Flag (_flags | Destructive);
+               _flags = Flag (_flags | Writable | Destructive);
                if (!xfade_buf) {
                        xfade_buf = new Sample[xfade_frames];
                }
                clear_capture_marks ();
-               timeline_position = header_position_offset;
+               _timeline_position = header_position_offset;
        } else {
                _flags = Flag (_flags & ~Destructive);
-               timeline_position = 0;
+               _timeline_position = 0;
                /* leave xfade buf alone in case we need it again later */
        }
 
@@ -636,13 +688,14 @@ SndFileSource::clear_capture_marks ()
 {
        _capture_start = false;
        _capture_end = false;
-}      
+}
 
+/** @param pos Capture start position in session frames */
 void
-SndFileSource::mark_capture_start (nframes_t pos)
+SndFileSource::mark_capture_start (framepos_t pos)
 {
        if (destructive()) {
-               if (pos < timeline_position) {
+               if (pos < _timeline_position) {
                        _capture_start = false;
                } else {
                        _capture_start = true;
@@ -659,15 +712,15 @@ SndFileSource::mark_capture_end()
        }
 }
 
-nframes_t
-SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
+framecnt_t
+SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in)
 {
-       nframes_t xfade = min (xfade_frames, cnt);
-       nframes_t nofade = cnt - xfade;
+       framecnt_t xfade = min (xfade_frames, cnt);
+       framecnt_t nofade = cnt - xfade;
        Sample* fade_data = 0;
-       nframes_t fade_position = 0; // in frames
+       framepos_t fade_position = 0; // in frames
        ssize_t retval;
-       nframes_t file_cnt;
+       framecnt_t file_cnt;
 
        if (fade_in) {
                fade_position = file_pos;
@@ -678,26 +731,26 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
        }
 
        if (fade_position > _length) {
-               
+
                /* read starts beyond end of data, just memset to zero */
-               
+
                file_cnt = 0;
 
        } else if (fade_position + xfade > _length) {
-               
+
                /* read ends beyond end of data, read some, memset the rest */
-               
+
                file_cnt = _length - fade_position;
 
        } else {
-               
+
                /* read is entirely within data */
 
                file_cnt = xfade;
        }
 
        if (file_cnt) {
-               
+
                if ((retval = read_unlocked (xfade_buf, fade_position, file_cnt)) != (ssize_t) file_cnt) {
                        if (retval >= 0 && errno == EAGAIN) {
                                /* XXX - can we really trust that errno is meaningful here?  yes POSIX, i'm talking to you.
@@ -708,13 +761,13 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
                                return 0;
                        }
                }
-       } 
+       }
 
        if (file_cnt != xfade) {
-               nframes_t delta = xfade - file_cnt;
+               framecnt_t delta = xfade - file_cnt;
                memset (xfade_buf+file_cnt, 0, sizeof (Sample) * delta);
        }
-       
+
        if (nofade && !fade_in) {
                if (write_float (data, file_pos, nofade) != nofade) {
                        error << string_compose(_("SndFileSource: \"%1\" bad write (%2)"), _path, strerror (errno)) << endmsg;
@@ -724,14 +777,14 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
 
        if (xfade == xfade_frames) {
 
-               nframes_t n;
+               framecnt_t n;
 
                /* use the standard xfade curve */
-               
+
                if (fade_in) {
 
                        /* fade new material in */
-                       
+
                        for (n = 0; n < xfade; ++n) {
                                xfade_buf[n] = (xfade_buf[n] * out_coefficient[n]) + (fade_data[n] * in_coefficient[n]);
                        }
@@ -740,7 +793,7 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
 
 
                        /* fade new material out */
-                       
+
                        for (n = 0; n < xfade; ++n) {
                                xfade_buf[n] = (xfade_buf[n] * in_coefficient[n]) + (fade_data[n] * out_coefficient[n]);
                        }
@@ -748,15 +801,15 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
 
        } else if (xfade < xfade_frames) {
 
-               gain_t in[xfade];
-               gain_t out[xfade];
+               std::vector<gain_t> in(xfade);
+               std::vector<gain_t> out(xfade);
 
                /* short xfade, compute custom curve */
 
-               compute_equal_power_fades (xfade, in, out);
+               compute_equal_power_fades (xfade, &in[0], &out[0]);
 
-               for (nframes_t n = 0; n < xfade; ++n) {
-                       xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]);                
+               for (framecnt_t n = 0; n < xfade; ++n) {
+                       xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]);
                }
 
        } else if (xfade) {
@@ -771,7 +824,7 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
                        return 0;
                }
        }
-       
+
        if (fade_in && nofade) {
                if (write_float (data + xfade, file_pos + xfade, nofade) != nofade) {
                        error << string_compose(_("SndFileSource: \"%1\" bad write (%2)"), _path, strerror (errno)) << endmsg;
@@ -782,7 +835,7 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
        return cnt;
 }
 
-nframes_t
+framepos_t
 SndFileSource::last_capture_start_frame () const
 {
        if (destructive()) {
@@ -800,28 +853,23 @@ SndFileSource::handle_header_position_change ()
                        error << string_compose(_("Filesource: start time is already set for existing file (%1): Cannot change start time."), _path ) << endmsg;
                        //in the future, pop up a dialog here that allows user to regenerate file with new start offset
                } else if (writable()) {
-                       timeline_position = header_position_offset;
+                       _timeline_position = header_position_offset;
                        set_header_timeline_position ();  //this will get flushed if/when the file is recorded to
                }
        }
 }
 
 void
-SndFileSource::setup_standard_crossfades (nframes_t rate)
+SndFileSource::setup_standard_crossfades (Session const & s, framecnt_t rate)
 {
        /* This static method is assumed to have been called by the Session
           before any DFS's are created.
        */
 
-       xfade_frames = (nframes_t) floor ((Config->get_destructive_xfade_msecs () / 1000.0) * rate);
+       xfade_frames = (framecnt_t) floor ((s.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];
@@ -830,28 +878,27 @@ SndFileSource::setup_standard_crossfades (nframes_t rate)
 }
 
 void
-SndFileSource::set_timeline_position (int64_t pos)
+SndFileSource::set_timeline_position (framepos_t pos)
 {
        // destructive track timeline postion does not change
-       // except at instantion or when header_position_offset 
+       // except at instantion or when header_position_offset
        // (session start) changes
 
        if (!destructive()) {
                AudioFileSource::set_timeline_position (pos);
-       } 
+       }
 }
 
 int
-SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, string& error_msg)
+SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, string& error_msg)
 {
        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().
 
-       if ((sf = sf_open ((char*) path.c_str(), SFM_READ, &sf_info)) == 0) { 
+       if ((sf = sf_open (const_cast<char*>(path.c_str()), SFM_READ, &sf_info)) == 0) {
                char errbuf[256];
                error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
                return false;
@@ -860,43 +907,56 @@ SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, str
        info.samplerate  = sf_info.samplerate;
        info.channels    = sf_info.channels;
        info.length      = sf_info.frames;
-       info.format_name = string_compose("Format: %1, %2",
-                                          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);
+        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 {
+                info.format_name = string_compose("%1\n%2", major, minor);
+        }
+
+       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)
+bool
+SndFileSource::one_of_several_channels () const
 {
-       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;
+       return _info.channels > 1;
 }
 
 bool
-SndFileSource::one_of_several_channels () const
+SndFileSource::clamped_at_unity () const
 {
-       return _info.channels > 1;
+       int const type = _info.format & SF_FORMAT_TYPEMASK;
+       int const sub = _info.format & SF_FORMAT_SUBMASK;
+       /* XXX: this may not be the full list of formats that are unclamped */
+       return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE && type != SF_FORMAT_OGG);
+}
+
+void
+SndFileSource::file_closed ()
+{
+       /* stupid libsndfile updated the headers on close,
+          so touch the peakfile if it exists and has data
+          to make sure its time is as new as the audio
+          file.
+       */
+
+       touch_peakfile ();
+}
+
+void
+SndFileSource::set_path (const string& p)
+{
+        FileSource::set_path (p);
+
+        if (_descriptor) {
+                _descriptor->set_path (_path);
+        }
 }