X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfilesource.cc;h=ee4d976f160472fd3f3c2cdef9a20ddaa932e683;hb=d345d446883c0425f8312149d04abc62076e36fc;hp=3c219dc19139f7fa175a7de5ac57520f44894a5e;hpb=34d8df6a37ecf44311045db440dc3ebe9ef301e9;p=ardour.git diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 3c219dc191..ee4d976f16 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -89,7 +89,7 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig { int fmt = 0; - init_sndfile (); + init_sndfile (); _file_is_new = true; @@ -144,36 +144,8 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig _info.samplerate = rate; _info.format = fmt; - if (open()) { - throw failed_constructor(); - } - - if (writable() && (_flags & Broadcast)) { - - SNDFILE* sf = _descriptor->allocate (); - if (sf == 0) { - error << string_compose (_("could not allocate file %1"), _path) << endmsg; - throw failed_constructor (); - } - - 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; - } - - _descriptor->release (); - } + /* do not open the file here - do that in write_unlocked() as needed + */ } void @@ -181,6 +153,8 @@ SndFileSource::init_sndfile () { string file; + _descriptor = 0; + // lets try to keep the object initalizations here at the top xfade_buf = 0; _broadcast_info = 0; @@ -209,7 +183,7 @@ SndFileSource::open () _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); @@ -253,9 +227,29 @@ SndFileSource::open () if (writable()) { sf_command (sf, SFC_SET_UPDATE_HEADER_AUTO, 0, SF_FALSE); - } - _descriptor->release (); + if (_flags & Broadcast) { + + if (!_broadcast_info) { + _broadcast_info = new BroadcastInfo; + } + + _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)) { + 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 (); + _open = true; return 0; } @@ -275,12 +269,21 @@ SndFileSource::sample_rate () 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; 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; @@ -305,6 +308,8 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con 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); @@ -322,7 +327,6 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con if (_info.channels == 1) { framecnt_t ret = sf_read_float (sf, dst, file_cnt); - _read_data_count = ret * sizeof(float); if (ret != file_cnt) { char errbuf[256]; sf_error_str (0, errbuf, sizeof (errbuf) - 1); @@ -348,8 +352,6 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con ptr += _info.channels; } - _read_data_count = cnt * sizeof(float); - _descriptor->release (); return nread; } @@ -357,6 +359,10 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con 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 { @@ -392,16 +398,12 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt) compute_and_write_peaks (data, frame_pos, cnt, false, true); } - _write_data_count = cnt; - return cnt; } framecnt_t SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) { - framepos_t old_file_pos; - if (!writable()) { warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg; return 0; @@ -477,7 +479,6 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) } } - old_file_pos = file_pos; update_length (file_pos, cnt); if (_build_peakfiles) { @@ -511,12 +512,17 @@ 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) { 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 (); @@ -531,6 +537,11 @@ SndFileSource::setup_broadcast_info (framepos_t /*when*/, struct tm& now, time_t 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; } @@ -567,7 +578,7 @@ SndFileSource::set_header_timeline_position () _broadcast_info->set_time_reference (_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()) @@ -584,7 +595,7 @@ framecnt_t SndFileSource::write_float (Sample* data, framepos_t frame_pos, framecnt_t cnt) { 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); @@ -612,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]; } @@ -755,7 +766,7 @@ SndFileSource::crossfade (Sample* data, framecnt_t cnt, int fade_in) for (framecnt_t n = 0; n < xfade; ++n) { xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]); } - + } else if (xfade) { /* long xfade length, has to be computed across several calls */ @@ -851,10 +862,10 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri info.samplerate = sf_info.samplerate; info.channels = sf_info.channels; info.length = sf_info.frames; - + 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 { @@ -891,7 +902,7 @@ SndFileSource::file_closed () to make sure its time is as new as the audio file. */ - + touch_peakfile (); }