X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfilesource.cc;h=ee4d976f160472fd3f3c2cdef9a20ddaa932e683;hb=d345d446883c0425f8312149d04abc62076e36fc;hp=f759653e58f1738f666120d7f87ceaedee9a7654;hpb=8a28ea6154f78d491afe746b3a2b0230185afb91;p=ardour.git diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index f759653e58..ee4d976f16 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 @@ -17,6 +17,10 @@ */ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include #include #include @@ -28,21 +32,23 @@ #include -#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; +using std::string; gain_t* SndFileSource::out_coefficient = 0; gain_t* SndFileSource::in_coefficient = 0; -nframes_t SndFileSource::xfade_frames = 64; +framecnt_t SndFileSource::xfade_frames = 64; const Source::Flag SndFileSource::default_writable_flags = Source::Flag ( Source::Writable | Source::Removable | @@ -61,10 +67,10 @@ SndFileSource::SndFileSource (Session& s, const XMLNode& node) } /** Files created this way are never writable or removable */ -SndFileSource::SndFileSource (Session& s, const ustring& path, bool embedded, int chn, Flag flags) +SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flags) : Source(s, DataType::AUDIO, path, flags) - , AudioFileSource (s, path, embedded, - Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) + /* note that the origin of an external file is itself */ + , AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) { _channel = chn; @@ -76,14 +82,14 @@ SndFileSource::SndFileSource (Session& s, const ustring& path, bool embedded, in } /** This constructor is used to construct new files, not open existing ones. */ -SndFileSource::SndFileSource (Session& s, const ustring& path, bool embedded, - SampleFormat sfmt, HeaderFormat hf, nframes_t rate, Flag flags) +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, embedded, flags, sfmt, hf) + , AudioFileSource (s, path, origin, flags, sfmt, hf) { int fmt = 0; - init_sndfile (); + init_sndfile (); _file_is_new = true; @@ -133,51 +139,26 @@ SndFileSource::SndFileSource (Session& s, const ustring& path, bool embedded, fmt |= SF_FORMAT_PCM_16; break; } - + _info.channels = 1; _info.samplerate = rate; _info.format = fmt; - if (open()) { - throw failed_constructor(); - } - - if (writable() && (_flags & Broadcast)) { - - if (!_broadcast_info) { - _broadcast_info = new BroadcastInfo; - } - - _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; - } - } + /* do not open the file here - do that in write_unlocked() as needed + */ } -void +void SndFileSource::init_sndfile () { - ustring file; + string file; + + _descriptor = 0; // lets try to keep the object initalizations here at the top xfade_buf = 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. */ @@ -188,19 +169,22 @@ SndFileSource::init_sndfile () _capture_end = false; file_pos = 0; - if (destructive()) { + if (destructive()) { xfade_buf = new Sample[xfade_frames]; _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) { + _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); #ifndef HAVE_COREAUDIO @@ -208,7 +192,9 @@ SndFileSource::open () so we don't want to see this message. */ - error << string_compose(_("SndFileSource: cannot open file \"%1\" for %2 (%3)"), + cerr << "failed to open " << _path << " with name " << _name << endl; + + error << string_compose(_("SndFileSource: cannot open file \"%1\" for %2 (%3)"), _path, (writable() ? "read+write" : "reading"), errbuf) << endmsg; #endif return -1; @@ -218,8 +204,8 @@ SndFileSource::open () #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; + delete _descriptor; + _descriptor = 0; return -1; } @@ -228,7 +214,7 @@ SndFileSource::open () if (!_broadcast_info) { _broadcast_info = new BroadcastInfo; } - + bool bwf_info_exists = _broadcast_info->load_from_file (sf); set_timeline_position (bwf_info_exists ? _broadcast_info->get_time_reference() : header_position_offset); @@ -241,67 +227,91 @@ 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, _broadcast_info->get_error()) + << endmsg; + _flags = Flag (_flags & ~Broadcast); + delete _broadcast_info; + _broadcast_info = 0; + } + } + } - touch_peakfile (); - } + _descriptor->release (); + _open = true; + return 0; +} +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, sframes_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) { - nframes_t delta = cnt - file_cnt; + framepos_t delta = cnt - file_cnt; memset (dst+file_cnt, 0, sizeof (Sample) * delta); } @@ -310,18 +320,19 @@ SndFileSource::read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const 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 = ret * 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); - cerr << string_compose(_("SndFileSource: @ %1 could not read %2 within %3 (%4) (len = %5)"), start, file_cnt, _name.substr (1), errbuf, _length) << endl; + error << string_compose(_("SndFileSource: @ %1 could not read %2 within %3 (%4) (len = %5)"), start, file_cnt, _name.val().substr (1), errbuf, _length) << endl; } + _descriptor->release (); return ret; } } @@ -329,26 +340,29 @@ SndFileSource::read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const real_cnt = cnt * _info.channels; 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 { @@ -356,8 +370,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; @@ -369,8 +383,8 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt) /*NOTREACHED*/ return 0; } - - nframes_t oldlen; + + framecnt_t oldlen; int32_t frame_pos = _length; if (write_float (data, frame_pos, cnt) != cnt) { @@ -384,16 +398,12 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt) 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; @@ -407,28 +417,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; - + // 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) { @@ -439,14 +449,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; if (crossfade (data, cnt, 1) != cnt) { return 0; } - + } else if (_capture_end) { /* end of capture both occur within the data we are writing, @@ -455,7 +465,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt) _capture_start = false; _capture_end = false; - + if (crossfade (data, cnt, 0) != cnt) { return 0; } @@ -469,7 +479,6 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt) } } - old_file_pos = file_pos; update_length (file_pos, cnt); if (_build_peakfiles) { @@ -477,20 +486,20 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt) } file_pos += cnt; - + return cnt; } int -SndFileSource::update_header (sframes_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 (); } @@ -498,33 +507,55 @@ SndFileSource::update_header (sframes_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; } int -SndFileSource::setup_broadcast_info (sframes_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; } - _broadcast_info->set_originator_ref (); + _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 (!_broadcast_info->write_to_file (sf)) { + 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; @@ -533,6 +564,7 @@ SndFileSource::setup_broadcast_info (sframes_t when, struct tm& now, time_t tnow _broadcast_info = 0; } + _descriptor->release (); return 0; } @@ -545,7 +577,9 @@ SndFileSource::set_header_timeline_position () _broadcast_info->set_time_reference (_timeline_position); - if (!_broadcast_info->write_to_file (sf)) { + 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; @@ -553,26 +587,33 @@ SndFileSource::set_header_timeline_position () delete _broadcast_info; _broadcast_info = 0; } + + _descriptor->release (); } -nframes_t -SndFileSource::write_float (Sample* data, sframes_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; + _descriptor->release (); return 0; } - + if (sf_writef_float (sf, data, cnt) != (ssize_t) cnt) { + _descriptor->release (); return 0; } - + + _descriptor->release (); return cnt; } -sframes_t +framepos_t SndFileSource::natural_position() const { return _timeline_position; @@ -582,7 +623,7 @@ 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]; } @@ -602,10 +643,11 @@ SndFileSource::clear_capture_marks () { _capture_start = false; _capture_end = false; -} +} +/** @param pos Capture start position in session frames */ void -SndFileSource::mark_capture_start (sframes_t pos) +SndFileSource::mark_capture_start (framepos_t pos) { if (destructive()) { if (pos < _timeline_position) { @@ -625,15 +667,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; @@ -644,26 +686,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. @@ -674,13 +716,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; @@ -690,14 +732,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]); } @@ -706,7 +748,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]); } @@ -721,8 +763,8 @@ 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]); + for (framecnt_t n = 0; n < xfade; ++n) { + xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]); } } else if (xfade) { @@ -737,7 +779,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; @@ -748,7 +790,7 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in) return cnt; } -sframes_t +framepos_t SndFileSource::last_capture_start_frame () const { if (destructive()) { @@ -773,13 +815,13 @@ SndFileSource::handle_header_position_change () } 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); delete [] out_coefficient; delete [] in_coefficient; @@ -791,19 +833,19 @@ 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; @@ -811,7 +853,7 @@ SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, str 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; @@ -820,9 +862,15 @@ 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)); + + 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; @@ -837,3 +885,33 @@ SndFileSource::one_of_several_channels () const return _info.channels > 1; } +bool +SndFileSource::clamped_at_unity () const +{ + 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); + } +}