Merge big changes (mostly Controllable) from trunk

git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 3 deletions

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 36251c07ff..b793ed14f0 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -95,7 +95,7 @@ class AudioFileSource : public AudioSource {
 	static void set_bwf_serial_number (int);
 	
 	static void set_search_path (string);
-	static void set_header_position_offset (jack_nframes_t offset, bool negative);
+	static void set_header_position_offset (jack_nframes_t offset );
 
 	static sigc::signal<void> HeaderPositionOffsetChanged;
 
@@ -107,7 +107,7 @@ class AudioFileSource : public AudioSource {
 	   to cause issues.
 	*/
 
-	void handle_header_position_change ();
+	virtual void handle_header_position_change ();
 
   protected:
 	
@@ -141,7 +141,6 @@ class AudioFileSource : public AudioSource {
 	static char bwf_serial_number[13];
 
 	static uint64_t header_position_offset;
-	static bool     header_position_negative;
 
 	virtual void set_timeline_position (jack_nframes_t pos);
 	virtual void set_header_timeline_position () = 0;