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;
}
delete _broadcast_info;
_broadcast_info = 0;
}
+
+ _descriptor->release ();
}
}
// lets try to keep the object initalizations here at the top
xfade_buf = 0;
- sf = 0;
_broadcast_info = 0;
/* although libsndfile says we don't need to set 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
#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;
}
sf_command (sf, SFC_SET_UPDATE_HEADER_AUTO, 0, SF_FALSE);
}
+ _descriptor->release ();
return 0;
}
SndFileSource::~SndFileSource ()
{
- if (sf) {
- sf_close (sf);
- sf = 0;
-
- /* 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 ();
- }
-
+ delete _descriptor;
delete _broadcast_info;
delete [] xfade_buf;
}
uint32_t real_cnt;
framepos_t file_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 */
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 ();
return 0;
}
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.val().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;
}
}
_read_data_count = cnt * sizeof(float);
+ _descriptor->release ();
return nread;
}
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);
+
+ 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
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;
_broadcast_info = 0;
}
+ _descriptor->release ();
return 0;
}
_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;
delete _broadcast_info;
_broadcast_info = 0;
}
+
+ _descriptor->release ();
}
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;
}
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;
/* XXX: this may not be the full list of formats that are unclamped */
return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE);
}
+
+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);
+ }
+}
projects / ardour.git / blobdiff