forward port 2.X various changes (not all, but i have a list) ending with 6928

git-svn-id: svn://localhost/ardour2/branches/3.0@7643 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 0 deletions

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index f309f599c5..083cf3bea9 100644
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -945,3 +945,14 @@ AudioSource::available_peaks (double zoom_factor) const
 	return (end/sizeof(PeakData)) * _FPP;
 }
 
+void
+AudioSource::dec_read_data_count (nframes_t cnt)
+{
+        uint32_t val = cnt * sizeof (Sample);
+
+        if (val < _read_data_count) {
+                _read_data_count -= val;
+        } else { 
+                _read_data_count = 0;
+        }
+}