#include <ctime>
#include <cmath>
#include <iomanip>
-#include <fstream>
#include <algorithm>
#include <vector>
+#ifdef PLATFORM_WINDOWS
+#include <windows.h>
+
+#else
+#include <sys/mman.h>
+
+#endif
+
#include <glib.h>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
-#include <boost/scoped_array.hpp>
#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/rc_configuration.h"
#include "ardour/runtime_functions.h"
+#include "ardour/session.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
#include "ardour/debug.h"
Glib::Threads::Mutex AudioSource::_level_buffer_lock;
vector<boost::shared_array<Sample> > AudioSource::_mixdown_buffers;
vector<boost::shared_array<gain_t> > AudioSource::_gain_buffers;
-size_t AudioSource::_working_buffers_size = 0;
bool AudioSource::_build_missing_peakfiles = false;
/** true if we want peakfiles (e.g. if we are displaying a GUI) */
#define _FPP 256
-AudioSource::AudioSource (Session& s, string name)
+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)
{
- _peaks_built = false;
- _peak_byte_max = 0;
- _peakfile_descriptor = 0;
- peak_leftover_cnt = 0;
- peak_leftover_size = 0;
- peak_leftovers = 0;
}
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)
{
-
- _peaks_built = false;
- _peak_byte_max = 0;
- _peakfile_descriptor = 0;
- peak_leftover_cnt = 0;
- peak_leftover_size = 0;
- peak_leftovers = 0;
-
if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor();
}
cerr << "AudioSource destroyed with leftover peak data pending" << endl;
}
- delete _peakfile_descriptor;
+ if ((-1) != _peakfile_fd) {
+ close (_peakfile_fd);
+ _peakfile_fd = -1;
+ }
+
delete [] peak_leftovers;
}
int
AudioSource::set_state (const XMLNode& node, int /*version*/)
{
- const XMLProperty* prop;
+ XMLProperty const * prop;
if ((prop = node.property ("captured-for")) != 0) {
_captured_for = prop->value();
{
GStatBuf statbuf;
- if (g_stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
+ if (g_stat (_peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) {
return;
}
tbuf.actime = statbuf.st_atime;
tbuf.modtime = time ((time_t*) 0);
- g_utime (peakpath.c_str(), &tbuf);
+ g_utime (_peakpath.c_str(), &tbuf);
}
int
{
/* caller must hold _lock */
- string oldpath = peakpath;
+ string oldpath = _peakpath;
if (Glib::file_test (oldpath, Glib::FILE_TEST_EXISTS)) {
if (g_rename (oldpath.c_str(), newpath.c_str()) != 0) {
}
}
- peakpath = newpath;
+ _peakpath = newpath;
return 0;
}
int
-AudioSource::initialize_peakfile (string audio_path)
+AudioSource::initialize_peakfile (const string& audio_path, const bool in_session)
{
+ Glib::Threads::Mutex::Lock lm (_initialize_peaks_lock);
GStatBuf statbuf;
- peakpath = peak_path (audio_path);
+ _peakpath = construct_peak_filepath (audio_path, in_session);
- DEBUG_TRACE(DEBUG::Peaks, string_compose ("Initialize Peakfile %1 for Audio file %2\n", peakpath, audio_path));
-
- /* if the peak file should be there, but isn't .... */
-
- if (!empty() && !Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
- peakpath = find_broken_peakfile (peakpath, audio_path);
+ 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 (g_stat (peakpath.c_str(), &statbuf)) {
+ DEBUG_TRACE(DEBUG::Peaks, string_compose ("Initialize Peakfile %1 for Audio file %2\n", _peakpath, audio_path));
+
+ 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;
+ 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));
+ DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 does not exist\n", _peakpath));
_peaks_built = false;
/* 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));
+ 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);
+ 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));
+ DEBUG_TRACE(DEBUG::Peaks, string_compose("Error when calling stat on Peakfile %1\n", _peakpath));
_peaks_built = true;
_peak_byte_max = statbuf.st_size;
AudioSource::read (Sample *dst, framepos_t start, framecnt_t cnt, int /*channel*/) const
{
assert (cnt >= 0);
-
+
Glib::Threads::Mutex::Lock lm (_lock);
return read_unlocked (dst, start, cnt);
}
AudioSource::write (Sample *dst, framecnt_t cnt)
{
Glib::Threads::Mutex::Lock lm (_lock);
- /* any write makes the fill not removable */
+ /* any write makes the file not removable */
_flags = Flag (_flags & ~Removable);
return write_unlocked (dst, cnt);
}
PeakData::PeakDatum xmax;
PeakData::PeakDatum xmin;
int32_t to_read;
- uint32_t nread;
+#ifdef PLATFORM_WINDOWS
+ SYSTEM_INFO system_info;
+ GetSystemInfo (&system_info);
+ const int bufsize = system_info.dwAllocationGranularity;;
+#else
+ const int bufsize = sysconf(_SC_PAGESIZE);
+#endif
+ framecnt_t read_npeaks = npeaks;
framecnt_t zero_fill = 0;
- boost::scoped_ptr<FdFileDescriptor> peakfile_descriptor(new FdFileDescriptor (peakpath, false, 0664));
- int peakfile_fd = -1;
+ 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;
+ const_cast<AudioSource*>(this)->build_peaks_from_scratch ();
+ 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;
+ }
+
scale = npeaks/expected_peaks;
+
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));
if (cnt > _length - start) {
// cerr << "too close to end @ " << _length << " given " << start << " + " << cnt << " (" << _length - start << ")" << endl;
cnt = _length - start;
- framecnt_t old = npeaks;
- npeaks = min ((framecnt_t) floor (cnt / samples_per_visual_peak), npeaks);
- zero_fill = old - npeaks;
+ read_npeaks = min ((framecnt_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;
+ // cerr << "actual npeaks = " << read_npeaks << " zf = " << zero_fill << endl;
if (npeaks == cnt) {
}
if (scale == 1.0) {
-
- off_t offset = 0;
off_t first_peak_byte = (start / samples_per_file_peak) * sizeof (PeakData);
- ssize_t bytes_to_read = sizeof (PeakData)* npeaks;
+ size_t bytes_to_read = sizeof (PeakData) * read_npeaks;
/* open, read, close */
- if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) {
- error << string_compose(_("AudioSource: cannot open peakpath (a) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
- return -1;
- }
-
DEBUG_TRACE (DEBUG::Peaks, "DIRECT PEAKS\n");
- offset = lseek (peakfile_fd, first_peak_byte, SEEK_SET);
+ 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;
+ }
- if (offset != first_peak_byte) {
- error << string_compose(_("AudioSource: could not seek to correct location in peak file \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
- return -1;
- }
+ 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;
+ }
- nread = ::read (peakfile_fd, peaks, bytes_to_read);
+ addr = (char*) view_handle;
- if (nread != bytes_to_read) {
- DEBUG_TRACE (DEBUG::Peaks, string_compose ("[%1]: Cannot read peaks from peakfile! (read only %2 not %3 at sample %4 = byte %5 )\n"
- , _name, nread, npeaks, start, first_peak_byte));
- 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;
}
-
- framecnt_t tnp;
-
if (scale < 1.0) {
DEBUG_TRACE (DEBUG::Peaks, "DOWNSAMPLE\n");
to avoid confusion, I'll refer to the requested peaks as visual_peaks and the peakfile peaks as stored_peaks
*/
- const framecnt_t chunksize = (framecnt_t) min (expected_peaks, 65536.0);
-
- boost::scoped_array<PeakData> staging(new PeakData[chunksize]);
+ const framecnt_t chunksize = (framecnt_t) expected_peaks; // we read all the peaks we need in one hit.
/* compute the rounded up frame position */
- framepos_t current_frame = start;
- framepos_t current_stored_peak = (framepos_t) ceil (current_frame / (double) samples_per_file_peak);
- framepos_t next_visual_peak = (framepos_t) ceil (current_frame / samples_per_visual_peak);
+ framepos_t current_stored_peak = (framepos_t) ceil (start / (double) samples_per_file_peak);
+ framepos_t next_visual_peak = (framepos_t) ceil (start / samples_per_visual_peak);
double next_visual_peak_frame = next_visual_peak * samples_per_visual_peak;
framepos_t stored_peak_before_next_visual_peak = (framepos_t) next_visual_peak_frame / samples_per_file_peak;
framecnt_t nvisual_peaks = 0;
- framecnt_t stored_peaks_read = 0;
- framecnt_t i = 0;
+ uint32_t i = 0;
/* handle the case where the initial visual peak is on a pixel boundary */
/* open ... close during out: handling */
- if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) {
- error << string_compose(_("AudioSource: cannot open peakpath (b) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
- return 0;
- }
-
- while (nvisual_peaks < npeaks) {
-
- if (i == stored_peaks_read) {
+ 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;
+ }
- uint32_t start_byte = current_stored_peak * sizeof(PeakData);
- tnp = min ((framecnt_t)(_length/samples_per_file_peak - current_stored_peak), (framecnt_t) expected_peaks);
- to_read = min (chunksize, tnp);
- ssize_t bytes_to_read = sizeof (PeakData) * to_read;
+ 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;
+ }
- DEBUG_TRACE (DEBUG::Peaks, string_compose ("reading %1 bytes from peakfile @ %2\n"
- , bytes_to_read, start_byte));
+ addr = (char *) view_handle;
+ memcpy ((void*)staging.get(), (void*)(addr + map_delta), raw_map_length);
- off_t offset = lseek (peakfile_fd, start_byte, SEEK_SET);
+ 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;
+ }
- if (offset != start_byte) {
- error << string_compose(_("AudioSource: could not seek to correct location in peak file \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
- return -1;
- }
+ memcpy ((void*)staging.get(), (void*)(addr + map_delta), raw_map_length);
+ munmap (addr, map_length);
+#endif
+ while (nvisual_peaks < read_npeaks) {
- if ((nread = ::read (peakfile_fd, staging.get(), bytes_to_read)) != bytes_to_read) {
+ xmax = -1.0;
+ xmin = 1.0;
- off_t fend = lseek (peakfile_fd, 0, SEEK_END);
+ while ((current_stored_peak <= stored_peak_before_next_visual_peak) && (i < chunksize)) {
- DEBUG_TRACE (DEBUG::Peaks, string_compose ("[%1]: cannot read peak data from peakfile (%2 peaks instead of %3) (%4) at start_byte = %5 _length = %6 versus len = %7 expected maxpeaks = %8 npeaks was %9"
- , _name, (nread / sizeof(PeakData)), to_read, g_strerror (errno), start_byte, _length, fend, ((_length - current_frame)/samples_per_file_peak), npeaks));
- return -1;
+ xmax = max (xmax, staging[i].max);
+ xmin = min (xmin, staging[i].min);
+ ++i;
+ ++current_stored_peak;
}
- i = 0;
- stored_peaks_read = nread / sizeof(PeakData);
- }
-
- xmax = -1.0;
- xmin = 1.0;
- while ((i < stored_peaks_read) && (current_stored_peak <= stored_peak_before_next_visual_peak)) {
-
- xmax = max (xmax, staging[i].max);
- xmin = min (xmin, staging[i].min);
- ++i;
- ++current_stored_peak;
- --expected_peaks;
+ peak_cache[nvisual_peaks].max = xmax;
+ peak_cache[nvisual_peaks].min = xmin;
+ ++nvisual_peaks;
+ next_visual_peak_frame = min ((double) start + cnt, (next_visual_peak_frame + samples_per_visual_peak));
+ stored_peak_before_next_visual_peak = (uint32_t) next_visual_peak_frame / samples_per_file_peak;
}
- 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 / samples_per_file_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) {
- cerr << "Zero fill end of peaks (@ " << npeaks << " with " << zero_fill << endl;
- memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
- }
+ memcpy ((void*)peaks, (void*)peak_cache.get(), npeaks * sizeof(PeakData));
} else {
-
DEBUG_TRACE (DEBUG::Peaks, "UPSAMPLE\n");
/* the caller wants
xmin = 1.0;
xmax = -1.0;
- while (nvisual_peaks < npeaks) {
+ while (nvisual_peaks < read_npeaks) {
if (i == frames_read) {
/* hmm, error condition - we've reached the end of the file
without generating all the peak data. cook up a zero-filled
data buffer and then use it. this is simpler than
- adjusting zero_fill and npeaks and then breaking out of
+ adjusting zero_fill and read_npeaks and then breaking out of
this loop early
*/
}
if (zero_fill) {
- memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill);
+ memset (&peaks[read_npeaks], 0, sizeof (PeakData) * zero_fill);
}
}
framecnt_t frames_to_read = min (bufsize, cnt);
framecnt_t frames_read;
-
+
if ((frames_read = read_unlocked (buf.get(), 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;
}
+ 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_frame, frames_read, true, false, _FPP)) {
break;
}
current_frame += frames_read;
cnt -= frames_read;
+
+ lp.acquire();
}
if (cnt == 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());
+ 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;
}
+int
+AudioSource::close_peakfile ()
+{
+ 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;
+}
+
int
AudioSource::prepare_for_peakfile_writes ()
{
- _peakfile_descriptor = new FdFileDescriptor (peakpath, true, 0664);
- if ((_peakfile_fd = _peakfile_descriptor->allocate()) < 0) {
- error << string_compose(_("AudioSource: cannot open peakpath (c) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg;
+ if (_session.deletion_in_progress() || _session.peaks_cleanup_in_progres()) {
+ return -1;
+ }
+
+ 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;
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 (peak_leftover_cnt) {
compute_and_write_peaks (0, 0, 0, true, false, _FPP);
}
PeaksReady (); /* EMIT SIGNAL */
}
- delete _peakfile_descriptor;
- _peakfile_descriptor = 0;
+ close (_peakfile_fd);
+ _peakfile_fd = -1;
}
-/** @param first_frame Offset from the source start of the first frame to process */
+/** @param first_frame Offset from the source start of the first frame to
+ * process. _lock MUST be held by caller.
+*/
int
AudioSource::compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt,
bool force, bool intermediate_peaks_ready)
off_t first_peak_byte;
boost::scoped_array<Sample> buf2;
- if (_peakfile_descriptor == 0) {
- prepare_for_peakfile_writes ();
+ if (_peakfile_fd < 0) {
+ if (prepare_for_peakfile_writes ()) {
+ return -1;
+ }
}
restart:
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));
+ 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 */
}
void
AudioSource::truncate_peakfile ()
{
- if (_peakfile_descriptor == 0) {
+ if (_peakfile_fd < 0) {
error << string_compose (_("programming error: %1"), "AudioSource::truncate_peakfile() called without open peakfile descriptor")
<< endmsg;
return;
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));
+ 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;
+ _peakpath, _peak_byte_max, errno) << endmsg;
}
}
}
}
void
-AudioSource::mark_streaming_write_completed ()
+AudioSource::mark_streaming_write_completed (const Lock& lock)
{
Glib::Threads::Mutex::Lock lm (_peaks_ready_lock);
projects / ardour.git / blobdiff