/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 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
peak_leftovers = 0;
}
-AudioSource::AudioSource (Session& s, const XMLNode& node)
+AudioSource::AudioSource (Session& s, const XMLNode& node)
: Source (s, node)
, _length (0)
{
-
+
_peaks_built = false;
_peak_byte_max = 0;
peakfile = -1;
peak_leftover_size = 0;
peak_leftovers = 0;
- if (set_state (node)) {
+ if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor();
}
}
AudioSource::~AudioSource ()
{
/* shouldn't happen but make sure we don't leak file descriptors anyway */
-
+
if (peak_leftover_cnt) {
cerr << "AudioSource destroyed with leftover peak data pending" << endl;
}
}
int
-AudioSource::set_state (const XMLNode& node)
+AudioSource::set_state (const XMLNode& node, int /*version*/)
{
const XMLProperty* prop;
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 (sigc::slot<void> the_slot, sigc::connection& conn) 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)) {
- conn = PeaksReady.connect (the_slot);
+ *connect_here_if_not = new ScopedConnection;
+ PeaksReady.connect (**connect_here_if_not, MISSING_INVALIDATOR, doThisWhenReady, event_loop);
}
return ret;
if (stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
return;
}
-
+
struct utimbuf tbuf;
-
+
tbuf.actime = statbuf.st_atime;
tbuf.modtime = time ((time_t) 0);
-
+
utime (peakpath.c_str(), &tbuf);
}
peakpath = peak_path (audio_path);
/* if the peak file should be there, but isn't .... */
-
+
if (!newfile && !Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
peakpath = find_broken_peakfile (peakpath, audio_path);
}
if (stat (peakpath.c_str(), &statbuf)) {
if (errno != ENOENT) {
/* it exists in the peaks dir, but there is some kind of error */
-
+
error << string_compose(_("AudioSource: cannot stat peakfile \"%1\""), peakpath) << endmsg;
return -1;
}
/* peakfile does not exist */
-
+
_peaks_built = false;
-
+
} else {
-
+
/* we found it in the peaks dir, so check it out */
-
+
if (statbuf.st_size == 0 || ((nframes_t) statbuf.st_size < ((length(_timeline_position) / _FPP) * sizeof (PeakData)))) {
// empty
_peaks_built = false;
// Check if the audio file has changed since the peakfile was built.
struct stat stat_file;
int err = stat (audio_path.c_str(), &stat_file);
-
+
if (err) {
_peaks_built = false;
_peak_byte_max = 0;
if (!newfile && !_peaks_built && _build_missing_peakfiles && _build_peakfiles) {
build_peaks_from_scratch ();
- }
-
+ }
+
return 0;
}
-nframes_t
-AudioSource::read (Sample *dst, sframes_t start, nframes_t cnt, int /*channel*/) const
+framecnt_t
+AudioSource::read (Sample *dst, framepos_t start, framecnt_t cnt, int /*channel*/) const
{
Glib::Mutex::Lock lm (_lock);
return read_unlocked (dst, start, cnt);
}
-nframes_t
-AudioSource::write (Sample *dst, nframes_t cnt)
+framecnt_t
+AudioSource::write (Sample *dst, framecnt_t cnt)
{
Glib::Mutex::Lock lm (_lock);
+ /* any write makes the fill not removable */
+ _flags = Flag (_flags & ~Removable);
return write_unlocked (dst, cnt);
}
int
-AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, sframes_t start, nframes_t cnt, double samples_per_visual_peak) const
+AudioSource::read_peaks (PeakData *peaks, framecnt_t npeaks, framepos_t start, framecnt_t cnt, double samples_per_visual_peak) const
{
return read_peaks_with_fpp (peaks, npeaks, start, cnt, samples_per_visual_peak, _FPP);
}
* @param npeaks Number of peaks to write.
*/
-int
-AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t start, nframes_t cnt,
- double samples_per_visual_peak, nframes_t samples_per_file_peak) const
+int
+AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t start, framecnt_t cnt,
+ double samples_per_visual_peak, framecnt_t samples_per_file_peak) const
{
Glib::Mutex::Lock lm (_lock);
double scale;
PeakData::PeakDatum xmin;
int32_t to_read;
uint32_t nread;
- nframes_t zero_fill = 0;
+ framecnt_t zero_fill = 0;
int ret = -1;
PeakData* staging = 0;
Sample* raw_staging = 0;
#undef DEBUG_READ_PEAKS
#ifdef DEBUG_READ_PEAKS
- cerr << "======>RP: npeaks = " << npeaks
- << " start = " << start
- << " cnt = " << cnt
- << " len = " << _length
- << " samples_per_visual_peak =" << samples_per_visual_peak
+ cerr << "======>RP: npeaks = " << npeaks
+ << " start = " << start
+ << " cnt = " << cnt
+ << " len = " << _length
+ << " samples_per_visual_peak =" << samples_per_visual_peak
<< " expected was " << expected_peaks << " ... scale = " << scale
<< " PD ptr = " << peaks
<<endl;
-
+
#endif
/* fix for near-end-of-file conditions */
if (cnt > _length - start) {
// cerr << "too close to end @ " << _length << " given " << start << " + " << cnt << endl;
cnt = _length - start;
- nframes_t old = npeaks;
- npeaks = min ((nframes_t) floor (cnt / samples_per_visual_peak), npeaks);
+ framecnt_t old = npeaks;
+ npeaks = min ((framecnt_t) floor (cnt / samples_per_visual_peak), npeaks);
zero_fill = old - npeaks;
}
-
+
// cerr << "actual npeaks = " << npeaks << " zf = " << zero_fill << endl;
if (npeaks == cnt) {
#ifdef DEBUG_READ_PEAKS
cerr << "RAW DATA\n";
-#endif
+#endif
/* no scaling at all, just get the sample data and duplicate it for
both max and min peak values.
*/
Sample* raw_staging = new Sample[cnt];
-
+
if (read_unlocked (raw_staging, start, cnt) != cnt) {
error << _("cannot read sample data for unscaled peak computation") << endmsg;
return -1;
}
- for (nframes_t i = 0; i < npeaks; ++i) {
+ for (framecnt_t i = 0; i < npeaks; ++i) {
peaks[i].max = raw_staging[i];
peaks[i].min = raw_staging[i];
}
#ifdef DEBUG_READ_PEAKS
cerr << "DIRECT PEAKS\n";
#endif
-
+
nread = ::pread (_peakfile, peaks, sizeof (PeakData)* npeaks, first_peak_byte);
close (_peakfile);
if (nread != sizeof (PeakData) * npeaks) {
cerr << "AudioSource["
<< _name
- << "]: cannot read peaks from peakfile! (read only "
+ << "]: cannot read peaks from peakfile! (read only "
<< nread
- << " not "
+ << " not "
<< npeaks
- << "at sample "
+ << "at sample "
<< start
<< " = byte "
<< first_peak_byte
}
- nframes_t tnp;
+ framecnt_t tnp;
if (scale < 1.0) {
#ifdef DEBUG_READ_PEAKS
cerr << "DOWNSAMPLE\n";
-#endif
+#endif
/* the caller wants:
- more frames-per-peak (lower resolution) than the peakfile, or to put it another way,
So, read a block into a staging area, and then downsample from there.
- to avoid confusion, I'll refer to the requested peaks as visual_peaks and the peakfile peaks as stored_peaks
+ to avoid confusion, I'll refer to the requested peaks as visual_peaks and the peakfile peaks as stored_peaks
*/
- const uint32_t chunksize = (uint32_t) min (expected_peaks, 65536.0);
+ const framecnt_t chunksize = (framecnt_t) min (expected_peaks, 65536.0);
staging = new PeakData[chunksize];
-
+
/* compute the rounded up frame position */
-
- nframes_t current_frame = start;
- nframes_t current_stored_peak = (nframes_t) ceil (current_frame / (double) samples_per_file_peak);
- uint32_t next_visual_peak = (uint32_t) ceil (current_frame / samples_per_visual_peak);
- double next_visual_peak_frame = next_visual_peak * samples_per_visual_peak;
- uint32_t stored_peak_before_next_visual_peak = (nframes_t) next_visual_peak_frame / samples_per_file_peak;
- uint32_t nvisual_peaks = 0;
- uint32_t stored_peaks_read = 0;
- uint32_t i = 0;
+
+ framepos_t current_frame = start;
+ framepos_t current_stored_peak = (framepos_t) ceil (current_frame / (double) samples_per_file_peak);
+ framepos_t next_visual_peak = (framepos_t) ceil (current_frame / samples_per_visual_peak);
+ double next_visual_peak_frame = next_visual_peak * samples_per_visual_peak;
+ framepos_t stored_peak_before_next_visual_peak = (framepos_t) next_visual_peak_frame / samples_per_file_peak;
+ framecnt_t nvisual_peaks = 0;
+ framecnt_t stored_peaks_read = 0;
+ framecnt_t i = 0;
/* handle the case where the initial visual peak is on a pixel boundary */
if ((_peakfile = ::open (peakpath.c_str(), O_RDONLY, 0664)) < 0) {
error << string_compose(_("AudioSource: cannot open peakpath (b) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
+ delete [] staging;
return 0;
}
if (i == stored_peaks_read) {
uint32_t start_byte = current_stored_peak * sizeof(PeakData);
- tnp = min ((nframes_t)(_length/samples_per_file_peak - current_stored_peak), (nframes_t) expected_peaks);
+ tnp = min ((framecnt_t)(_length/samples_per_file_peak - current_stored_peak), (framecnt_t) expected_peaks);
to_read = min (chunksize, tnp);
-
+
#ifdef DEBUG_READ_PEAKS
cerr << "read " << sizeof (PeakData) * to_read << " from peakfile @ " << start_byte << endl;
#endif
-
+
if ((nread = ::pread (_peakfile, staging, sizeof (PeakData) * to_read, start_byte))
!= sizeof (PeakData) * to_read) {
off_t fend = lseek (_peakfile, 0, SEEK_END);
-
+
cerr << "AudioSource["
<< _name
<< "]: cannot read peak data from peakfile ("
<< ") ("
<< strerror (errno)
<< ')'
- << " at start_byte = " << start_byte
+ << " at start_byte = " << start_byte
<< " _length = " << _length << " versus len = " << fend
<< " expected maxpeaks = " << (_length - current_frame)/samples_per_file_peak
<< " npeaks was " << npeaks
<< endl;
goto out;
}
-
+
i = 0;
stored_peaks_read = nread / sizeof(PeakData);
}
-
+
xmax = -1.0;
xmin = 1.0;
//next_visual_peak_frame = min ((next_visual_peak * samples_per_visual_peak), (next_visual_peak_frame+samples_per_visual_peak) );
next_visual_peak_frame = min ((double) start+cnt, (next_visual_peak_frame+samples_per_visual_peak) );
- stored_peak_before_next_visual_peak = (uint32_t) next_visual_peak_frame / samples_per_file_peak;
+ stored_peak_before_next_visual_peak = (uint32_t) next_visual_peak_frame / samples_per_file_peak;
}
if (zero_fill) {
- memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
- }
-
+ memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
+ }
+
ret = 0;
} else {
-
+
#ifdef DEBUG_READ_PEAKS
cerr << "UPSAMPLE\n";
#endif
- /* the caller wants
+ /* the caller wants
- less frames-per-peak (more resolution)
- more peaks than stored in the Peakfile
data on the fly.
*/
- nframes_t frames_read = 0;
- nframes_t current_frame = start;
- nframes_t i = 0;
- nframes_t nvisual_peaks = 0;
- nframes_t chunksize = (nframes_t) min (cnt, (nframes_t) 4096);
+ framecnt_t frames_read = 0;
+ framepos_t current_frame = start;
+ framecnt_t i = 0;
+ framecnt_t nvisual_peaks = 0;
+ framecnt_t chunksize = (framecnt_t) min (cnt, (framecnt_t) 4096);
raw_staging = new Sample[chunksize];
-
- nframes_t frame_pos = start;
+
+ framepos_t frame_pos = start;
double pixel_pos = floor (frame_pos / samples_per_visual_peak);
double next_pixel_pos = ceil (frame_pos / samples_per_visual_peak);
double pixels_per_frame = 1.0 / samples_per_visual_peak;
if (i == frames_read) {
- to_read = min (chunksize, nframes_t(_length - current_frame));
+ 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 (current_frame >= _length) {
- 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;
- }
-
+ /* 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;
}
-
+
xmax = max (xmax, raw_staging[i]);
xmin = min (xmin, raw_staging[i]);
++i;
next_pixel_pos = ceil (pixel_pos + 0.5);
}
}
-
+
if (zero_fill) {
memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
}
int
AudioSource::build_peaks_from_scratch ()
{
- nframes_t current_frame;
- nframes_t cnt;
Sample* buf = 0;
- nframes_t frames_read;
- nframes_t frames_to_read;
- const nframes_t bufsize = 65536; // 256kB per disk read for mono data is about ideal
+
+ const framecnt_t bufsize = 65536; // 256kB per disk read for mono data is about ideal
int ret = -1;
/* hold lock while building peaks */
Glib::Mutex::Lock lp (_lock);
-
+
if (prepare_for_peakfile_writes ()) {
goto out;
}
-
- current_frame = 0;
- cnt = _length;
+
+ framepos_t current_frame = 0;
+ framecnt_t cnt = _length;
+
_peaks_built = false;
buf = new Sample[bufsize];
while (cnt) {
-
- frames_to_read = min (bufsize, cnt);
+
+ framecnt_t frames_to_read = min (bufsize, cnt);
+ framecnt_t frames_read;
if ((frames_read = read_unlocked (buf, current_frame, frames_to_read)) != frames_to_read) {
error << string_compose(_("%1: could not write read raw data for peak computation (%2)"), _name, strerror (errno)) << endmsg;
if (compute_and_write_peaks (buf, current_frame, frames_read, true, false, _FPP)) {
break;
}
-
+
current_frame += frames_read;
cnt -= frames_read;
}
if (cnt == 0) {
/* success */
truncate_peakfile();
- }
+ }
done_with_peakfile_writes ((cnt == 0));
}
-
+
{
Glib::Mutex::Lock lm (_peaks_ready_lock);
-
+
if (_peaks_built) {
PeaksReady (); /* EMIT SIGNAL */
ret = 0;
if (peak_leftover_cnt) {
compute_and_write_peaks (0, 0, 0, true, false, _FPP);
}
-
+
if (done) {
_peaks_built = true;
}
}
int
-AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframes_t cnt,
- bool force, bool intermediate_peaks_ready)
+AudioSource::compute_and_write_peaks (Sample* buf, framepos_t first_frame, framecnt_t cnt,
+ bool force, bool intermediate_peaks_ready)
{
return compute_and_write_peaks (buf, first_frame, cnt, force, intermediate_peaks_ready, _FPP);
}
int
-AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframes_t cnt,
- bool force, bool intermediate_peaks_ready, nframes_t fpp)
+AudioSource::compute_and_write_peaks (Sample* buf, framepos_t first_frame, framecnt_t cnt,
+ bool force, bool intermediate_peaks_ready, framecnt_t fpp)
{
Sample* buf2 = 0;
- nframes_t to_do;
+ framecnt_t to_do;
uint32_t peaks_computed;
PeakData* peakbuf = 0;
int ret = -1;
- nframes_t current_frame;
- nframes_t frames_done;
+ framepos_t current_frame;
+ framecnt_t frames_done;
const size_t blocksize = (128 * 1024);
off_t first_peak_byte;
if (first_frame != peak_leftover_frame + peak_leftover_cnt) {
- /* uh-oh, ::seek() since the last ::compute_and_write_peaks(),
+ /* uh-oh, ::seek() since the last ::compute_and_write_peaks(),
and we have leftovers. flush a single peak (since the leftovers
never represent more than that, and restart.
*/
-
+
PeakData x;
-
+
x.min = peak_leftovers[0];
x.max = peak_leftovers[0];
_peak_byte_max = max (_peak_byte_max, (off_t) (byte + sizeof(PeakData)));
- {
+ {
Glib::Mutex::Lock lm (_peaks_ready_lock);
PeakRangeReady (peak_leftover_frame, peak_leftover_cnt); /* EMIT SIGNAL */
if (intermediate_peaks_ready) {
PeaksReady (); /* EMIT SIGNAL */
- }
+ }
}
/* left overs are done */
/* make sure that when we write into the peakfile, we startup where we left off */
first_frame = peak_leftover_frame;
-
+
} else {
to_do = cnt;
}
break;
}
-
- nframes_t this_time = min (fpp, to_do);
+
+ framecnt_t this_time = min (fpp, to_do);
peakbuf[peaks_computed].max = buf[0];
peakbuf[peaks_computed].min = buf[0];
frames_done += this_time;
current_frame += this_time;
}
-
+
first_peak_byte = (first_frame / fpp) * sizeof (PeakData);
if (can_truncate_peaks()) {
/* on some filesystems (ext3, at least) this helps to reduce fragmentation of
the peakfiles. its not guaranteed to do so, and even on ext3 (as of december 2006)
- it does not cause single-extent allocation even for peakfiles of
+ it does not cause single-extent allocation even for peakfiles of
less than BLOCKSIZE bytes. only call ftruncate if we'll make the file larger.
*/
-
+
off_t endpos = lseek (peakfile, 0, SEEK_END);
off_t target_length = blocksize * ((first_peak_byte + blocksize + 1) / blocksize);
-
+
if (endpos < target_length) {
ftruncate (peakfile, target_length);
/* error doesn't actually matter though, so continue on without testing */
goto out;
}
- _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + sizeof(PeakData)*peaks_computed));
+ _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + sizeof(PeakData)*peaks_computed));
if (frames_done) {
Glib::Mutex::Lock lm (_peaks_ready_lock);
/* truncate the peakfile down to its natural length if necessary */
off_t end = lseek (peakfile, 0, SEEK_END);
-
+
if (end > _peak_byte_max) {
ftruncate (peakfile, _peak_byte_max);
}
}
-bool
-AudioSource::file_changed (ustring path)
-{
- struct stat stat_file;
- struct stat stat_peak;
-
- int e1 = stat (path.c_str(), &stat_file);
- int e2 = stat (peak_path(path).c_str(), &stat_peak);
-
- if (!e1 && !e2 && stat_file.st_mtime > stat_peak.st_mtime){
- return true;
- } else {
- return false;
- }
-}
-
-nframes_t
+framecnt_t
AudioSource::available_peaks (double zoom_factor) const
{
if (zoom_factor < _FPP) {
return length(_timeline_position); // peak data will come from the audio file
- }
-
+ }
+
/* peak data comes from peakfile, but the filesize might not represent
the valid data due to ftruncate optimizations, so use _peak_byte_max state.
XXX - there might be some atomicity issues here, we should probably add a lock,
projects / ardour.git / blobdiff