X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiosource.cc;h=93e201b8c2843171a86208fd77338b0d0de793a1;hb=8713667ec1a6cc9ba56c07f763e5a422cc47fbef;hp=073983ac41f758de01ab982ffb38013389397cc1;hpb=c268314b64c2235b0d69c3854e303accd2cad4d9;p=ardour.git diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index 073983ac41..93e201b8c2 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -1,5 +1,5 @@ /* - 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 @@ -27,64 +27,82 @@ #include #include #include +#include #include #include -#include -#include +#include +#include -#include -#include +#include "pbd/xml++.h" +#include "pbd/pthread_utils.h" + +#include "ardour/audiosource.h" +#include "ardour/cycle_timer.h" +#include "ardour/session.h" +#include "ardour/transient_detector.h" +#include "ardour/runtime_functions.h" #include "i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; - -pthread_t AudioSource::peak_thread; -bool AudioSource::have_peak_thread = false; -vector > AudioSource::pending_peak_sources; -Glib::Mutex* AudioSource::pending_peak_sources_lock = 0; -int AudioSource::peak_request_pipe[2]; +using Glib::ustring; bool AudioSource::_build_missing_peakfiles = false; + +/** true if we want peakfiles (e.g. if we are displaying a GUI) */ bool AudioSource::_build_peakfiles = false; -AudioSource::AudioSource (Session& s, string name) - : Source (s, name) -{ - if (pending_peak_sources_lock == 0) { - pending_peak_sources_lock = new Glib::Mutex; - } +#define _FPP 256 +AudioSource::AudioSource (Session& s, ustring name) + : Source (s, DataType::AUDIO, name) + , _length (0) +{ _peaks_built = false; _peak_byte_max = 0; - next_peak_clear_should_notify = true; + peakfile = -1; _read_data_count = 0; _write_data_count = 0; + peak_leftover_cnt = 0; + peak_leftover_size = 0; + peak_leftovers = 0; } -AudioSource::AudioSource (Session& s, const XMLNode& node) +AudioSource::AudioSource (Session& s, const XMLNode& node) : Source (s, node) + , _length (0) { - if (pending_peak_sources_lock == 0) { - pending_peak_sources_lock = new Glib::Mutex; - } _peaks_built = false; _peak_byte_max = 0; - next_peak_clear_should_notify = true; + peakfile = -1; _read_data_count = 0; _write_data_count = 0; + peak_leftover_cnt = 0; + 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; + } + + if (peakfile >= 0) { + ::close (peakfile); + } + + delete [] peak_leftovers; } XMLNode& @@ -100,12 +118,10 @@ AudioSource::get_state () } int -AudioSource::set_state (const XMLNode& node) +AudioSource::set_state (const XMLNode& node, int version) { const XMLProperty* prop; - Source::set_state (node); - if ((prop = node.property ("captured-for")) != 0) { _captured_for = prop->value(); } @@ -113,180 +129,30 @@ AudioSource::set_state (const XMLNode& node) return 0; } -/*********************************************************************** - PEAK FILE STUFF - ***********************************************************************/ - -void* -AudioSource::peak_thread_work (void* arg) -{ - PBD::ThreadCreated (pthread_self(), X_("Peak")); - struct pollfd pfd[1]; - - if (pending_peak_sources_lock == 0) { - pending_peak_sources_lock = new Glib::Mutex; - } - - Glib::Mutex::Lock lm (*pending_peak_sources_lock); - - while (true) { - - pfd[0].fd = peak_request_pipe[0]; - pfd[0].events = POLLIN|POLLERR|POLLHUP; - - pending_peak_sources_lock->unlock (); - - if (poll (pfd, 1, -1) < 0) { - - if (errno == EINTR) { - pending_peak_sources_lock->lock (); - continue; - } - - error << string_compose (_("poll on peak request pipe failed (%1)"), - strerror (errno)) - << endmsg; - break; - } - - if (pfd[0].revents & ~POLLIN) { - error << _("Error on peak thread request pipe") << endmsg; - break; - } - - if (pfd[0].revents & POLLIN) { - - char req; - - /* empty the pipe of all current requests */ - - while (1) { - size_t nread = ::read (peak_request_pipe[0], &req, sizeof (req)); - - if (nread == 1) { - switch ((PeakRequest::Type) req) { - - case PeakRequest::Build: - break; - - case PeakRequest::Quit: - pthread_exit_pbd (0); - /*NOTREACHED*/ - break; - - default: - break; - } - - } else if (nread == 0) { - break; - } else if (errno == EAGAIN) { - break; - } else { - fatal << _("Error reading from peak request pipe") << endmsg; - /*NOTREACHED*/ - } - } - } - - pending_peak_sources_lock->lock (); - - while (!pending_peak_sources.empty()) { - - boost::shared_ptr s = pending_peak_sources.front(); - pending_peak_sources.erase (pending_peak_sources.begin()); - - pending_peak_sources_lock->unlock (); - s->build_peaks(); - pending_peak_sources_lock->lock (); - } - } - - pthread_exit_pbd (0); - /*NOTREACHED*/ - return 0; -} - -int -AudioSource::start_peak_thread () +sframes_t +AudioSource::length (sframes_t /*pos*/) const { - if (!_build_peakfiles) { - return 0; - } - - if (pipe (peak_request_pipe)) { - error << string_compose(_("Cannot create transport request signal pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (fcntl (peak_request_pipe[0], F_SETFL, O_NONBLOCK)) { - error << string_compose(_("UI: cannot set O_NONBLOCK on peak request pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (fcntl (peak_request_pipe[1], F_SETFL, O_NONBLOCK)) { - error << string_compose(_("UI: cannot set O_NONBLOCK on peak request pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (pthread_create_and_store ("peak file builder", &peak_thread, 0, peak_thread_work, 0)) { - error << _("AudioSource: could not create peak thread") << endmsg; - return -1; - } - - have_peak_thread = true; - return 0; + return _length; } void -AudioSource::stop_peak_thread () +AudioSource::update_length (sframes_t pos, sframes_t cnt) { - if (!have_peak_thread) { - return; - } - - void* status; - - char c = (char) PeakRequest::Quit; - ::write (peak_request_pipe[1], &c, 1); - pthread_join (peak_thread, &status); -} - -void -AudioSource::queue_for_peaks (boost::shared_ptr source, bool notify) -{ - if (have_peak_thread) { - - Glib::Mutex::Lock lm (*pending_peak_sources_lock); - - source->next_peak_clear_should_notify = notify; - - if (find (pending_peak_sources.begin(), - pending_peak_sources.end(), - source) == pending_peak_sources.end()) { - pending_peak_sources.push_back (source); - } - - char c = (char) PeakRequest::Build; - ::write (peak_request_pipe[1], &c, 1); + if (pos + cnt > _length) { + _length = pos + cnt; } } -void AudioSource::clear_queue_for_peaks () -{ - /* this is done to cancel a group of running peak builds */ - if (have_peak_thread) { - Glib::Mutex::Lock lm (*pending_peak_sources_lock); - pending_peak_sources.clear (); - } -} +/*********************************************************************** + PEAK FILE STUFF + ***********************************************************************/ bool AudioSource::peaks_ready (sigc::slot the_slot, sigc::connection& conn) const { bool ret; - Glib::Mutex::Lock lm (_lock); + Glib::Mutex::Lock lm (_peaks_ready_lock); /* check to see if the peak data is ready. if not connect the slot while still holding the lock. @@ -307,21 +173,21 @@ AudioSource::touch_peakfile () 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); } int -AudioSource::rename_peakfile (string newpath) +AudioSource::rename_peakfile (ustring newpath) { /* caller must hold _lock */ - string oldpath = peakpath; + ustring oldpath = peakpath; if (access (oldpath.c_str(), F_OK) == 0) { if (rename (oldpath.c_str(), newpath.c_str()) != 0) { @@ -336,55 +202,52 @@ AudioSource::rename_peakfile (string newpath) } int -AudioSource::initialize_peakfile (bool newfile, string audio_path) +AudioSource::initialize_peakfile (bool newfile, ustring audio_path) { struct stat statbuf; peakpath = peak_path (audio_path); - /* Nasty band-aid for older sessions that were created before we - used libsndfile for all audio files. - */ - - if (!newfile && access (peakpath.c_str(), R_OK) != 0) { - string str = old_peak_path (audio_path); - if (access (str.c_str(), R_OK) == 0) { - peakpath = str; - } + /* 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 (newfile) { + if (stat (peakpath.c_str(), &statbuf)) { + if (errno != ENOENT) { + /* it exists in the peaks dir, but there is some kind of error */ - if (!_build_peakfiles) { - return 0; + error << string_compose(_("AudioSource: cannot stat peakfile \"%1\""), peakpath) << endmsg; + return -1; } + /* peakfile does not exist */ + _peaks_built = false; } else { - 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; - } - - _peaks_built = false; + /* 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; } else { - - /* we found it in the peaks dir, so check it out */ + // 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 (statbuf.st_size == 0) { + if (err) { _peaks_built = false; + _peak_byte_max = 0; } else { - // 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 && stat_file.st_mtime > statbuf.st_mtime){ + + /* allow 6 seconds slop on checking peak vs. file times because of various + disk action "races" + */ + + if (stat_file.st_mtime > statbuf.st_mtime && (stat_file.st_mtime - statbuf.st_mtime > 6)) { _peaks_built = false; _peak_byte_max = 0; } else { @@ -397,13 +260,13 @@ AudioSource::initialize_peakfile (bool newfile, string audio_path) if (!newfile && !_peaks_built && _build_missing_peakfiles && _build_peakfiles) { build_peaks_from_scratch (); - } - + } + return 0; } nframes_t -AudioSource::read (Sample *dst, nframes_t start, nframes_t cnt) const +AudioSource::read (Sample *dst, sframes_t start, nframes_t cnt, int /*channel*/) const { Glib::Mutex::Lock lm (_lock); return read_unlocked (dst, start, cnt); @@ -416,8 +279,19 @@ AudioSource::write (Sample *dst, nframes_t cnt) return write_unlocked (dst, cnt); } -int -AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt, double samples_per_visual_peak) const +int +AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, sframes_t start, nframes_t cnt, double samples_per_visual_peak) const +{ + return read_peaks_with_fpp (peaks, npeaks, start, cnt, samples_per_visual_peak, _FPP); +} + +/** @param peaks Buffer to write peak data. + * @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 { Glib::Mutex::Lock lm (_lock); double scale; @@ -430,22 +304,22 @@ AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nfr int ret = -1; PeakData* staging = 0; Sample* raw_staging = 0; - int peakfile = -1; + int _peakfile = -1; - expected_peaks = (cnt / (double) frames_per_peak); + expected_peaks = (cnt / (double) samples_per_file_peak); scale = npeaks/expected_peaks; #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 <= 0) { - close (peakfile); + if (_peakfile >= 0) { + close (_peakfile); } - if (staging) { - delete [] staging; - } - - if (raw_staging) { - delete [] raw_staging; - } + delete [] staging; + delete [] raw_staging; #ifdef DEBUG_READ_PEAKS cerr << "RP DONE\n"; @@ -729,203 +607,308 @@ AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nfr #undef DEBUG_PEAK_BUILD int -AudioSource::build_peaks () +AudioSource::build_peaks_from_scratch () { - vector built; - int status = -1; - bool pr_signal = false; - list copy; + 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 + + int ret = -1; { - Glib::Mutex::Lock lm (_lock); - copy = pending_peak_builds; - pending_peak_builds.clear (); - } - -#ifdef DEBUG_PEAK_BUILD - cerr << "build peaks with " << copy.size() << " requests pending\n"; -#endif - - for (list::iterator i = copy.begin(); i != copy.end(); ++i) { - - if ((status = do_build_peak ((*i)->frame, (*i)->cnt)) != 0) { - unlink (peakpath.c_str()); - break; + /* hold lock while building peaks */ + + Glib::Mutex::Lock lp (_lock); + + if (prepare_for_peakfile_writes ()) { + goto out; } - built.push_back (new PeakBuildRecord (*(*i))); - delete *i; - } - { - Glib::Mutex::Lock lm (_lock); + current_frame = 0; + cnt = _length; + _peaks_built = false; + buf = new Sample[bufsize]; - if (status == 0) { - _peaks_built = true; - - if (next_peak_clear_should_notify) { - next_peak_clear_should_notify = false; - pr_signal = true; + while (cnt) { + + frames_to_read = min (bufsize, cnt); + + 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; + done_with_peakfile_writes (false); + goto out; } - } - } - if (status == 0) { - for (vector::iterator i = built.begin(); i != built.end(); ++i) { - PeakRangeReady ((*i)->frame, (*i)->cnt); /* EMIT SIGNAL */ - delete *i; + if (compute_and_write_peaks (buf, current_frame, frames_read, true, false, _FPP)) { + break; + } + + current_frame += frames_read; + cnt -= frames_read; } - if (pr_signal) { + 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; } } - return status; + out: + if (ret) { + unlink (peakpath.c_str()); + } + + delete [] buf; + + return ret; +} + +int +AudioSource::prepare_for_peakfile_writes () +{ + if ((peakfile = ::open (peakpath.c_str(), O_RDWR|O_CREAT, 0664)) < 0) { + error << string_compose(_("AudioSource: cannot open peakpath (c) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + return -1; + } + return 0; +} + +void +AudioSource::done_with_peakfile_writes (bool done) +{ + if (peak_leftover_cnt) { + compute_and_write_peaks (0, 0, 0, true, false, _FPP); + } + + if (done) { + _peaks_built = true; + } + + if (peakfile >= 0) { + close (peakfile); + peakfile = -1; + } +} + +int +AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframes_t cnt, + bool force, bool intermediate_peaks_ready) +{ + return compute_and_write_peaks (buf, first_frame, cnt, force, intermediate_peaks_ready, _FPP); } int -AudioSource::do_build_peak (nframes_t first_frame, nframes_t cnt) +AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframes_t cnt, + bool force, bool intermediate_peaks_ready, nframes_t fpp) { + Sample* buf2 = 0; + nframes_t to_do; + uint32_t peaks_computed; + PeakData* peakbuf = 0; + int ret = -1; nframes_t current_frame; - Sample buf[frames_per_peak]; - Sample xmin, xmax; - uint32_t peaki; - PeakData* peakbuf; - nframes_t frames_read; - nframes_t frames_to_read; + nframes_t frames_done; + const size_t blocksize = (128 * 1024); off_t first_peak_byte; - int peakfile = -1; - int ret = -1; - off_t target_length; - off_t endpos; -#ifdef DEBUG_PEAK_BUILD - cerr << pthread_self() << ": " << _name << ": building peaks for " << first_frame << " to " << first_frame + cnt - 1 << endl; -#endif + if (peakfile < 0) { + prepare_for_peakfile_writes (); + } - first_peak_byte = (first_frame / frames_per_peak) * sizeof (PeakData); + restart: + if (peak_leftover_cnt) { -#ifdef DEBUG_PEAK_BUILD - cerr << "seeking to " << first_peak_byte << " before writing new peak data\n"; -#endif + if (first_frame != peak_leftover_frame + peak_leftover_cnt) { - current_frame = first_frame; - peakbuf = new PeakData[(cnt/frames_per_peak)+1]; - peaki = 0; + /* 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. + */ - if ((peakfile = ::open (peakpath.c_str(), O_RDWR|O_CREAT, 0664)) < 0) { - error << string_compose(_("AudioSource: cannot open peakpath \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; - return -1; - } - - while (cnt) { + PeakData x; - frames_to_read = min (frames_per_peak, cnt); + x.min = peak_leftovers[0]; + x.max = peak_leftovers[0]; - /* lock for every read */ + off_t byte = (peak_leftover_frame / fpp) * sizeof (PeakData); - if ((frames_read = read (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; - goto out; + if (::pwrite (peakfile, &x, sizeof (PeakData), byte) != sizeof (PeakData)) { + error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg; + goto out; + } + + _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 */ + + peak_leftover_cnt = 0; + goto restart; } - xmin = buf[0]; - xmax = buf[0]; + /* else ... had leftovers, but they immediately preceed the new data, so just + merge them and compute. + */ + + /* make a new contiguous buffer containing leftovers and the new stuff */ + + to_do = cnt + peak_leftover_cnt; + buf2 = new Sample[to_do]; + + /* the remnants */ + memcpy (buf2, peak_leftovers, peak_leftover_cnt * sizeof (Sample)); + + /* the new stuff */ + memcpy (buf2+peak_leftover_cnt, buf, cnt * sizeof (Sample)); + + /* no more leftovers */ + peak_leftover_cnt = 0; + + /* use the temporary buffer */ + buf = buf2; - for (nframes_t n = 1; n < frames_read; ++n) { - xmax = max (xmax, buf[n]); - xmin = min (xmin, buf[n]); + /* make sure that when we write into the peakfile, we startup where we left off */ -// if (current_frame < frames_read) { -// cerr << "sample = " << buf[n] << " max = " << xmax << " min = " << xmin << " max of 2 = " << max (xmax, buf[n]) << endl; -// } + first_frame = peak_leftover_frame; + + } else { + to_do = cnt; + } + + peakbuf = new PeakData[(to_do/fpp)+1]; + peaks_computed = 0; + current_frame = first_frame; + frames_done = 0; + + while (to_do) { + + /* if some frames were passed in (i.e. we're not flushing leftovers) + and there are less than fpp to do, save them till + next time + */ + + if (force && (to_do < fpp)) { + /* keep the left overs around for next time */ + + if (peak_leftover_size < to_do) { + delete [] peak_leftovers; + peak_leftovers = new Sample[to_do]; + peak_leftover_size = to_do; + } + memcpy (peak_leftovers, buf, to_do * sizeof (Sample)); + peak_leftover_cnt = to_do; + peak_leftover_frame = current_frame; + + /* done for now */ + + break; } - peakbuf[peaki].max = xmax; - peakbuf[peaki].min = xmin; - peaki++; + nframes_t this_time = min (fpp, to_do); + + peakbuf[peaks_computed].max = buf[0]; + peakbuf[peaks_computed].min = buf[0]; + + ARDOUR::find_peaks (buf+1, this_time-1, &peakbuf[peaks_computed].min, &peakbuf[peaks_computed].max); - current_frame += frames_read; - cnt -= frames_read; + peaks_computed++; + buf += this_time; + to_do -= this_time; + frames_done += this_time; + current_frame += this_time; } -#define BLOCKSIZE (128 * 1024) + first_peak_byte = (first_frame / fpp) * sizeof (PeakData); - /* 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 - less than BLOCKSIZE bytes. only call ftruncate if we'll make the file larger. - */ - endpos = lseek (peakfile, 0, SEEK_END); - - target_length = BLOCKSIZE * ((first_peak_byte + BLOCKSIZE + 1) / BLOCKSIZE); + 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 + less than BLOCKSIZE bytes. only call ftruncate if we'll make the file larger. + */ - if (endpos < target_length) { - // XXX - we really shouldn't be doing this for destructive source peaks - ftruncate (peakfile, target_length); - //cerr << "do build TRUNC: " << peakpath << " " << target_length << endl; + off_t endpos = lseek (peakfile, 0, SEEK_END); + off_t target_length = blocksize * ((first_peak_byte + blocksize + 1) / blocksize); - /* error doesn't actually matter though, so continue on without testing */ + if (endpos < target_length) { + ftruncate (peakfile, target_length); + /* error doesn't actually matter though, so continue on without testing */ + } } - if (::pwrite (peakfile, peakbuf, sizeof (PeakData) * peaki, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaki)) { + if (::pwrite (peakfile, 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; } - _peak_byte_max = max(_peak_byte_max, (off_t) (first_peak_byte + sizeof(PeakData)*peaki)); + _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); + PeakRangeReady (first_frame, frames_done); /* EMIT SIGNAL */ + if (intermediate_peaks_ready) { + PeaksReady (); /* EMIT SIGNAL */ + } + } ret = 0; out: delete [] peakbuf; - if (peakfile >= 0) { - close (peakfile); - } - return ret; -} - -void -AudioSource::build_peaks_from_scratch () -{ - Glib::Mutex::Lock lp (_lock); + delete [] buf2; - next_peak_clear_should_notify = true; - pending_peak_builds.push_back (new PeakBuildRecord (0, _length)); - queue_for_peaks (shared_from_this(), true); + return ret; } void AudioSource::truncate_peakfile () { - int peakfile = -1; + if (peakfile < 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 */ - if ((peakfile = ::open (peakpath.c_str(), O_RDWR)) >= 0) { - off_t end = lseek (peakfile, 0, SEEK_END); - - if (end > _peak_byte_max) { - ftruncate(peakfile, _peak_byte_max); - //cerr << "truncated " << peakpath << " to " << _peak_byte_max << " bytes" << endl; - } - else { - //cerr << "NOT truncated " << peakpath << " to " << _peak_byte_max << " end " << end << endl; - } - close (peakfile); + off_t end = lseek (peakfile, 0, SEEK_END); + + if (end > _peak_byte_max) { + ftruncate (peakfile, _peak_byte_max); } } bool -AudioSource::file_changed (string path) +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 { @@ -936,28 +919,18 @@ AudioSource::file_changed (string path) nframes_t AudioSource::available_peaks (double zoom_factor) const { - off_t end; + if (zoom_factor < _FPP) { + return length(_timeline_position); // peak data will come from the audio file + } - if (zoom_factor < frames_per_peak) { - return length(); // 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, but _peak_byte_max only monotonically increases after initialization. */ - end = _peak_byte_max; - - return (end/sizeof(PeakData)) * frames_per_peak; -} + off_t end = _peak_byte_max; -void -AudioSource::update_length (nframes_t pos, nframes_t cnt) -{ - if (pos + cnt > _length) { - _length = pos+cnt; - } + return (end/sizeof(PeakData)) * _FPP; }