X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfilesource.cc;h=d9d428a4cb8ae098e6827d67e635904b037f6e73;hb=7d96960b162d25da87c388a3083775e8770bba56;hp=296f7471ad78dde27021c188a956e11ce53a823a;hpb=7e277f96d78f56073cd2021dc1c0305cdabd3d90;p=ardour.git diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 296f7471ad..d9d428a4cb 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -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 @@ -15,11 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + +#include #include #include +#include #include #include @@ -27,60 +32,66 @@ #include -#include -#include -#include +#include "ardour/sndfilesource.h" +#include "ardour/sndfile_helpers.h" +#include "ardour/utils.h" +#include "ardour/version.h" +#include "ardour/rc_configuration.h" +#include "ardour/session.h" #include "i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; +using Glib::ustring; 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); +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, string 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 ustring& path, int chn, Flag flags) + : Source(s, DataType::AUDIO, path, flags) + , AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) { - channel = chn; + _channel = chn; - init (); + init_sndfile (); if (open()) { throw failed_constructor (); } } -SndFileSource::SndFileSource (Session& s, string 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 ustring& path, + SampleFormat sfmt, HeaderFormat hf, nframes_t rate, Flag flags) + : Source(s, DataType::AUDIO, path, flags) + , AudioFileSource (s, path, 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,8 +133,12 @@ SndFileSource::SndFileSource (Session& s, string path, SampleFormat sfmt, Header 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; @@ -134,65 +149,34 @@ SndFileSource::SndFileSource (Session& s, string path, SampleFormat sfmt, Header 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; } - } } -void -SndFileSource::init () +void +SndFileSource::init_sndfile () { - string file; + ustring file; // 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,12 +187,12 @@ 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 @@ -217,13 +201,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); - error << string_compose(_("SndFileSource: cannot open file \"%1\" for %2 (%3)"), +#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) { - error << string_compose(_("SndFileSource: file only contains %1 channels; %2 is invalid as a channel number"), _info.channels, channel) << endmsg; + 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 +223,15 @@ SndFileSource::open () _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; + } - set_timeline_position (get_timecode_info (sf, _broadcast_info, timecode_info_exists)); + bool bwf_info_exists = _broadcast_info->load_from_file (sf); - if (!timecode_info_exists) { + set_timeline_position (bwf_info_exists ? _broadcast_info->get_time_reference() : header_position_offset); + + if (_length != 0 && !bwf_info_exists) { delete _broadcast_info; _broadcast_info = 0; _flags = Flag (_flags & ~Broadcast); @@ -253,8 +246,6 @@ SndFileSource::open () SndFileSource::~SndFileSource () { - GoingAway (); /* EMIT SIGNAL */ - if (sf) { sf_close (sf); sf = 0; @@ -268,27 +259,18 @@ 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 -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 +SndFileSource::read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const { int32_t nread; float *ptr; @@ -298,22 +280,27 @@ SndFileSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const 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; } - + + 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) { @@ -322,47 +309,40 @@ SndFileSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const error << string_compose(_("SndFileSource: could not seek to frame %1 within %2 (%3)"), start, _name.substr (1), errbuf) << endmsg; return 0; } - + 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; + 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); - + return nread; } -nframes_t +nframes_t SndFileSource::write_unlocked (Sample *data, nframes_t cnt) { if (destructive()) { @@ -372,7 +352,7 @@ SndFileSource::write_unlocked (Sample *data, nframes_t cnt) } } -nframes_t +nframes_t SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt) { if (!writable()) { @@ -385,12 +365,10 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt) /*NOTREACHED*/ return 0; } - + nframes_t oldlen; int32_t frame_pos = _length; - cerr << _name << " write " << cnt << " floats to " << frame_pos << endl; - if (write_float (data, frame_pos, cnt) != cnt) { return 0; } @@ -398,35 +376,12 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt) oldlen = _length; update_length (oldlen, cnt); - cerr << "\t length is now " << _length << endl; - - if (_build_peakfiles) { - PeakBuildRecord *pbr = 0; - - if (pending_peak_builds.size()) { - pbr = pending_peak_builds.back(); - } - - if (pbr && pbr->frame + pbr->cnt == oldlen) { - - /* the last PBR extended to the start of the current write, - so just extend it again. - */ - pbr->cnt += cnt; - } else { - pending_peak_builds.push_back (new PeakBuildRecord (oldlen, cnt)); - } - - _peaks_built = false; - } - - if (_build_peakfiles) { - queue_for_peaks (shared_from_this (), false); + compute_and_write_peaks (data, frame_pos, cnt, false, true); } _write_data_count = cnt; - + return cnt; } @@ -448,28 +403,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; - + // 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) { @@ -480,14 +435,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, @@ -496,7 +451,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt) _capture_start = false; _capture_end = false; - + if (crossfade (data, cnt, 0) != cnt) { return 0; } @@ -512,46 +467,26 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt) old_file_pos = file_pos; update_length (file_pos, cnt); - file_pos += cnt; if (_build_peakfiles) { - PeakBuildRecord *pbr = 0; - - if (pending_peak_builds.size()) { - pbr = pending_peak_builds.back(); - } - - if (pbr && pbr->frame + pbr->cnt == old_file_pos) { - - /* the last PBR extended to the start of the current write, - so just extend it again. - */ - - pbr->cnt += cnt; - } else { - pending_peak_builds.push_back (new PeakBuildRecord (old_file_pos, cnt)); - } - - _peaks_built = false; + compute_and_write_peaks (data, file_pos, cnt, false, true); } - if (_build_peakfiles) { - queue_for_peaks (shared_from_this (), true); - } - + file_pos += cnt; + return cnt; } int -SndFileSource::update_header (nframes_t when, struct tm& now, time_t tnow) -{ +SndFileSource::update_header (sframes_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 (); } @@ -567,7 +502,7 @@ SndFileSource::flush_header () } int -SndFileSource::setup_broadcast_info (nframes_t when, struct tm& now, time_t tnow) +SndFileSource::setup_broadcast_info (sframes_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; @@ -578,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; - - 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 (_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; + 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; @@ -623,22 +539,20 @@ 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; } - - - } nframes_t -SndFileSource::write_float (Sample* data, nframes_t frame_pos, nframes_t cnt) +SndFileSource::write_float (Sample* data, sframes_t frame_pos, nframes_t cnt) { if (sf_seek (sf, frame_pos, SEEK_SET|SFM_WRITE) < 0) { char errbuf[256]; @@ -646,18 +560,18 @@ SndFileSource::write_float (Sample* data, nframes_t frame_pos, nframes_t cnt) error << string_compose (_("%1: cannot seek to %2 (libsndfile error: %3"), _path, frame_pos, errbuf) << endmsg; return 0; } - + if (sf_writef_float (sf, data, cnt) != (ssize_t) cnt) { return 0; } - + return cnt; } -nframes_t +sframes_t SndFileSource::natural_position() const { - return timeline_position; + return _timeline_position; } bool @@ -669,10 +583,10 @@ SndFileSource::set_destructive (bool yn) 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 */ } @@ -684,13 +598,13 @@ SndFileSource::clear_capture_marks () { _capture_start = false; _capture_end = false; -} +} void -SndFileSource::mark_capture_start (nframes_t pos) +SndFileSource::mark_capture_start (sframes_t pos) { if (destructive()) { - if (pos < timeline_position) { + if (pos < _timeline_position) { _capture_start = false; } else { _capture_start = true; @@ -726,26 +640,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. @@ -756,13 +670,13 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in) return 0; } } - } + } if (file_cnt != xfade) { nframes_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; @@ -775,11 +689,11 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in) nframes_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]); } @@ -788,7 +702,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]); } @@ -804,7 +718,7 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in) compute_equal_power_fades (xfade, in, out); for (nframes_t n = 0; n < xfade; ++n) { - xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]); + xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]); } } else if (xfade) { @@ -819,7 +733,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; @@ -830,7 +744,7 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in) return cnt; } -nframes_t +sframes_t SndFileSource::last_capture_start_frame () const { if (destructive()) { @@ -848,28 +762,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, nframes_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 = (nframes_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]; @@ -881,25 +790,24 @@ void SndFileSource::set_timeline_position (int64_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 (string path, SoundFileInfo& info, string& error_msg) +SndFileSource::get_soundfile_info (const ustring& 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 ((char*) path.c_str(), SFM_READ, &sf_info)) == 0) { char errbuf[256]; error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1); return false; @@ -912,33 +820,16 @@ SndFileSource::get_soundfile_info (string path, SoundFileInfo& info, string& err 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) +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; } +