X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfilesource.cc;h=b34bbaa9d26527af37c6b6fd9e7cb80513a572d1;hb=4250940ad83200e065b966d0646c75a48bb0f73d;hp=1c3144f16421177f140b7da1753ec7bfaa8cf92f;hpb=59631acc5f41153a294c97ab820a4b41a886e24c;p=ardour.git diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 1c3144f164..b34bbaa9d2 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -25,20 +25,24 @@ #include #include #include +#include #include -#ifdef PLATFORM_WINDOWS +#include +#include "pbd/gstdio_compat.h" + #include -#endif +#include #include +#include "ardour/runtime_functions.h" #include "ardour/sndfilesource.h" #include "ardour/sndfile_helpers.h" #include "ardour/utils.h" #include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -47,7 +51,7 @@ using std::string; gain_t* SndFileSource::out_coefficient = 0; gain_t* SndFileSource::in_coefficient = 0; -framecnt_t SndFileSource::xfade_frames = 64; +samplecnt_t SndFileSource::xfade_samples = 64; const Source::Flag SndFileSource::default_writable_flags = Source::Flag ( Source::Writable | Source::Removable | @@ -57,39 +61,70 @@ const Source::Flag SndFileSource::default_writable_flags = Source::Flag ( SndFileSource::SndFileSource (Session& s, const XMLNode& node) : Source(s, node) , AudioFileSource (s, node) + , _sndfile (0) + , _broadcast_info (0) + , _capture_start (false) + , _capture_end (false) + , file_pos (0) + , xfade_buf (0) { init_sndfile (); + assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); + existence_check (); + if (open()) { throw failed_constructor (); } } -/** Files created this way are never writable or removable */ +/** Constructor for existing external-to-session files. + 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))) + , _sndfile (0) + , _broadcast_info (0) + , _capture_start (false) + , _capture_end (false) + , file_pos (0) + , xfade_buf (0) { _channel = chn; init_sndfile (); + assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); + existence_check (); + if (open()) { throw failed_constructor (); } } -/** This constructor is used to construct new files, not open existing ones. */ +/** This constructor is used to construct new internal-to-session files, + not open existing ones. +*/ SndFileSource::SndFileSource (Session& s, const string& path, const string& origin, - SampleFormat sfmt, HeaderFormat hf, framecnt_t rate, Flag flags) + SampleFormat sfmt, HeaderFormat hf, samplecnt_t rate, Flag flags) : Source(s, DataType::AUDIO, path, flags) , AudioFileSource (s, path, origin, flags, sfmt, hf) + , _sndfile (0) + , _broadcast_info (0) + , _capture_start (false) + , _capture_end (false) + , file_pos (0) + , xfade_buf (0) { int fmt = 0; init_sndfile (); + assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); + existence_check (); + _file_is_new = true; switch (hf) { @@ -118,9 +153,26 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig _flags = Flag (_flags & ~Broadcast); break; + case RF64_WAV: + fmt = SF_FORMAT_RF64; + _flags = Flag (_flags & ~Broadcast); + _flags = Flag (_flags | RF64_RIFF); + break; + + case MBWF: + fmt = SF_FORMAT_RF64; + _flags = Flag (_flags | Broadcast); + _flags = Flag (_flags | RF64_RIFF); + break; + + case RF64: + fmt = SF_FORMAT_RF64; + _flags = Flag (_flags & ~Broadcast); + break; + default: fatal << string_compose (_("programming error: %1"), X_("unsupported audio header format requested")) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ break; } @@ -148,56 +200,197 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig throw failed_constructor(); } } else { - /* normal mode: do not open the file here - do that in write_unlocked() as needed + /* normal mode: do not open the file here - do that in {read,write}_unlocked() as needed */ } } -void -SndFileSource::init_sndfile () +/** Constructor to be called for recovering files being used for + * capture. They are in-session, they already exist, they should not + * be writable. They are an odd hybrid (from a constructor point of + * view) of the previous two constructors. + */ +SndFileSource::SndFileSource (Session& s, const string& path, int chn) + : Source (s, DataType::AUDIO, path, Flag (0)) + /* the final boolean argument is not used, its value is irrelevant. see audiofilesource.h for explanation */ + , AudioFileSource (s, path, Flag (0)) + , _sndfile (0) + , _broadcast_info (0) + , _capture_start (false) + , _capture_end (false) + , file_pos (0) + , xfade_buf (0) { - string file; + _channel = chn; + + init_sndfile (); + + assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); + existence_check (); + + if (open()) { + throw failed_constructor (); + } +} + +/** Constructor to losslessly compress existing source to flac */ +SndFileSource::SndFileSource (Session& s, const AudioFileSource& other, const string& path, bool use16bits, Progress* progress) + : Source(s, DataType::AUDIO, path, Flag ((other.flags () | default_writable_flags | NoPeakFile) & ~RF64_RIFF)) + , AudioFileSource (s, path, "", Flag ((other.flags () | default_writable_flags | NoPeakFile) & ~RF64_RIFF), /*unused*/ FormatFloat, /*unused*/ WAVE64) + , _sndfile (0) + , _broadcast_info (0) + , _capture_start (false) + , _capture_end (false) + , file_pos (0) + , xfade_buf (0) +{ + if (other.readable_length () == 0) { + throw failed_constructor(); + } + + assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); + + _channel = 0; + init_sndfile (); + + _file_is_new = true; + + _info.channels = 1; + _info.samplerate = other.sample_rate (); + _info.format = SF_FORMAT_FLAC | (use16bits ? SF_FORMAT_PCM_16 : SF_FORMAT_PCM_24); + + /* flac is either read or write -- never both, + * so we need to special-case ::open () */ +#ifdef PLATFORM_WINDOWS + int fd = g_open (_path.c_str(), O_CREAT | O_RDWR, 0644); +#else + int fd = ::open (_path.c_str(), O_CREAT | O_RDWR, 0644); +#endif + if (fd == -1) { + throw failed_constructor(); + } + + _sndfile = sf_open_fd (fd, SFM_WRITE, &_info, true); - _descriptor = 0; + if (_sndfile == 0) { + throw failed_constructor(); + } + +#if 0 + /* setting flac compression quality above the default does not produce a significant size + * improvement (not for large raw recordings anyway, the_CLA tests 2017-10-02, >> 250MB files, + * ~1% smaller), but does have a significant encoding speed penalty. + * + * We still may expose this as option someday though, perhaps for opposite reason: "fast encoding" + */ + double flac_quality = 1; // libsndfile uses range 0..1 (mapped to flac 0..8), default is (5/8) + if (sf_command (_sndfile, SFC_SET_COMPRESSION_LEVEL, &flac_quality, sizeof (double)) != SF_TRUE) { + char errbuf[256]; + sf_error_str (_sndfile, errbuf, sizeof (errbuf) - 1); + error << string_compose (_("Cannot set flac compression level: %1"), errbuf) << endmsg; + } +#endif - // lets try to keep the object initalizations here at the top - xfade_buf = 0; - _broadcast_info = 0; + Sample buf[8192]; + samplecnt_t off = 0; + float peak = 0; + float norm = 1.f; + + /* normalize before converting to fixed point, calc gain factor */ + samplecnt_t len = other.read (buf, off, 8192, other.channel ()); + while (len > 0) { + peak = compute_peak (buf, len, peak); + off += len; + len = other.read (buf, off, 8192, other.channel ()); + if (progress) { + progress->set_progress (0.5f * (float) off / other.readable_length ()); + } + } + + if (peak > 0) { + _gain *= peak; + norm = 1.f / peak; + } + /* copy file */ + off = 0; + len = other.read (buf, off, 8192, other.channel ()); + while (len > 0) { + if (norm != 1.f) { + for (samplecnt_t i = 0; i < len; ++i) { + buf[i] *= norm; + } + } + write (buf, len); + off += len; + len = other.read (buf, off, 8192, other.channel ()); + if (progress) { + progress->set_progress (0.5f + 0.5f * (float) off / other.readable_length ()); + } + } +} + +void +SndFileSource::init_sndfile () +{ /* although libsndfile says we don't need to set this, valgrind and source code shows us that we do. */ memset (&_info, 0, sizeof(_info)); - _capture_start = false; - _capture_end = false; - file_pos = 0; - if (destructive()) { - xfade_buf = new Sample[xfade_frames]; + xfade_buf = new Sample[xfade_samples]; _timeline_position = header_position_offset; } AudioFileSource::HeaderPositionOffsetChanged.connect_same_thread (header_position_connection, boost::bind (&SndFileSource::handle_header_position_change, this)); } +void +SndFileSource::close () +{ + if (_sndfile) { + sf_close (_sndfile); + _sndfile = 0; + file_closed (); + } +} + int SndFileSource::open () { - string path_to_open; + if (_sndfile) { + return 0; + } +// We really only want to use g_open for all platforms but because of this +// method(SndfileSource::open), the compiler(or at least GCC) is confused +// because g_open will expand to "open" on non-POSIX systems and needs the +// global namespace qualifer. The problem is since since C99 ::g_open will +// apparently expand to ":: open" #ifdef PLATFORM_WINDOWS - path_to_open = Glib::locale_from_utf8(_path); + int fd = g_open (_path.c_str(), writable() ? O_CREAT | O_RDWR : O_RDONLY, writable() ? 0644 : 0444); #else - path_to_open = _path; + int fd = ::open (_path.c_str(), writable() ? O_CREAT | O_RDWR : O_RDONLY, writable() ? 0644 : 0444); #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 (fd == -1) { + error << string_compose ( + _ ("SndFileSource: cannot open file \"%1\" for %2"), + _path, + (writable () ? "read+write" : "reading")) << endmsg; + return -1; + } - if (sf == 0) { + if ((_info.format & SF_FORMAT_TYPEMASK ) == SF_FORMAT_FLAC) { + assert (!writable()); + _sndfile = sf_open_fd (fd, SFM_READ, &_info, true); + } else { + _sndfile = sf_open_fd (fd, writable() ? SFM_RDWR : SFM_READ, &_info, true); + } + + if (_sndfile == 0) { char errbuf[1024]; sf_error_str (0, errbuf, sizeof (errbuf) - 1); #ifndef HAVE_COREAUDIO @@ -205,10 +398,10 @@ SndFileSource::open () so we don't want to see this message. */ - cerr << "failed to open " << path_to_open << " with name " << _name << endl; + cerr << "failed to open " << _path << " with name " << _name << endl; error << string_compose(_("SndFileSource: cannot open file \"%1\" for %2 (%3)"), - path_to_open, (writable() ? "read+write" : "reading"), errbuf) << endmsg; + _path, (writable() ? "read+write" : "reading"), errbuf) << endmsg; #endif return -1; } @@ -217,18 +410,31 @@ 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 - delete _descriptor; - _descriptor = 0; + sf_close (_sndfile); + _sndfile = 0; return -1; } _length = _info.frames; +#ifdef HAVE_RF64_RIFF + if (_file_is_new && _length == 0 && writable()) { + if (_flags & RF64_RIFF) { + if (sf_command (_sndfile, SFC_RF64_AUTO_DOWNGRADE, 0, 0) != SF_TRUE) { + char errbuf[256]; + sf_error_str (_sndfile, errbuf, sizeof (errbuf) - 1); + error << string_compose (_("Cannot mark RF64 audio file for automatic downgrade to WAV: %1"), errbuf) + << endmsg; + } + } + } +#endif + if (!_broadcast_info) { _broadcast_info = new BroadcastInfo; } - bool bwf_info_exists = _broadcast_info->load_from_file (sf); + bool bwf_info_exists = _broadcast_info->load_from_file (_sndfile); if (_file_is_new && _length == 0 && writable() && !bwf_info_exists) { /* newly created files will not have a BWF header at this point in time. @@ -248,8 +454,16 @@ SndFileSource::open () _flags = Flag (_flags & ~Broadcast); } + /* Set the broadcast flag if the BWF info is already there. We need + * this when recovering or using existing files. + */ + + if (bwf_info_exists) { + _flags = Flag (_flags | Broadcast); + } + if (writable()) { - sf_command (sf, SFC_SET_UPDATE_HEADER_AUTO, 0, SF_FALSE); + sf_command (_sndfile, SFC_SET_UPDATE_HEADER_AUTO, 0, SF_FALSE); if (_flags & Broadcast) { @@ -260,9 +474,9 @@ SndFileSource::open () _broadcast_info->set_from_session (_session, header_position_offset); _broadcast_info->set_description (string_compose ("BWF %1", _name)); - if (!_broadcast_info->write_to_file (sf)) { + if (!_broadcast_info->write_to_file (_sndfile)) { 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()) + _path, _broadcast_info->get_error()) << endmsg; _flags = Flag (_flags & ~Broadcast); delete _broadcast_info; @@ -271,14 +485,12 @@ SndFileSource::open () } } - _descriptor->release (); - _open = true; return 0; } SndFileSource::~SndFileSource () { - delete _descriptor; + close (); delete _broadcast_info; delete [] xfade_buf; } @@ -289,28 +501,26 @@ SndFileSource::sample_rate () const return _info.samplerate; } -framecnt_t -SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const +samplecnt_t +SndFileSource::read_unlocked (Sample *dst, samplepos_t start, samplecnt_t cnt) const { assert (cnt >= 0); - - int32_t nread; + + samplecnt_t nread; float *ptr; - uint32_t real_cnt; - framepos_t file_cnt; + samplecnt_t real_cnt; + samplepos_t file_cnt; - if (writable() && !_open) { + if (writable() && !_sndfile) { /* 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; + if (const_cast(this)->open()) { + error << string_compose (_("could not open file %1 for reading."), _path) << endmsg; return 0; - } + } if (start > _length) { @@ -334,28 +544,31 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con assert (file_cnt >= 0); if (file_cnt != cnt) { - framepos_t delta = cnt - file_cnt; + samplepos_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) { + if (sf_seek (_sndfile, (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.val().substr (1), errbuf) << endmsg; - _descriptor->release (); + error << string_compose(_("SndFileSource: could not seek to sample %1 within %2 (%3)"), start, _name.val().substr (1), errbuf) << endmsg; return 0; } if (_info.channels == 1) { - framecnt_t ret = sf_read_float (sf, dst, file_cnt); + samplecnt_t ret = sf_read_float (_sndfile, 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 (); + if (_gain != 1.f) { + for (samplecnt_t i = 0; i < ret; ++i) { + dst[i] *= _gain; + } + } return ret; } } @@ -364,25 +577,31 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con Sample* interleave_buf = get_interleave_buffer (real_cnt); - nread = sf_read_float (sf, interleave_buf, real_cnt); + nread = sf_read_float (_sndfile, 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; + if (_gain != 1.f) { + for (samplecnt_t n = 0; n < nread; ++n) { + dst[n] = *ptr * _gain; + ptr += _info.channels; + } + } else { + for (samplecnt_t n = 0; n < nread; ++n) { + dst[n] = *ptr; + ptr += _info.channels; + } } - _descriptor->release (); return nread; } -framecnt_t -SndFileSource::write_unlocked (Sample *data, framecnt_t cnt) +samplecnt_t +SndFileSource::write_unlocked (Sample *data, samplecnt_t cnt) { - if (!_open && open()) { + if (open()) { return 0; // failure } @@ -393,8 +612,8 @@ SndFileSource::write_unlocked (Sample *data, framecnt_t cnt) } } -framecnt_t -SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt) +samplecnt_t +SndFileSource::nondestructive_write_unlocked (Sample *data, samplecnt_t cnt) { if (!writable()) { warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg; @@ -403,27 +622,27 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt) if (_info.channels != 1) { fatal << string_compose (_("programming error: %1 %2"), X_("SndFileSource::write called on non-mono file"), _path) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return 0; } - int32_t frame_pos = _length; + samplepos_t sample_pos = _length; - if (write_float (data, frame_pos, cnt) != cnt) { + if (write_float (data, sample_pos, cnt) != cnt) { return 0; } update_length (_length + cnt); if (_build_peakfiles) { - compute_and_write_peaks (data, frame_pos, cnt, false, true); + compute_and_write_peaks (data, sample_pos, cnt, true, true); } return cnt; } -framecnt_t -SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) +samplecnt_t +SndFileSource::destructive_write_unlocked (Sample* data, samplecnt_t cnt) { if (!writable()) { warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg; @@ -440,11 +659,11 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) _capture_end = false; /* move to the correct location place */ - file_pos = capture_start_frame - _timeline_position; + file_pos = capture_start_sample - _timeline_position; // split cnt in half - framecnt_t subcnt = cnt / 2; - framecnt_t ofilepos = file_pos; + samplecnt_t subcnt = cnt / 2; + samplecnt_t ofilepos = file_pos; // fade in if (crossfade (data, subcnt, 1) != subcnt) { @@ -472,7 +691,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) _capture_end = false; /* move to the correct location place */ - file_pos = capture_start_frame - _timeline_position; + file_pos = capture_start_sample - _timeline_position; if (crossfade (data, cnt, 1) != cnt) { return 0; @@ -503,7 +722,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) update_length (file_pos + cnt); if (_build_peakfiles) { - compute_and_write_peaks (data, file_pos, cnt, false, true); + compute_and_write_peaks (data, file_pos, cnt, true, true); } file_pos += cnt; @@ -512,7 +731,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) } int -SndFileSource::update_header (framepos_t when, struct tm& now, time_t tnow) +SndFileSource::update_header (samplepos_t when, struct tm& now, time_t tnow) { set_timeline_position (when); @@ -533,19 +752,12 @@ SndFileSource::flush_header () return -1; } - 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) { + if (_sndfile == 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 (); + int const r = sf_command (_sndfile, SFC_UPDATE_HEADER_NOW, 0, 0) != SF_TRUE; return r; } @@ -553,41 +765,34 @@ SndFileSource::flush_header () 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) { + if (_sndfile == 0) { error << string_compose (_("could not allocate file %1 to flush contents"), _path) << endmsg; return; } // Hopefully everything OK - sf_write_sync (sf); - _descriptor->release (); + sf_write_sync (_sndfile); } int -SndFileSource::setup_broadcast_info (framepos_t /*when*/, struct tm& now, time_t /*tnow*/) +SndFileSource::setup_broadcast_info (samplepos_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) { + if (!_sndfile) { warning << string_compose (_("attempt to set BWF info for an un-opened audio file source (%1)"), _path) << endmsg; return -1; } - if (!(_flags & Broadcast)) { + if (!(_flags & Broadcast) || !_broadcast_info) { return 0; } @@ -598,18 +803,6 @@ SndFileSource::setup_broadcast_info (framepos_t /*when*/, struct tm& now, time_t set_header_timeline_position (); - SNDFILE* sf = _descriptor->allocate (); - - if (sf == 0 || !_broadcast_info->write_to_file (sf)) { - error << string_compose (_("cannot set broadcast info for audio file %1 (%2); dropping broadcast info for this file"), - _path, _broadcast_info->get_error()) - << endmsg; - _flags = Flag (_flags & ~Broadcast); - delete _broadcast_info; - _broadcast_info = 0; - } - - _descriptor->release (); return 0; } @@ -619,12 +812,11 @@ SndFileSource::set_header_timeline_position () if (!(_flags & Broadcast)) { return; } + assert (_broadcast_info); _broadcast_info->set_time_reference (_timeline_position); - SNDFILE* sf = _descriptor->allocate (); - - if (sf == 0 || !_broadcast_info->write_to_file (sf)) { + if (_sndfile == 0 || !_broadcast_info->write_to_file (_sndfile)) { error << string_compose (_("cannot set broadcast info for audio file %1 (%2); dropping broadcast info for this file"), _path, _broadcast_info->get_error()) << endmsg; @@ -632,57 +824,34 @@ SndFileSource::set_header_timeline_position () delete _broadcast_info; _broadcast_info = 0; } - - _descriptor->release (); } -framecnt_t -SndFileSource::write_float (Sample* data, framepos_t frame_pos, framecnt_t cnt) +samplecnt_t +SndFileSource::write_float (Sample* data, samplepos_t sample_pos, samplecnt_t cnt) { - SNDFILE* sf = _descriptor->allocate (); - - if (sf == 0 || sf_seek (sf, frame_pos, SEEK_SET|SFM_WRITE) < 0) { + if ((_info.format & SF_FORMAT_TYPEMASK ) == SF_FORMAT_FLAC) { + assert (_length == sample_pos); + } + else if (_sndfile == 0 || sf_seek (_sndfile, sample_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 (); + error << string_compose (_("%1: cannot seek to %2 (libsndfile error: %3)"), _path, sample_pos, errbuf) << endmsg; return 0; } - if (sf_writef_float (sf, data, cnt) != (ssize_t) cnt) { - _descriptor->release (); + if (sf_writef_float (_sndfile, data, cnt) != (ssize_t) cnt) { return 0; } - _descriptor->release (); return cnt; } -framepos_t +samplepos_t SndFileSource::natural_position() const { return _timeline_position; } -bool -SndFileSource::set_destructive (bool yn) -{ - if (yn) { - _flags = Flag (_flags | Writable | Destructive); - if (!xfade_buf) { - xfade_buf = new Sample[xfade_frames]; - } - clear_capture_marks (); - _timeline_position = header_position_offset; - } else { - _flags = Flag (_flags & ~Destructive); - _timeline_position = 0; - /* leave xfade buf alone in case we need it again later */ - } - - return true; -} - void SndFileSource::clear_capture_marks () { @@ -690,16 +859,16 @@ SndFileSource::clear_capture_marks () _capture_end = false; } -/** @param pos Capture start position in session frames */ +/** @param pos Capture start position in session samples */ void -SndFileSource::mark_capture_start (framepos_t pos) +SndFileSource::mark_capture_start (samplepos_t pos) { if (destructive()) { if (pos < _timeline_position) { _capture_start = false; } else { _capture_start = true; - capture_start_frame = pos; + capture_start_sample = pos; } } } @@ -712,15 +881,15 @@ SndFileSource::mark_capture_end() } } -framecnt_t -SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in) +samplecnt_t +SndFileSource::crossfade (Sample* data, samplecnt_t cnt, int fade_in) { - framecnt_t xfade = min (xfade_frames, cnt); - framecnt_t nofade = cnt - xfade; + samplecnt_t xfade = min (xfade_samples, cnt); + samplecnt_t nofade = cnt - xfade; Sample* fade_data = 0; - framepos_t fade_position = 0; // in frames + samplepos_t fade_position = 0; // in samples ssize_t retval; - framecnt_t file_cnt; + samplecnt_t file_cnt; if (fade_in) { fade_position = file_pos; @@ -764,7 +933,7 @@ SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in) } if (file_cnt != xfade) { - framecnt_t delta = xfade - file_cnt; + samplecnt_t delta = xfade - file_cnt; memset (xfade_buf+file_cnt, 0, sizeof (Sample) * delta); } @@ -775,9 +944,9 @@ SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in) } } - if (xfade == xfade_frames) { + if (xfade == xfade_samples) { - framecnt_t n; + samplecnt_t n; /* use the standard xfade curve */ @@ -799,7 +968,7 @@ SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in) } } - } else if (xfade < xfade_frames) { + } else if (xfade < xfade_samples) { std::vector in(xfade); std::vector out(xfade); @@ -808,7 +977,7 @@ SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in) compute_equal_power_fades (xfade, &in[0], &out[0]); - for (framecnt_t n = 0; n < xfade; ++n) { + for (samplecnt_t n = 0; n < xfade; ++n) { xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]); } @@ -835,11 +1004,11 @@ SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in) return cnt; } -framepos_t -SndFileSource::last_capture_start_frame () const +samplepos_t +SndFileSource::last_capture_start_sample () const { if (destructive()) { - return capture_start_frame; + return capture_start_sample; } else { return 0; } @@ -860,25 +1029,25 @@ SndFileSource::handle_header_position_change () } void -SndFileSource::setup_standard_crossfades (Session const & s, framecnt_t rate) +SndFileSource::setup_standard_crossfades (Session const & s, samplecnt_t rate) { /* This static method is assumed to have been called by the Session before any DFS's are created. */ - xfade_frames = (framecnt_t) floor ((s.config.get_destructive_xfade_msecs () / 1000.0) * rate); + xfade_samples = (samplecnt_t) floor ((s.config.get_destructive_xfade_msecs () / 1000.0) * rate); delete [] out_coefficient; delete [] in_coefficient; - out_coefficient = new gain_t[xfade_frames]; - in_coefficient = new gain_t[xfade_frames]; + out_coefficient = new gain_t[xfade_samples]; + in_coefficient = new gain_t[xfade_samples]; - compute_equal_power_fades (xfade_frames, in_coefficient, out_coefficient); + compute_equal_power_fades (xfade_samples, in_coefficient, out_coefficient); } void -SndFileSource::set_timeline_position (framepos_t pos) +SndFileSource::set_timeline_position (samplepos_t pos) { // destructive track timeline postion does not change // except at instantion or when header_position_offset @@ -898,8 +1067,23 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri sf_info.format = 0; // libsndfile says to clear this before sf_open(). - if ((sf = sf_open (const_cast(path.c_str()), SFM_READ, &sf_info)) == 0) { - char errbuf[256]; + if (path.empty() || Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) { + return false; + } + +#ifdef PLATFORM_WINDOWS + int fd = g_open (path.c_str(), O_RDONLY, 0444); +#else + int fd = ::open (path.c_str(), O_RDONLY, 0444); +#endif + + if (fd == -1) { + error << string_compose ( _("SndFileSource: cannot open file \"%1\" for reading"), path) + << endmsg; + return false; + } + if ((sf = sf_open_fd (fd, SFM_READ, &sf_info, true)) == 0) { + char errbuf[1024]; error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1); return false; } @@ -955,8 +1139,5 @@ void SndFileSource::set_path (const string& p) { FileSource::set_path (p); - - if (_descriptor) { - _descriptor->set_path (_path); - } } +