{
_peaks_built = false;
_peak_byte_max = 0;
- peakfile = -1;
+ _peakfile_descriptor = 0;
_read_data_count = 0;
_write_data_count = 0;
peak_leftover_cnt = 0;
_peaks_built = false;
_peak_byte_max = 0;
- peakfile = -1;
+ _peakfile_descriptor = 0;
_read_data_count = 0;
_write_data_count = 0;
peak_leftover_cnt = 0;
cerr << "AudioSource destroyed with leftover peak data pending" << endl;
}
- if (peakfile >= 0) {
- ::close (peakfile);
- }
-
+ delete _peakfile_descriptor;
delete [] peak_leftovers;
}
return 0;
}
-sframes_t
-AudioSource::length (sframes_t /*pos*/) const
+bool
+AudioSource::empty () const
+{
+ return _length == 0;
+}
+
+framecnt_t
+AudioSource::length (framepos_t /*pos*/) const
{
return _length;
}
void
-AudioSource::update_length (sframes_t pos, sframes_t cnt)
+AudioSource::update_length (framepos_t pos, framecnt_t cnt)
{
if (pos + cnt > _length) {
_length = pos + cnt;
PEAK FILE STUFF
***********************************************************************/
+/** Checks to see if peaks are ready. If so, we return true. If not, we return false, and
+ * things are set up so that doThisWhenReady is called when the peaks are ready.
+ * A new PBD::ScopedConnection is created for the associated connection and written to
+ * *connect_here_if_not.
+ *
+ * @param doThisWhenReady Function to call when peaks are ready (if they are not already).
+ * @param connect_here_if_not Address to write new ScopedConnection to.
+ * @param event_loop Event loop for doThisWhenReady to be called in.
+ */
bool
-AudioSource::peaks_ready (boost::function<void()> doThisWhenReady, ScopedConnection& connect_here_if_not, EventLoop* event_loop) const
+AudioSource::peaks_ready (boost::function<void()> doThisWhenReady, ScopedConnection** connect_here_if_not, EventLoop* event_loop) const
{
bool ret;
Glib::Mutex::Lock lm (_peaks_ready_lock);
*/
if (!(ret = _peaks_built)) {
- PeaksReady.connect (connect_here_if_not, MISSING_INVALIDATOR, doThisWhenReady, event_loop);
+ *connect_here_if_not = new ScopedConnection;
+ PeaksReady.connect (**connect_here_if_not, MISSING_INVALIDATOR, doThisWhenReady, event_loop);
}
return ret;
int ret = -1;
PeakData* staging = 0;
Sample* raw_staging = 0;
- int _peakfile = -1;
+
+ FdFileDescriptor* peakfile_descriptor = new FdFileDescriptor (peakpath, false, 0664);
+ int peakfile_fd = -1;
expected_peaks = (cnt / (double) samples_per_file_peak);
scale = npeaks/expected_peaks;
peaks[i].min = raw_staging[i];
}
+ delete peakfile_descriptor;
delete [] raw_staging;
return 0;
}
/* open, read, close */
- if ((_peakfile = ::open (peakpath.c_str(), O_RDONLY, 0664)) < 0) {
+ if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) {
error << string_compose(_("AudioSource: cannot open peakpath (a) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
+ delete peakfile_descriptor;
return -1;
}
cerr << "DIRECT PEAKS\n";
#endif
- nread = ::pread (_peakfile, peaks, sizeof (PeakData)* npeaks, first_peak_byte);
- close (_peakfile);
+ nread = ::pread (peakfile_fd, peaks, sizeof (PeakData)* npeaks, first_peak_byte);
+ delete peakfile_descriptor;
if (nread != sizeof (PeakData) * npeaks) {
cerr << "AudioSource["
<< first_peak_byte
<< ')'
<< endl;
+ delete peakfile_descriptor;
return -1;
}
memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
}
+ delete peakfile_descriptor;
return 0;
}
/* open ... close during out: handling */
- if ((_peakfile = ::open (peakpath.c_str(), O_RDONLY, 0664)) < 0) {
+ if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) {
error << string_compose(_("AudioSource: cannot open peakpath (b) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
+ delete peakfile_descriptor;
delete [] staging;
return 0;
}
cerr << "read " << sizeof (PeakData) * to_read << " from peakfile @ " << start_byte << endl;
#endif
- if ((nread = ::pread (_peakfile, staging, sizeof (PeakData) * to_read, start_byte))
+ if ((nread = ::pread (peakfile_fd, staging, sizeof (PeakData) * to_read, start_byte))
!= sizeof (PeakData) * to_read) {
- off_t fend = lseek (_peakfile, 0, SEEK_END);
+ off_t fend = lseek (peakfile_fd, 0, SEEK_END);
cerr << "AudioSource["
<< _name
to_read = min (chunksize, (framecnt_t)(_length - current_frame));
- if (to_read == 0) {
- /* XXX ARGH .. out by one error ... need to figure out why this happens
- and fix it rather than do this band-aid move.
- */
- zero_fill = npeaks - nvisual_peaks;
- npeaks -= zero_fill;
- break;
- }
-
- if ((frames_read = read_unlocked (raw_staging, current_frame, to_read)) == 0) {
- error << string_compose(_("AudioSource[%1]: peak read - cannot read %2 samples at offset %3 of %4 (%5)"),
- _name, to_read, current_frame, _length, strerror (errno))
- << endmsg;
- goto out;
- }
+ if (current_frame >= _length) {
+ /* hmm, error condition - we've reached the end of the file
+ without generating all the peak data. cook up a zero-filled
+ data buffer and then use it. this is simpler than
+ adjusting zero_fill and npeaks and then breaking out of
+ this loop early
+ */
+
+ memset (raw_staging, 0, sizeof (Sample) * chunksize);
+
+ } else {
+
+ to_read = min (chunksize, (_length - current_frame));
+
+
+ if ((frames_read = read_unlocked (raw_staging, current_frame, to_read)) == 0) {
+ error << string_compose(_("AudioSource[%1]: peak read - cannot read %2 samples at offset %3 of %4 (%5)"),
+ _name, to_read, current_frame, _length, strerror (errno))
+ << endmsg;
+ goto out;
+ }
+ }
+
i = 0;
}
}
out:
- if (_peakfile >= 0) {
- close (_peakfile);
- }
+ delete peakfile_descriptor;
delete [] staging;
delete [] raw_staging;
int
AudioSource::prepare_for_peakfile_writes ()
{
- if ((peakfile = ::open (peakpath.c_str(), O_RDWR|O_CREAT, 0664)) < 0) {
+ _peakfile_descriptor = new FdFileDescriptor (peakpath, true, 0664);
+ if ((_peakfile_fd = _peakfile_descriptor->allocate()) < 0) {
error << string_compose(_("AudioSource: cannot open peakpath (c) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
return -1;
}
_peaks_built = true;
}
- if (peakfile >= 0) {
- close (peakfile);
- peakfile = -1;
- }
+ delete _peakfile_descriptor;
+ _peakfile_descriptor = 0;
}
int
const size_t blocksize = (128 * 1024);
off_t first_peak_byte;
- if (peakfile < 0) {
+ if (_peakfile_descriptor == 0) {
prepare_for_peakfile_writes ();
}
off_t byte = (peak_leftover_frame / fpp) * sizeof (PeakData);
- if (::pwrite (peakfile, &x, sizeof (PeakData), byte) != sizeof (PeakData)) {
+ if (::pwrite (_peakfile_fd, &x, sizeof (PeakData), byte) != sizeof (PeakData)) {
error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg;
goto out;
}
less than BLOCKSIZE bytes. only call ftruncate if we'll make the file larger.
*/
- off_t endpos = lseek (peakfile, 0, SEEK_END);
+ off_t endpos = lseek (_peakfile_fd, 0, SEEK_END);
off_t target_length = blocksize * ((first_peak_byte + blocksize + 1) / blocksize);
if (endpos < target_length) {
- ftruncate (peakfile, target_length);
+ (void) ftruncate (_peakfile_fd, target_length);
/* error doesn't actually matter though, so continue on without testing */
}
}
- if (::pwrite (peakfile, peakbuf, sizeof (PeakData) * peaks_computed, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaks_computed)) {
+ if (::pwrite (_peakfile_fd, peakbuf, sizeof (PeakData) * peaks_computed, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaks_computed)) {
error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg;
goto out;
}
void
AudioSource::truncate_peakfile ()
{
- if (peakfile < 0) {
+ if (_peakfile_descriptor == 0) {
error << string_compose (_("programming error: %1"), "AudioSource::truncate_peakfile() called without open peakfile descriptor")
<< endmsg;
return;
/* truncate the peakfile down to its natural length if necessary */
- off_t end = lseek (peakfile, 0, SEEK_END);
+ off_t end = lseek (_peakfile_fd, 0, SEEK_END);
if (end > _peak_byte_max) {
- ftruncate (peakfile, _peak_byte_max);
+ (void) ftruncate (_peakfile_fd, _peak_byte_max);
}
}
projects / ardour.git / blobdiff