Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 5 deletions

diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h
index 92ef076a9b..e0103185c2 100644
--- a/libs/ardour/ardour/silentfilesource.h
+++ b/libs/ardour/ardour/silentfilesource.h
@@ -34,11 +34,6 @@ class SilentFileSource : public AudioFileSource {
 
 	void set_length (nframes_t len);
 	
- 	int read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt, double samples_per_unit) const {
-		memset (peaks, 0, sizeof (PeakData) * npeaks);
-		return 0;
-	}
-
 	bool destructive() const { return false; }
 
   protected:
@@ -58,6 +53,11 @@ class SilentFileSource : public AudioFileSource {
 
 	void set_header_timeline_position () {}
 
+ 	int read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt, double samples_per_unit, nframes_t fpp) const {
+		memset (peaks, 0, sizeof (PeakData) * npeaks);
+		return 0;
+	}
+
 };
 
 } // namespace ARDOUR