lots of stuff related to capture alignment. things appear to be working now, but require the right alignment setting, which doesn't persist correctly at present

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

3 files changed, 4 insertions, 4 deletions

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 2bd44d62a6..53dbe5bd9b 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -149,8 +149,6 @@ class AudioDiskstream : public Diskstream
 
 	CubicInterpolation interpolation;
 
-	XMLNode* deprecated_io_node;
-
   protected:
 	friend class Session;
 
diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index c141bf4040..182a3f6017 100644
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -50,6 +50,7 @@ namespace PBD {
                 extern uint64_t AudioPlayback;
                 extern uint64_t Panning;
                 extern uint64_t LV2;
+                extern uint64_t CaptureAlignment;
 	}
 }
 
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index cd5932b3e5..b0896349b5 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -122,8 +122,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	static void set_disk_io_chunk_frames (framecnt_t n) { disk_io_chunk_frames = n; }
 
 	/* Stateful */
-	virtual XMLNode& get_state(void) = 0;
-	virtual int      set_state(const XMLNode&, int version) = 0;
+	virtual XMLNode& get_state(void);
+	virtual int      set_state(const XMLNode&, int version);
 
 	virtual void monitor_input (bool) {}
 
@@ -304,6 +304,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	PBD::ScopedConnection ic_connection;
 
 	Flag _flags;
+	XMLNode* deprecated_io_node;
 
 	void route_going_away ();
 };