NO-OP: whitespace
[ardour.git] / libs / ardour / audiosource.cc
index 9aee818588618d463066e3efeb280c963565de8a..6200b35d148cfcfd6277df946eada7d112308a92 100644 (file)
@@ -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
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: source.cc 404 2006-03-17 17:39:21Z pauld $
 */
 
-#include <sys/stat.h>
+#ifdef COMPILER_MSVC
+#include <sys/utime.h>
+#else
 #include <unistd.h>
+#include <utime.h>
+#endif
+#include <sys/stat.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <float.h>
-#include <utime.h>
 #include <cerrno>
 #include <ctime>
 #include <cmath>
 #include <algorithm>
 #include <vector>
 
-#include <pbd/xml++.h>
-#include <pbd/pthread_utils.h>
+#ifdef PLATFORM_WINDOWS
+#include <windows.h>
+
+#else
+#include <sys/mman.h>
+
+#endif
+
+#include <glib.h>
+#include "pbd/gstdio_compat.h"
+
+#include <boost/scoped_ptr.hpp>
+
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
+
+#include "pbd/file_utils.h"
+#include "pbd/scoped_file_descriptor.h"
+#include "pbd/xml++.h"
 
-#include <ardour/audiosource.h>
+#include "ardour/audiosource.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/runtime_functions.h"
+#include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
+
+#include "ardour/debug.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-pthread_t                    AudioSource::peak_thread;
-bool                         AudioSource::have_peak_thread = false;
-vector<AudioSource*>         AudioSource::pending_peak_sources;
-Glib::Mutex*                 AudioSource::pending_peak_sources_lock = 0;
-int                          AudioSource::peak_request_pipe[2];
-
+Glib::Threads::Mutex AudioSource::_level_buffer_lock;
+vector<boost::shared_array<Sample> > AudioSource::_mixdown_buffers;
+vector<boost::shared_array<gain_t> > AudioSource::_gain_buffers;
 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)
+#define _FPP 256
+
+AudioSource::AudioSource (Session& s, const string& name)
+       : Source (s, DataType::AUDIO, name)
+       , _length (0)
+       , _peak_byte_max (0)
+       , _peaks_built (false)
+       , _peakfile_fd (-1)
+       , peak_leftover_cnt (0)
+       , peak_leftover_size (0)
+       , peak_leftovers (0)
+       , _first_run (true)
+       , _last_scale (0.0)
+       , _last_map_off (0)
+       , _last_raw_map_length (0)
 {
-       if (pending_peak_sources_lock == 0) {
-               pending_peak_sources_lock = new Glib::Mutex;
-       }
-
-       _peaks_built = false;
-       next_peak_clear_should_notify = true;
-       _read_data_count = 0;
-       _write_data_count = 0;
 }
 
-AudioSource::AudioSource (Session& s, const XMLNode& node) 
+AudioSource::AudioSource (Session& s, const XMLNode& node)
        : Source (s, node)
+       , _length (0)
+       , _peak_byte_max (0)
+       , _peaks_built (false)
+       , _peakfile_fd (-1)
+       , peak_leftover_cnt (0)
+       , peak_leftover_size (0)
+       , peak_leftovers (0)
+       , _first_run (true)
+       , _last_scale (0.0)
+       , _last_map_off (0)
+       , _last_raw_map_length (0)
 {
-       if (pending_peak_sources_lock == 0) {
-               pending_peak_sources_lock = new Glib::Mutex;
-       }
-
-       _peaks_built = false;
-       next_peak_clear_should_notify = true;
-       _read_data_count = 0;
-       _write_data_count = 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 ((-1) != _peakfile_fd) {
+               close (_peakfile_fd);
+               _peakfile_fd = -1;
+       }
+
+       delete [] peak_leftovers;
 }
 
 XMLNode&
@@ -91,207 +133,62 @@ AudioSource::get_state ()
        XMLNode& node (Source::get_state());
 
        if (_captured_for.length()) {
-               node.add_property ("captured-for", _captured_for);
+               node.set_property ("captured-for", _captured_for);
        }
 
        return node;
 }
 
 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();
-       }
-
+       node.get_property ("captured-for", _captured_for);
        return 0;
 }
 
-/***********************************************************************
-  PEAK FILE STUFF
- ***********************************************************************/
-
-void*
-AudioSource::peak_thread_work (void* arg)
+bool
+AudioSource::empty () const
 {
-       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()) {
-
-                       AudioSource* 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;
+        return _length == 0;
 }
 
-int
-AudioSource::start_peak_thread ()
+samplecnt_t
+AudioSource::length (samplepos_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 (samplecnt_t len)
 {
-       if (!have_peak_thread) {
-               return;
+       if (len > _length) {
+               _length = len;
        }
-
-       void* status;
-
-       char c = (char) PeakRequest::Quit;
-       ::write (peak_request_pipe[1], &c, 1);
-       pthread_join (peak_thread, &status);
 }
 
-void 
-AudioSource::queue_for_peaks (AudioSource* source)
-{
-       if (have_peak_thread) {
-               
-               Glib::Mutex::Lock lm (*pending_peak_sources_lock);
-               
-               source->next_peak_clear_should_notify = true;
-               
-               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);
-       }
-}
-
-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
+ ***********************************************************************/
 
+/** 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 (_lock);
-
-       /* check to see if the peak data is ready. if not
-          connect the slot while still holding the lock.
-       */
+       Glib::Threads::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;
@@ -300,18 +197,18 @@ AudioSource::peaks_ready (sigc::slot<void> the_slot, sigc::connection& conn) con
 void
 AudioSource::touch_peakfile ()
 {
-       struct stat statbuf;
+       GStatBuf statbuf;
 
-       if (stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
+       if (g_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);
+       tbuf.modtime = time ((time_t*) 0);
+
+       g_utime (_peakpath.c_str(), &tbuf);
 }
 
 int
@@ -319,233 +216,328 @@ AudioSource::rename_peakfile (string newpath)
 {
        /* caller must hold _lock */
 
-       string oldpath = peakpath;
+       string oldpath = _peakpath;
 
-       if (access (oldpath.c_str(), F_OK) == 0) {
-               if (rename (oldpath.c_str(), newpath.c_str()) != 0) {
+       if (Glib::file_test (oldpath, Glib::FILE_TEST_EXISTS)) {
+               if (g_rename (oldpath.c_str(), newpath.c_str()) != 0) {
                        error << string_compose (_("cannot rename peakfile for %1 from %2 to %3 (%4)"), _name, oldpath, newpath, strerror (errno)) << endmsg;
                        return -1;
                }
        }
 
-       peakpath = newpath;
+       _peakpath = newpath;
 
        return 0;
 }
 
 int
-AudioSource::initialize_peakfile (bool newfile, string audio_path)
+AudioSource::initialize_peakfile (const string& audio_path, const bool in_session)
 {
-       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;
+       Glib::Threads::Mutex::Lock lm (_initialize_peaks_lock);
+       GStatBuf statbuf;
+
+       _peakpath = construct_peak_filepath (audio_path, in_session);
+
+       if (!empty() && !Glib::file_test (_peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
+               string oldpeak = construct_peak_filepath (audio_path, in_session, true);
+               DEBUG_TRACE(DEBUG::Peaks, string_compose ("Looking for old peak file %1 for Audio file %2\n", oldpeak, audio_path));
+               if (Glib::file_test (oldpeak.c_str(), Glib::FILE_TEST_EXISTS)) {
+                       // TODO use hard-link if possible
+                       DEBUG_TRACE(DEBUG::Peaks, string_compose ("Copy old peakfile %1 to %2\n", oldpeak, _peakpath));
+                       PBD::copy_file (oldpeak, _peakpath);
                }
        }
 
-       if (newfile) {
+       DEBUG_TRACE(DEBUG::Peaks, string_compose ("Initialize Peakfile %1 for Audio file %2\n", _peakpath, audio_path));
 
-               if (!_build_peakfiles) {
-                       return 0;
+       if (g_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;
                }
 
+               DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 does not exist\n", _peakpath));
+
                _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;
-                       }
-               } else {
-                       
-                       /* we found it in the peaks dir */
-               }
-               
-               if (statbuf.st_size == 0) {
+               /* we found it in the peaks dir, so check it out */
+
+               if (statbuf.st_size == 0 || (statbuf.st_size < (off_t) ((length(_timeline_position) / _FPP) * sizeof (PeakData)))) {
+                       DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 is empty\n", _peakpath));
                        _peaks_built = false;
                } 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){
-                               _peaks_built = false;
-                       } else {
+                       GStatBuf stat_file;
+                       int err = g_stat (audio_path.c_str(), &stat_file);
+
+                       if (err) {
+
+                               /* no audio path - nested source or we can't
+                                  read it or ... whatever, use the peakfile as-is.
+                               */
+                               DEBUG_TRACE(DEBUG::Peaks, string_compose("Error when calling stat on Peakfile %1\n", _peakpath));
+
                                _peaks_built = true;
+                               _peak_byte_max = statbuf.st_size;
+
+                       } else {
+
+                               /* 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 {
+                                       _peaks_built = true;
+                                       _peak_byte_max = statbuf.st_size;
+                               }
                        }
                }
        }
 
-       if (!newfile && !_peaks_built && _build_missing_peakfiles && _build_peakfiles) {
+       if (!empty() && !_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
+samplecnt_t
+AudioSource::read (Sample *dst, samplepos_t start, samplecnt_t cnt, int /*channel*/) const
 {
-       Glib::Mutex::Lock lm (_lock);
+       assert (cnt >= 0);
+
+       Glib::Threads::Mutex::Lock lm (_lock);
        return read_unlocked (dst, start, cnt);
 }
 
-nframes_t
-AudioSource::write (Sample *dst, nframes_t cnt)
+samplecnt_t
+AudioSource::write (Sample *dst, samplecnt_t cnt)
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
+       /* any write makes the file not removable */
+       _flags = Flag (_flags & ~Removable);
        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, samplecnt_t npeaks, samplepos_t start, samplecnt_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, samplecnt_t npeaks, samplepos_t start, samplecnt_t cnt,
+                                 double samples_per_visual_peak, samplecnt_t samples_per_file_peak) const
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
        double scale;
        double expected_peaks;
        PeakData::PeakDatum xmax;
        PeakData::PeakDatum xmin;
        int32_t to_read;
-       uint32_t nread;
-       nframes_t zero_fill = 0;
-       int ret = -1;
-       PeakData* staging = 0;
-       Sample* raw_staging = 0;
-       int peakfile = -1;
+#ifdef PLATFORM_WINDOWS
+       SYSTEM_INFO system_info;
+        GetSystemInfo (&system_info);
+       const int bufsize = system_info.dwAllocationGranularity;;
+#else
+       const int bufsize = sysconf(_SC_PAGESIZE);
+#endif
+       samplecnt_t read_npeaks = npeaks;
+       samplecnt_t zero_fill = 0;
+
+       GStatBuf statbuf;
+
+       expected_peaks = (cnt / (double) samples_per_file_peak);
+       if (g_stat (_peakpath.c_str(), &statbuf) != 0) {
+               error << string_compose (_("Cannot open peakfile @ %1 for size check (%2)"), _peakpath, strerror (errno)) << endmsg;
+               return -1;
+       }
+
+       if (!_captured_for.empty()) {
+
+               /* _captured_for is only set after a capture pass is
+                * complete. so we know that capturing is finished for this
+                * file, and now we can check actual size of the peakfile is at
+                * least large enough for all the data in the audio file. if it
+                * is too short, assume that a crash or other error truncated
+                * it, and rebuild it from scratch.
+                *
+                * XXX this may not work for destructive recording, but we
+                * might decided to get rid of that anyway.
+                *
+                */
+
+               const off_t expected_file_size = (_length / (double) samples_per_file_peak) * sizeof (PeakData);
+
+               if (statbuf.st_size < expected_file_size) {
+                       warning << string_compose (_("peak file %1 is truncated from %2 to %3"), _peakpath, expected_file_size, statbuf.st_size) << endmsg;
+                       lm.release(); // build_peaks_from_scratch() takes _lock
+                       const_cast<AudioSource*>(this)->build_peaks_from_scratch ();
+                       lm.acquire ();
+                       if (g_stat (_peakpath.c_str(), &statbuf) != 0) {
+                               error << string_compose (_("Cannot open peakfile @ %1 for size check (%2) after rebuild"), _peakpath, strerror (errno)) << endmsg;
+                       }
+                       if (statbuf.st_size < expected_file_size) {
+                               fatal << "peak file is still truncated after rebuild" << endmsg;
+                               /*NOTREACHED*/
+                       }
+               }
+       }
+
+       ScopedFileDescriptor sfd (g_open (_peakpath.c_str(), O_RDONLY, 0444));
+
+       if (sfd < 0) {
+               error << string_compose (_("Cannot open peakfile @ %1 for reading (%2)"), _peakpath, strerror (errno)) << endmsg;
+               return -1;
+       }
 
-       expected_peaks = (cnt / (double) frames_per_peak);
        scale = npeaks/expected_peaks;
 
-#if 0
-       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
+
+       DEBUG_TRACE (DEBUG::Peaks, string_compose (" ======>RP: npeaks = %1 start = %2 cnt = %3 len = %4 samples_per_visual_peak = %5 expected was %6 ... scale =  %7 PD ptr = %8\n"
+                       , npeaks, start, cnt, _length, samples_per_visual_peak, expected_peaks, scale, peaks));
 
        /* 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);
-               zero_fill = old - npeaks;
+       if (cnt + start > _length) {
+               // cerr << "too close to end @ " << _length << " given " << start << " + " << cnt << " (" << _length - start << ")" << endl;
+               cnt = std::max ((samplecnt_t)0, _length - start);
+               read_npeaks = min ((samplecnt_t) floor (cnt / samples_per_visual_peak), npeaks);
+               zero_fill = npeaks - read_npeaks;
+               expected_peaks = (cnt / (double) samples_per_file_peak);
+               scale = npeaks/expected_peaks;
        }
 
-       // cerr << "actual npeaks = " << npeaks << " zf = " << zero_fill << endl;
-       
+       assert (cnt >= 0);
+
+       // cerr << "actual npeaks = " << read_npeaks << " zf = " << zero_fill << endl;
+
        if (npeaks == cnt) {
 
-               cerr << "RAW DATA\n";
-               
+               DEBUG_TRACE (DEBUG::Peaks, "RAW DATA\n");
+
                /* 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) {
+               boost::scoped_array<Sample> raw_staging(new Sample[cnt]);
+
+               if (read_unlocked (raw_staging.get(), start, cnt) != cnt) {
                        error << _("cannot read sample data for unscaled peak computation") << endmsg;
                        return -1;
                }
 
-               for (nframes_t i = 0; i < npeaks; ++i) {
+               for (samplecnt_t i = 0; i < npeaks; ++i) {
                        peaks[i].max = raw_staging[i];
                        peaks[i].min = raw_staging[i];
                }
 
-               delete [] raw_staging;
                return 0;
        }
 
        if (scale == 1.0) {
+               off_t first_peak_byte = (start / samples_per_file_peak) * sizeof (PeakData);
+               size_t bytes_to_read = sizeof (PeakData) * read_npeaks;
+               /* open, read, close */
 
-               off_t first_peak_byte = (start / frames_per_peak) * sizeof (PeakData);
+               DEBUG_TRACE (DEBUG::Peaks, "DIRECT PEAKS\n");
+
+               off_t  map_off =  first_peak_byte;
+               off_t  read_map_off = map_off & ~(bufsize - 1);
+               off_t  map_delta = map_off - read_map_off;
+               size_t map_length = bytes_to_read + map_delta;
+
+               if (_first_run  || (_last_scale != samples_per_visual_peak) || (_last_map_off != map_off) || (_last_raw_map_length  < bytes_to_read)) {
+                       peak_cache.reset (new PeakData[npeaks]);
+                       char* addr;
+#ifdef PLATFORM_WINDOWS
+                       HANDLE file_handle = (HANDLE) _get_osfhandle(int(sfd));
+                       HANDLE map_handle;
+                       LPVOID view_handle;
+                       bool err_flag;
+
+                       map_handle = CreateFileMapping(file_handle, NULL, PAGE_READONLY, 0, 0, NULL);
+                       if (map_handle == NULL) {
+                               error << string_compose (_("map failed - could not create file mapping for peakfile %1."), _peakpath) << endmsg;
+                               return -1;
+                       }
 
-               /* open, read, close */
+                       view_handle = MapViewOfFile(map_handle, FILE_MAP_READ, 0, read_map_off, map_length);
+                       if (view_handle == NULL) {
+                               error << string_compose (_("map failed - could not map peakfile %1."), _peakpath) << endmsg;
+                               return -1;
+                       }
 
-               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;
-               }
+                       addr = (char*) view_handle;
 
-               // cerr << "DIRECT PEAKS\n";
-               
-               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 " 
-                            << nread
-                            << " not " 
-                            << npeaks
-                             << "at sample " 
-                            << start
-                            << " = byte "
-                            << first_peak_byte
-                            << ')'
-                            << endl;
-                       return -1;
-               }
+                       memcpy ((void*)peak_cache.get(), (void*)(addr + map_delta), bytes_to_read);
 
-               if (zero_fill) {
-                       memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
+                       err_flag = UnmapViewOfFile (view_handle);
+                       err_flag = CloseHandle(map_handle);
+                       if(!err_flag) {
+                               error << string_compose (_("unmap failed - could not unmap peakfile %1."), _peakpath) << endmsg;
+                               return -1;
+                       }
+#else
+                       addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off);
+                       if (addr ==  MAP_FAILED) {
+                               error << string_compose (_("map failed - could not mmap peakfile %1."), _peakpath) << endmsg;
+                               return -1;
+                       }
+
+                       memcpy ((void*)peak_cache.get(), (void*)(addr + map_delta), bytes_to_read);
+                       munmap (addr, map_length);
+#endif
+                       if (zero_fill) {
+                               memset (&peak_cache[read_npeaks], 0, sizeof (PeakData) * zero_fill);
+                       }
+
+                       _first_run = false;
+                       _last_scale = samples_per_visual_peak;
+                       _last_map_off = map_off;
+                       _last_raw_map_length = bytes_to_read;
                }
 
+               memcpy ((void*)peaks, (void*)peak_cache.get(), npeaks * sizeof(PeakData));
+
                return 0;
        }
 
-
-       nframes_t tnp;
-
        if (scale < 1.0) {
 
-               // cerr << "DOWNSAMPLE\n";
+               DEBUG_TRACE (DEBUG::Peaks, "DOWNSAMPLE\n");
 
                /* the caller wants:
 
-                   - more frames-per-peak (lower resolution) than the peakfile, or to put it another way,
+                   - more samples-per-peak (lower resolution) than the peakfile, or to put it another way,
                     - less peaks than the peakfile holds for the same range
 
                    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, 4096.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) frames_per_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 / frames_per_peak;
-               uint32_t       nvisual_peaks = 0;
-               uint32_t       stored_peaks_read = 0;
-               uint32_t       i = 0;
+               const samplecnt_t chunksize = (samplecnt_t) expected_peaks; // we read all the peaks we need in one hit.
+
+               /* compute the rounded up sample position  */
+
+               samplepos_t current_stored_peak = (samplepos_t) ceil (start / (double) samples_per_file_peak);
+               samplepos_t next_visual_peak  = (samplepos_t) ceil (start / samples_per_visual_peak);
+               double     next_visual_peak_sample = next_visual_peak * samples_per_visual_peak;
+               samplepos_t stored_peak_before_next_visual_peak = (samplepos_t) next_visual_peak_sample / samples_per_file_peak;
+               samplecnt_t nvisual_peaks = 0;
+               uint32_t i = 0;
 
                /* handle the case where the initial visual peak is on a pixel boundary */
 
@@ -553,121 +545,153 @@ AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nfr
 
                /* open ... close during out: handling */
 
-               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 0;
-               }
+               off_t  map_off =  (uint32_t) (ceil (start / (double) samples_per_file_peak)) * sizeof(PeakData);
+               off_t  read_map_off = map_off & ~(bufsize - 1);
+               off_t  map_delta = map_off - read_map_off;
+               size_t raw_map_length = chunksize * sizeof(PeakData);
+               size_t map_length = (chunksize * sizeof(PeakData)) + map_delta;
+
+               if (_first_run || (_last_scale != samples_per_visual_peak) || (_last_map_off != map_off) || (_last_raw_map_length < raw_map_length)) {
+                       peak_cache.reset (new PeakData[npeaks]);
+                       boost::scoped_array<PeakData> staging (new PeakData[chunksize]);
+
+                       char* addr;
+#ifdef PLATFORM_WINDOWS
+                       HANDLE file_handle =  (HANDLE) _get_osfhandle(int(sfd));
+                       HANDLE map_handle;
+                       LPVOID view_handle;
+                       bool err_flag;
+
+                       map_handle = CreateFileMapping(file_handle, NULL, PAGE_READONLY, 0, 0, NULL);
+                       if (map_handle == NULL) {
+                               error << string_compose (_("map failed - could not create file mapping for peakfile %1."), _peakpath) << endmsg;
+                               return -1;
+                       }
 
-               while (nvisual_peaks < npeaks) {
-
-                       if (i == stored_peaks_read) {
-
-                               uint32_t       start_byte = current_stored_peak * sizeof(PeakData);
-                               tnp = min ((_length/frames_per_peak - current_stored_peak), (nframes_t) expected_peaks);
-                               to_read = min (chunksize, tnp);
-                               
-                               off_t fend = lseek (peakfile, 0, SEEK_END);
-                               
-                               if ((nread = ::pread (peakfile, staging, sizeof (PeakData) * to_read, start_byte))
-                                   != sizeof (PeakData) * to_read) {
-                                       cerr << "AudioSource["
-                                            << _name
-                                            << "]: cannot read peak data from peakfile ("
-                                            << (nread / sizeof(PeakData))
-                                            << " peaks instead of "
-                                            << to_read
-                                            << ") ("
-                                            << strerror (errno)
-                                            << ')'
-                                            << " at start_byte = " << start_byte 
-                                            << " _length = " << _length << " versus len = " << fend
-                                            << " expected maxpeaks = " << (_length - current_frame)/frames_per_peak
-                                            << " npeaks was " << npeaks
-                                            << endl;
-                                       goto out;
-                               }
+                       view_handle = MapViewOfFile(map_handle, FILE_MAP_READ, 0, read_map_off, map_length);
+                       if (view_handle == NULL) {
+                               error << string_compose (_("map failed - could not map peakfile %1."), _peakpath) << endmsg;
+                               return -1;
+                       }
 
-                               i = 0;
-                               stored_peaks_read = nread / sizeof(PeakData);
+                       addr = (char *) view_handle;
+
+                       memcpy ((void*)staging.get(), (void*)(addr + map_delta), raw_map_length);
+
+                       err_flag = UnmapViewOfFile (view_handle);
+                       err_flag = CloseHandle(map_handle);
+                       if(!err_flag) {
+                               error << string_compose (_("unmap failed - could not unmap peakfile %1."), _peakpath) << endmsg;
+                               return -1;
+                       }
+#else
+                       addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off);
+                       if (addr ==  MAP_FAILED) {
+                               error << string_compose (_("map failed - could not mmap peakfile %1."), _peakpath) << endmsg;
+                               return -1;
                        }
 
-                       xmax = -1.0;
-                       xmin = 1.0;
+                       memcpy ((void*)staging.get(), (void*)(addr + map_delta), raw_map_length);
+                       munmap (addr, map_length);
+#endif
+                       while (nvisual_peaks < read_npeaks) {
 
-                       while ((i < stored_peaks_read) && (current_stored_peak <= stored_peak_before_next_visual_peak)) {
+                               xmax = -1.0;
+                               xmin = 1.0;
+
+                               while ((current_stored_peak <= stored_peak_before_next_visual_peak) && (i < chunksize)) {
 
-                               xmax = max (xmax, staging[i].max);
-                               xmin = min (xmin, staging[i].min);
-                               ++i;
-                               ++current_stored_peak;
-                               --expected_peaks;
+                                       xmax = max (xmax, staging[i].max);
+                                       xmin = min (xmin, staging[i].min);
+                                       ++i;
+                                       ++current_stored_peak;
+                               }
+
+                               peak_cache[nvisual_peaks].max = xmax;
+                               peak_cache[nvisual_peaks].min = xmin;
+                               ++nvisual_peaks;
+                               next_visual_peak_sample =  min ((double) start + cnt, (next_visual_peak_sample + samples_per_visual_peak));
+                               stored_peak_before_next_visual_peak = (uint32_t) next_visual_peak_sample / samples_per_file_peak;
                        }
 
-                       peaks[nvisual_peaks].max = xmax;
-                       peaks[nvisual_peaks].min = xmin;
-                       ++nvisual_peaks;
-                       ++next_visual_peak;
+                       if (zero_fill) {
+                               cerr << "Zero fill end of peaks (@ " << read_npeaks << " with " << zero_fill << ")" << endl;
+                               memset (&peak_cache[read_npeaks], 0, sizeof (PeakData) * zero_fill);
+                       }
 
-                       //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 / frames_per_peak; 
+                       _first_run = false;
+                       _last_scale = samples_per_visual_peak;
+                       _last_map_off = map_off;
+                       _last_raw_map_length = raw_map_length;
                }
 
-               if (zero_fill) {
-                       memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
-               }
-               
-               ret = 0;
+               memcpy ((void*)peaks, (void*)peak_cache.get(), npeaks * sizeof(PeakData));
 
        } else {
-               
-               // cerr << "UPSAMPLE\n";
+               DEBUG_TRACE (DEBUG::Peaks, "UPSAMPLE\n");
 
-               /* the caller wants 
+               /* the caller wants
 
-                    - less frames-per-peak (more resolution)
+                    - less samples-per-peak (more resolution)
                     - more peaks than stored in the Peakfile
 
                   So, fetch data from the raw source, and generate peak
                   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);
-               raw_staging = new Sample[chunksize];
-               
-               nframes_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;
+               samplecnt_t samples_read = 0;
+               samplepos_t current_sample = start;
+               samplecnt_t i = 0;
+               samplecnt_t nvisual_peaks = 0;
+               samplecnt_t chunksize = (samplecnt_t) min (cnt, (samplecnt_t) 4096);
+               boost::scoped_array<Sample> raw_staging(new Sample[chunksize]);
+
+               samplepos_t sample_pos = start;
+               double pixel_pos = floor (sample_pos / samples_per_visual_peak);
+               double next_pixel_pos = ceil (sample_pos / samples_per_visual_peak);
+               double pixels_per_sample = 1.0 / samples_per_visual_peak;
 
                xmin = 1.0;
                xmax = -1.0;
 
-               while (nvisual_peaks < npeaks) {
+               while (nvisual_peaks < read_npeaks) {
 
-                       if (i == frames_read) {
-                               
-                               to_read = min (chunksize, (_length - current_frame));
+                       if (i == samples_read) {
 
-                               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")
-                                                        , _name, to_read, current_frame) 
-                                             << endmsg;
-                                       goto out;
-                               }
+                               to_read = min (chunksize, (samplecnt_t)(_length - current_sample));
+
+                               if (current_sample >= _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 read_npeaks and then breaking out of
+                                           this loop early
+                                       */
+
+                                        memset (raw_staging.get(), 0, sizeof (Sample) * chunksize);
+
+                                } else {
+
+                                        to_read = min (chunksize, (_length - current_sample));
+
+
+                                        if ((samples_read = read_unlocked (raw_staging.get(), current_sample, to_read)) == 0) {
+                                                error << string_compose(_("AudioSource[%1]: peak read - cannot read %2 samples at offset %3 of %4 (%5)"),
+                                                                        _name, to_read, current_sample, _length, strerror (errno))
+                                                      << endmsg;
+                                                return -1;
+                                        }
+                                }
 
                                i = 0;
                        }
-                       
+
                        xmax = max (xmax, raw_staging[i]);
                        xmin = min (xmin, raw_staging[i]);
                        ++i;
-                       ++current_frame;
-                       pixel_pos += pixels_per_frame;
+                       ++current_sample;
+                       pixel_pos += pixels_per_sample;
 
                        if (pixel_pos >= next_pixel_pos) {
 
@@ -680,224 +704,434 @@ AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nfr
                                next_pixel_pos = ceil (pixel_pos + 0.5);
                        }
                }
-               
+
                if (zero_fill) {
-                       memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
+                       memset (&peaks[read_npeaks], 0, sizeof (PeakData) * zero_fill);
                }
-
-               ret = 0;
        }
 
-  out:
-       if (peakfile >= 0) {
-               close (peakfile);
-       }
+       DEBUG_TRACE (DEBUG::Peaks, "READPEAKS DONE\n");
+       return 0;
+}
 
-       if (staging) {
-               delete [] staging;
-       } 
+int
+AudioSource::build_peaks_from_scratch ()
+{
+       const samplecnt_t bufsize = 65536; // 256kB per disk read for mono data is about ideal
+
+       DEBUG_TRACE (DEBUG::Peaks, "Building peaks from scratch\n");
+
+       int ret = -1;
+
+       {
+               /* hold lock while building peaks */
+
+               Glib::Threads::Mutex::Lock lp (_lock);
+
+               if (prepare_for_peakfile_writes ()) {
+                       goto out;
+               }
 
-       if (raw_staging) {
-               delete [] raw_staging;
+               samplecnt_t current_sample = 0;
+               samplecnt_t cnt = _length;
+
+               _peaks_built = false;
+               boost::scoped_array<Sample> buf(new Sample[bufsize]);
+
+               while (cnt) {
+
+                       samplecnt_t samples_to_read = min (bufsize, cnt);
+                       samplecnt_t samples_read;
+
+                       if ((samples_read = read_unlocked (buf.get(), current_sample, samples_to_read)) != samples_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;
+                       }
+
+                       lp.release(); // allow butler to refill buffers
+
+                       if (_session.deletion_in_progress() || _session.peaks_cleanup_in_progres()) {
+                               cerr << "peak file creation interrupted: " << _name << endmsg;
+                               lp.acquire();
+                               done_with_peakfile_writes (false);
+                               goto out;
+                       }
+
+                       if (compute_and_write_peaks (buf.get(), current_sample, samples_read, true, false, _FPP)) {
+                               break;
+                       }
+
+                       current_sample += samples_read;
+                       cnt -= samples_read;
+
+                       lp.acquire();
+               }
+
+               if (cnt == 0) {
+                       /* success */
+                       truncate_peakfile();
+               }
+
+               done_with_peakfile_writes ((cnt == 0));
+               if (cnt == 0) {
+                       ret = 0;
+               }
+       }
+
+  out:
+       if (ret) {
+               DEBUG_TRACE (DEBUG::Peaks, string_compose("Could not write peak data, attempting to remove peakfile %1\n", _peakpath));
+               ::g_unlink (_peakpath.c_str());
        }
 
        return ret;
 }
 
-#undef DEBUG_PEAK_BUILD
-
 int
-AudioSource::build_peaks ()
+AudioSource::close_peakfile ()
 {
-       vector<PeakBuildRecord*> built;
-       int status = -1;
-       bool pr_signal = false;
-       list<PeakBuildRecord*> copy;
+       Glib::Threads::Mutex::Lock lp (_lock);
+       if (_peakfile_fd >= 0) {
+               close (_peakfile_fd);
+               _peakfile_fd = -1;
+       }
+       if (!_peakpath.empty()) {
+               ::g_unlink (_peakpath.c_str());
+       }
+       _peaks_built = false;
+       return 0;
+}
 
-       {
-               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<PeakBuildRecord *>::iterator i = copy.begin(); i != copy.end(); ++i) {
-               
-               if ((status = do_build_peak ((*i)->frame, (*i)->cnt)) != 0) { 
-                       unlink (peakpath.c_str());
-                       break;
-               }
-               built.push_back (new PeakBuildRecord (*(*i)));
-               delete *i;
+int
+AudioSource::prepare_for_peakfile_writes ()
+{
+       if (_session.deletion_in_progress() || _session.peaks_cleanup_in_progres()) {
+               return -1;
        }
 
-       { 
-               Glib::Mutex::Lock lm (_lock);
+       if ((_peakfile_fd = g_open (_peakpath.c_str(), O_CREAT|O_RDWR, 0664)) < 0) {
+               error << string_compose(_("AudioSource: cannot open _peakpath (c) \"%1\" (%2)"), _peakpath, strerror (errno)) << endmsg;
+               return -1;
+       }
+       return 0;
+}
 
-               if (status == 0) {
-                       _peaks_built = true;
-                       
-                       if (next_peak_clear_should_notify) {
-                               next_peak_clear_should_notify = false;
-                               pr_signal = true;
-                       }
+void
+AudioSource::done_with_peakfile_writes (bool done)
+{
+       if (_session.deletion_in_progress() || _session.peaks_cleanup_in_progres()) {
+               if (_peakfile_fd) {
+                       close (_peakfile_fd);
+                       _peakfile_fd = -1;
                }
+               return;
        }
 
-       if (status == 0) {
-               for (vector<PeakBuildRecord *>::iterator i = built.begin(); i != built.end(); ++i) {
-                       PeakRangeReady ((*i)->frame, (*i)->cnt); /* EMIT SIGNAL */
-                       delete *i;
-               }
+       if (peak_leftover_cnt) {
+               compute_and_write_peaks (0, 0, 0, true, false, _FPP);
+       }
 
-               if (pr_signal) {
-                       PeaksReady (); /* EMIT SIGNAL */
-               }
+       if (done) {
+               Glib::Threads::Mutex::Lock lm (_peaks_ready_lock);
+               _peaks_built = true;
+               PeaksReady (); /* EMIT SIGNAL */
        }
 
-       return status;
+       close (_peakfile_fd);
+       _peakfile_fd = -1;
 }
 
+/** @param first_sample Offset from the source start of the first sample to
+ * process. _lock MUST be held by caller.
+*/
 int
-AudioSource::do_build_peak (nframes_t first_frame, nframes_t cnt)
+AudioSource::compute_and_write_peaks (Sample* buf, samplecnt_t first_sample, samplecnt_t cnt,
+                                     bool force, bool intermediate_peaks_ready)
 {
-       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;
+       return compute_and_write_peaks (buf, first_sample, cnt, force, intermediate_peaks_ready, _FPP);
+}
+
+int
+AudioSource::compute_and_write_peaks (Sample* buf, samplecnt_t first_sample, samplecnt_t cnt,
+                                     bool force, bool intermediate_peaks_ready, samplecnt_t fpp)
+{
+       samplecnt_t to_do;
+       uint32_t  peaks_computed;
+       samplepos_t current_sample;
+       samplecnt_t samples_done;
+       const size_t blocksize = (128 * 1024);
        off_t first_peak_byte;
-       int peakfile = -1;
-       int ret = -1;
+       boost::scoped_array<Sample> buf2;
 
-#ifdef DEBUG_PEAK_BUILD
-       cerr << pthread_self() << ": " << _name << ": building peaks for " << first_frame << " to " << first_frame + cnt - 1 << endl;
-#endif
+       if (_peakfile_fd < 0) {
+               if (prepare_for_peakfile_writes ()) {
+                       return -1;
+               }
+       }
 
-       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_sample != peak_leftover_sample + 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;
+                       PeakData x;
+
+                       x.min = peak_leftovers[0];
+                       x.max = peak_leftovers[0];
+
+                       off_t byte = (peak_leftover_sample / fpp) * sizeof (PeakData);
+
+                       off_t offset = lseek (_peakfile_fd, byte, SEEK_SET);
+
+                       if (offset != byte) {
+                               error << string_compose(_("%1: could not seek in peak file data (%2)"), _name, strerror (errno)) << endmsg;
+                               return -1;
+                       }
+
+                       if (::write (_peakfile_fd, &x, sizeof (PeakData)) != sizeof (PeakData)) {
+                               error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg;
+                               return -1;
+                       }
+
+                       _peak_byte_max = max (_peak_byte_max, (off_t) (byte + sizeof(PeakData)));
+
+                       {
+                               Glib::Threads::Mutex::Lock lm (_peaks_ready_lock);
+                               PeakRangeReady (peak_leftover_sample, peak_leftover_cnt); /* EMIT SIGNAL */
+                               if (intermediate_peaks_ready) {
+                                       PeaksReady (); /* EMIT SIGNAL */
+                               }
+                       }
+
+                       /* left overs are done */
+
+                       peak_leftover_cnt = 0;
+                       goto restart;
+               }
+
+               /* 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.reset(new Sample[to_do]);
+
+               /* the remnants */
+               memcpy (buf2.get(), peak_leftovers, peak_leftover_cnt * sizeof (Sample));
+
+               /* the new stuff */
+               if (buf && cnt > 0) {
+                       memcpy (buf2.get()+peak_leftover_cnt, buf, cnt * sizeof (Sample));
+               }
+
+               /* no more leftovers */
+               peak_leftover_cnt = 0;
+
+               /* use the temporary buffer */
+               buf = buf2.get();
+
+               /* make sure that when we write into the peakfile, we startup where we left off */
+
+               first_sample = peak_leftover_sample;
+
+       } else {
+               to_do = cnt;
        }
-       
-       while (cnt) {
 
-               frames_to_read = min (frames_per_peak, cnt);
+       boost::scoped_array<PeakData> peakbuf(new PeakData[(to_do/fpp)+1]);
+       peaks_computed = 0;
+       current_sample = first_sample;
+       samples_done = 0;
 
-               /* lock for every read */
+       while (to_do) {
 
-               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 some samples 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_sample = current_sample;
+
+                       /* done for now */
+
+                       break;
                }
 
-               xmin = buf[0];
-               xmax = buf[0];
+               samplecnt_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);
+
+               peaks_computed++;
+               buf += this_time;
+               to_do -= this_time;
+               samples_done += this_time;
+               current_sample += this_time;
+       }
 
-               for (nframes_t n = 1; n < frames_read; ++n) {
-                       xmax = max (xmax, buf[n]);
-                       xmin = min (xmin, buf[n]);
+       first_peak_byte = (first_sample / fpp) * sizeof (PeakData);
 
-//                     if (current_frame < frames_read) {
-//                             cerr << "sample = " << buf[n] << " max = " << xmax << " min = " << xmin << " max of 2 = " << max (xmax, buf[n]) << endl;
-//                     }
+       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.
+               */
+
+               off_t endpos = lseek (_peakfile_fd, 0, SEEK_END);
+               off_t target_length = blocksize * ((first_peak_byte + blocksize + 1) / blocksize);
+
+               if (endpos < target_length) {
+                       DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile %1\n", _peakpath));
+                       if (ftruncate (_peakfile_fd, target_length)) {
+                               /* error doesn't actually matter so continue on without testing */
+                       }
                }
+       }
+
 
-               peakbuf[peaki].max = xmax;
-               peakbuf[peaki].min = xmin;
-               peaki++;
+       off_t offset = lseek(_peakfile_fd, first_peak_byte, SEEK_SET);
 
-               current_frame += frames_read;
-               cnt -= frames_read;
+       if (offset != first_peak_byte) {
+               error << string_compose(_("%1: could not seek in peak file data (%2)"), _name, strerror (errno)) << endmsg;
+               return -1;
        }
 
-       if (::pwrite (peakfile, peakbuf, sizeof (PeakData) * peaki, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaki)) {
+       ssize_t bytes_to_write = sizeof (PeakData) * peaks_computed;
+
+       ssize_t bytes_written = ::write (_peakfile_fd, peakbuf.get(), bytes_to_write);
+
+       if (bytes_written != bytes_to_write) {
                error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg;
-               goto out;
+               return -1;
        }
 
-       ret = 0;
+       _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + bytes_to_write));
 
-  out:
-       delete [] peakbuf;
-       if (peakfile >= 0) {
-               close (peakfile);
+       if (samples_done) {
+               Glib::Threads::Mutex::Lock lm (_peaks_ready_lock);
+               PeakRangeReady (first_sample, samples_done); /* EMIT SIGNAL */
+               if (intermediate_peaks_ready) {
+                       PeaksReady (); /* EMIT SIGNAL */
+               }
        }
-       return ret;
+
+       return 0;
 }
 
 void
-AudioSource::build_peaks_from_scratch ()
+AudioSource::truncate_peakfile ()
 {
-       Glib::Mutex::Lock lp (_lock);
+       if (_peakfile_fd < 0) {
+               error << string_compose (_("programming error: %1"), "AudioSource::truncate_peakfile() called without open peakfile descriptor")
+                     << endmsg;
+               return;
+       }
 
-       next_peak_clear_should_notify = true;
-       pending_peak_builds.push_back (new PeakBuildRecord (0, _length));
-       queue_for_peaks (this);
-}
+       /* truncate the peakfile down to its natural length if necessary */
 
-bool
-AudioSource::file_changed (string 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;
+       off_t end = lseek (_peakfile_fd, 0, SEEK_END);
+
+       if (end > _peak_byte_max) {
+               DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile  %1\n", _peakpath));
+               if (ftruncate (_peakfile_fd, _peak_byte_max)) {
+                       error << string_compose (_("could not truncate peakfile %1 to %2 (error: %3)"),
+                                                _peakpath, _peak_byte_max, errno) << endmsg;
+               }
        }
 }
 
-nframes_t
+samplecnt_t
 AudioSource::available_peaks (double zoom_factor) const
 {
-       int peakfile;
-       off_t end;
+       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,
+          but _peak_byte_max only monotonically increases after initialization.
+       */
 
-       if (zoom_factor < frames_per_peak) {
-               return length(); // peak data will come from the audio file
-       } 
-       
-       /* peak data comes from peakfile */
+       off_t end = _peak_byte_max;
 
-       if ((peakfile = ::open (peakpath.c_str(), O_RDONLY)) < 0) {
-               error << string_compose(_("AudioSource: cannot open peakpath \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
-               return 0;
-       }
+       return (end/sizeof(PeakData)) * _FPP;
+}
+
+void
+AudioSource::mark_streaming_write_completed (const Lock& lock)
+{
+       Glib::Threads::Mutex::Lock lm (_peaks_ready_lock);
 
-       { 
-               Glib::Mutex::Lock lm (_lock);
-               end = lseek (peakfile, 0, SEEK_END);
+       if (_peaks_built) {
+               PeaksReady (); /* EMIT SIGNAL */
        }
+}
+
+void
+AudioSource::allocate_working_buffers (samplecnt_t framerate)
+{
+       Glib::Threads::Mutex::Lock lm (_level_buffer_lock);
 
-       close (peakfile);
 
-       return (end/sizeof(PeakData)) * frames_per_peak;
+       /* Note: we don't need any buffers allocated until
+          a level 1 audiosource is created, at which
+          time we'll call ::ensure_buffers_for_level()
+          with the right value and do the right thing.
+       */
+
+       if (!_mixdown_buffers.empty()) {
+               ensure_buffers_for_level_locked ( _mixdown_buffers.size(), framerate);
+       }
 }
 
 void
-AudioSource::update_length (nframes_t pos, nframes_t cnt)
+AudioSource::ensure_buffers_for_level (uint32_t level, samplecnt_t sample_rate)
 {
-       if (pos + cnt > _length) {
-               _length = pos+cnt;
-       }
+       Glib::Threads::Mutex::Lock lm (_level_buffer_lock);
+       ensure_buffers_for_level_locked (level, sample_rate);
 }
 
+void
+AudioSource::ensure_buffers_for_level_locked (uint32_t level, samplecnt_t sample_rate)
+{
+       samplecnt_t nframes = (samplecnt_t) floor (Config->get_audio_playback_buffer_seconds() * sample_rate);
+
+       /* this may be called because either "level" or "sample_rate" have
+        * changed. and it may be called with "level" smaller than the current
+        * number of buffers, because a new compound region has been created at
+        * a more shallow level than the deepest one we currently have.
+        */
+
+       uint32_t limit = max ((size_t) level, _mixdown_buffers.size());
+
+       _mixdown_buffers.clear ();
+       _gain_buffers.clear ();
+
+       for (uint32_t n = 0; n < limit; ++n) {
+               _mixdown_buffers.push_back (boost::shared_array<Sample> (new Sample[nframes]));
+               _gain_buffers.push_back (boost::shared_array<gain_t> (new gain_t[nframes]));
+       }
+}