i/o button naming patch and imported file BWF timecode retention patch from nickm, both reworked for 3.0

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

7 files changed, 9 insertions, 3 deletions

diff --git a/libs/ardour/ardour/caimportable.h b/libs/ardour/ardour/caimportable.h
index bb3e2ae191..2cc20d21b7 100644
--- a/libs/ardour/ardour/caimportable.h
+++ b/libs/ardour/ardour/caimportable.h
@@ -38,6 +38,7 @@ class CAImportableSource : public ImportableSource {
 	nframes_t length() const;
 	nframes_t samplerate() const;
 	void      seek (nframes_t pos);
+	nframes64_t natural_position() const { return 0; }
 
    protected:
 	mutable CAAudioFile af;
diff --git a/libs/ardour/ardour/importable_source.h b/libs/ardour/ardour/importable_source.h
index f55c9a5711..26c840b60f 100644
--- a/libs/ardour/ardour/importable_source.h
+++ b/libs/ardour/ardour/importable_source.h
@@ -36,6 +36,7 @@ public:
 	virtual nframes_t length() const = 0;
 	virtual nframes_t samplerate() const = 0;
 	virtual void      seek (nframes_t pos) = 0;
+	virtual nframes64_t natural_position() const = 0;
 };
 
 }
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index 219712799c..e354599485 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -176,6 +176,7 @@ struct LV2World {
 	SLV2Value srate;
 	SLV2Value gtk_gui;
 	SLV2Value external_gui;
+        SLV2Value logarithmic;
 };
 
 
diff --git a/libs/ardour/ardour/resampled_source.h b/libs/ardour/ardour/resampled_source.h
index c8fff0d594..1f6947aeac 100644
--- a/libs/ardour/ardour/resampled_source.h
+++ b/libs/ardour/ardour/resampled_source.h
@@ -40,6 +40,7 @@ class ResampledImportableSource : public ImportableSource
 	nframes_t length() const { return source->length(); }
 	nframes_t samplerate() const { return source->samplerate(); }
 	void      seek (nframes_t pos) { source->seek (pos); }
+	nframes64_t natural_position() const { return source->natural_position(); }
 	
 	static const uint32_t blocksize;
 	
diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h
index 9eb67c0dea..42ce83c0ee 100644
--- a/libs/ardour/ardour/sndfileimportable.h
+++ b/libs/ardour/ardour/sndfileimportable.h
@@ -38,11 +38,13 @@ class SndFileImportableSource : public ImportableSource {
 	nframes_t length() const;
 	nframes_t samplerate() const;
 	void      seek (nframes_t pos);
+	nframes64_t natural_position() const;
 
    protected:
 	SF_INFO sf_info;
 	boost::shared_ptr<SNDFILE> in;
-
+	nframes_t timecode;
+	int64_t get_timecode_info (SNDFILE*, SF_BROADCAST_INFO*, bool&);
 };
 
 }
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 7d04e7de25..d3c6cdb85a 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -46,7 +46,7 @@ class SndFileSource : public AudioFileSource {
 	int update_header (sframes_t when, struct tm&, time_t);
 	int flush_header ();
 
-	sframes_t natural_position () const;
+	nframes64_t natural_position () const;
 
 	sframes_t last_capture_start_frame() const;
 	void mark_capture_start (sframes_t);
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 968a92a804..d6c68edf90 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -66,7 +66,7 @@ class Source : public SessionObject, public boost::noncopyable
 	
 	virtual const Glib::ustring& path() const = 0;
 
-	virtual sframes_t natural_position() const { return 0; }
+	virtual nframes64_t natural_position() const { return 0; }
 
 	void mark_for_remove();