promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions...

[ardour.git] / libs / ardour / ardour / silentfilesource.h

diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h
index ec7f1c4d0bd6f177eb3a4220ed54757d95307a56..5cdade3751da049a803136976f81e6b81676e488 100644 (file)
--- a/libs/ardour/ardour/silentfilesource.h
+++ b/libs/ardour/ardour/silentfilesource.h
@@ -27,19 +27,21 @@ namespace ARDOUR {
 
 class SilentFileSource : public AudioFileSource {
 public:
-       int update_header (sframes_t /*when*/, struct tm&, time_t) { return 0; }
+       int update_header (framepos_t /*when*/, struct tm&, time_t) { return 0; }
        int flush_header () { return 0; }
        float sample_rate () const { return _sample_rate; }
 
-       void set_length (nframes_t len) { _length = len; }
+       void set_length (framecnt_t len) { _length = len; }
 
        bool destructive() const { return false; }
        bool can_be_analysed() const { return false; }
 
+       bool clamped_at_unity() const { return false; }
+
 protected:
        friend class SourceFactory;
 
-       SilentFileSource (Session& s, const XMLNode& x, nframes_t len, float srate)
+       SilentFileSource (Session& s, const XMLNode& x, framecnt_t len, float srate)
                : Source (s, x)
                , AudioFileSource (s, x, false)
                , _sample_rate(srate)
@@ -47,17 +49,17 @@ protected:
                _length = len;
        }
 
-       nframes_t read_unlocked (Sample *dst, sframes_t /*start*/, nframes_t cnt) const {
+       framecnt_t read_unlocked (Sample *dst, framepos_t /*start*/, framecnt_t cnt) const {
                memset (dst, 0, sizeof (Sample) * cnt);
                return cnt;
        }
 
-       nframes_t write_unlocked (Sample */*dst*/, nframes_t /*cnt*/) { return 0; }
+       framecnt_t write_unlocked (Sample */*dst*/, framecnt_t /*cnt*/) { return 0; }
 
        void set_header_timeline_position () {}
 
-       int read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t /*start*/, nframes_t /*cnt*/,
-       double /*samples_per_unit*/, nframes_t /*fpp*/) const {
+       int read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t /*start*/, framecnt_t /*cnt*/,
+                                double /*samples_per_unit*/, framecnt_t /*fpp*/) const {
                memset (peaks, 0, sizeof (PeakData) * npeaks);
                return 0;
        }