fix all manner of things relating to io connections, setting capture alignment, and so on. still needs more tests of actual precise placement of newly recorded material

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

1 files changed, 11 insertions, 8 deletions

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 53dbe5bd9b..12ad418a75 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -66,17 +66,12 @@ class AudioDiskstream : public Diskstream
 	std::string input_source (uint32_t n=0) const {
 		boost::shared_ptr<ChannelList> c = channels.reader();
 		if (n < c->size()) {
-			return (*c)[n]->source ? (*c)[n]->source->name() : "";
+			return (*c)[n]->source.name;
 		} else {
 			return "";
 		}
 	}
 
-	Port *input_source_port (uint32_t n=0) const {
-		boost::shared_ptr<ChannelList> c = channels.reader();
-		if (n < c->size()) return (*c)[n]->source; return 0;
-	}
-
 	void set_record_enabled (bool yn);
 	int set_destructive (bool yn);
 	int set_non_layered (bool yn);
@@ -179,6 +174,12 @@ class AudioDiskstream : public Diskstream
 	bool commit  (framecnt_t nframes);
 
   private:
+        struct ChannelSource { 
+            std::string name;
+
+            bool is_physical () const;
+            void ensure_monitor_input (bool) const;
+        };
 
 	struct ChannelInfo : public boost::noncopyable {
 
@@ -197,8 +198,10 @@ class AudioDiskstream : public Diskstream
 		boost::shared_ptr<AudioFileSource> fades_source;
 		boost::shared_ptr<AudioFileSource> write_source;
 
-		/// the Port that our audio data comes from
-		Port         *source;
+		/// information the Port that our audio data comes from
+		
+                ChannelSource source;
+
 		Sample       *current_capture_buffer;
 		Sample       *current_playback_buffer;