Introduce new time for session-relative frame time, and make source interface capable of handling 64-bit long sessions.

sframes_t is "session frames".  The rules for time stamps are:
 - Anything relative to transport time, session position, etc, should be sframes_t
 - Anything relative to jack cycles, including the length thereof, should be nframes_t

To support sessions which exceed UINT32_MAX frames, we need to replace all the uses of
nframes_t for session time with sframes_t, and make sure the conversions are sound.
This does not depend on jack's nframes_t; that we are using the same type at all right now was an oops.

This is also be kinda nice for readability since the two different time bases have different types...


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

1 files changed, 3 insertions, 3 deletions

diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h
index ad433e5f94..58460b9c21 100644
--- a/libs/ardour/ardour/silentfilesource.h
+++ b/libs/ardour/ardour/silentfilesource.h
@@ -27,7 +27,7 @@ namespace ARDOUR {
 
 class SilentFileSource : public AudioFileSource {
 public:
-	int update_header (nframes_t when, struct tm&, time_t) { return 0; }
+	int update_header (sframes_t when, struct tm&, time_t) { return 0; }
 	int flush_header () { return 0; }
 	float sample_rate () const { return _sample_rate; }
 
@@ -47,7 +47,7 @@ protected:
 		_length = len;
 	}
 
-	nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const {
+	nframes_t read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const {
 		memset (dst, 0, sizeof (Sample) * cnt);
 		return cnt;
 	}
@@ -56,7 +56,7 @@ protected:
 
 	void set_header_timeline_position () {}
 
- 	int read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt,
+ 	int read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t start, nframes_t cnt,
 			double samples_per_unit, nframes_t fpp) const {
 		memset (peaks, 0, sizeof (PeakData) * npeaks);
 		return 0;