(Source List) Clean up the natural_position implementation (libardour part).

8 files changed, 14 insertions, 17 deletions

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 6a3e2569ce..9b4b5eecc7 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -99,7 +99,7 @@ protected:
 
 	int init (const std::string& idstr, bool must_exist);
 
-	virtual void set_header_timeline_position () = 0;
+	virtual void set_header_natural_position () = 0;
 	virtual void handle_header_position_change () {}
 
 	int move_dependents_to_trash();
diff --git a/libs/ardour/ardour/caimportable.h b/libs/ardour/ardour/caimportable.h
index 23fc1782ed..044ebc9b39 100644
--- a/libs/ardour/ardour/caimportable.h
+++ b/libs/ardour/ardour/caimportable.h
@@ -43,7 +43,6 @@ class LIBARDOUR_API CAImportableSource : public ImportableSource {
 	samplecnt_t length() const;
 	samplecnt_t samplerate() const;
 	void      seek (samplepos_t pos);
-	samplepos_t natural_position() const { return 0; }
 	bool clamped_at_unity () const { return false; }
 
    protected:
diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index f61c6bb984..73951f52d4 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -46,7 +46,7 @@ class LIBARDOUR_API CoreAudioSource : public AudioFileSource {
     uint32_t channel_count () const { return n_channels; }
 
 	int flush_header () {return 0;};
-	void set_header_timeline_position () {};
+	void set_header_natural_position () {};
 	bool clamped_at_unity () const { return false; }
 
 	void flush () {}
diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h
index 79dc8b0a50..a36c2d4c2a 100644
--- a/libs/ardour/ardour/silentfilesource.h
+++ b/libs/ardour/ardour/silentfilesource.h
@@ -59,7 +59,7 @@ protected:
 
 	samplecnt_t write_unlocked (Sample */*dst*/, samplecnt_t /*cnt*/) { return 0; }
 
-	void set_header_timeline_position () {}
+	void set_header_natural_position () {}
 
 	int read_peaks_with_fpp (PeakData *peaks, samplecnt_t npeaks, samplepos_t /*start*/, samplecnt_t /*cnt*/,
 				 double /*samples_per_pixel*/, samplecnt_t /*fpp*/) const {
diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h
index cbb34508d4..4225cbad64 100644
--- a/libs/ardour/ardour/sndfileimportable.h
+++ b/libs/ardour/ardour/sndfileimportable.h
@@ -37,9 +37,9 @@ public:
 	uint32_t    channels() const;
 	samplecnt_t length() const;
 	samplecnt_t samplerate() const;
-	void        seek (samplepos_t pos);
-	samplepos_t natural_position() const;
-	bool        clamped_at_unity () const;
+	void       seek (samplepos_t pos);
+	bool       clamped_at_unity () const;
+	samplepos_t natural_position () const;
 
 protected:
 	SF_INFO sf_info;
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 788ac4773b..8a91c6364e 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -60,8 +60,6 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	int flush_header ();
 	void flush ();
 
-	samplepos_t natural_position () const;
-
 	samplepos_t last_capture_start_sample() const;
 	void mark_capture_start (samplepos_t);
 	void mark_capture_end ();
@@ -81,7 +79,7 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	void close ();
 
 	void set_path (const std::string& p);
-	void set_header_timeline_position ();
+	void set_header_natural_position ();
 
 	samplecnt_t read_unlocked (Sample *dst, samplepos_t start, samplecnt_t cnt) const;
 	samplecnt_t write_unlocked (Sample *dst, samplecnt_t cnt);
@@ -111,7 +109,7 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	Sample*        xfade_buf;
 
 	samplecnt_t crossfade (Sample* data, samplecnt_t cnt, int dir);
-	void set_timeline_position (samplepos_t);
+	void set_natural_position (samplepos_t);
 	samplecnt_t destructive_write_unlocked (Sample *dst, samplecnt_t cnt);
 	samplecnt_t nondestructive_write_unlocked (Sample *dst, samplecnt_t cnt);
 	void handle_header_position_change ();
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index d6ed19b610..25581b2007 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -74,8 +74,6 @@ public:
 	void                 set_take_id (std::string id) { _take_id =id; }
 	const std::string&   take_id ()        const { return _take_id; }
 
-	virtual samplepos_t natural_position() const { return 0; }
-
 	void mark_for_remove();
 
 	virtual void mark_streaming_write_started (const Lock& lock) {}
@@ -104,8 +102,9 @@ public:
 	std::string get_transients_path() const;
 	int load_transients (const std::string&);
 
-	samplepos_t  timeline_position() const { return _timeline_position; }
-	virtual void set_timeline_position (samplepos_t pos);
+	virtual samplepos_t natural_position() const { return _natural_position; }
+	virtual void set_natural_position (samplepos_t pos);
+	bool have_natural_position() const { return _have_natural_position; }
 
 	void set_allow_remove_if_empty (bool yn);
 
@@ -129,7 +128,8 @@ public:
 	Flag                _flags;
 	time_t              _timestamp;
 	std::string         _take_id;
-	samplepos_t          _timeline_position;
+	samplepos_t          _natural_position;
+	samplepos_t          _have_natural_position;
 	bool                _analysed;
         mutable Glib::Threads::Mutex _lock;
         mutable Glib::Threads::Mutex _analysis_lock;
diff --git a/libs/ardour/ardour/srcfilesource.h b/libs/ardour/ardour/srcfilesource.h
index a7d23912ec..9123317c3c 100644
--- a/libs/ardour/ardour/srcfilesource.h
+++ b/libs/ardour/ardour/srcfilesource.h
@@ -38,7 +38,7 @@ public:
 	int  update_header (samplepos_t /*when*/, struct tm&, time_t) { return 0; }
 	int  flush_header () { return 0; }
 	void flush () { }
-	void set_header_timeline_position () {};
+	void set_header_natural_position () {};
 	void set_length (samplecnt_t /*len*/) {};
 
 	float sample_rate () const { return _session.nominal_sample_rate(); }