Fixed bug where embedded sources did not correctly obey the BWF time stamp and would import at the timestamp of the first file. Fixes #0002957

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@9739 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 16 insertions, 0 deletions

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index bcbe3eb7c5..c25c2c8950 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -396,11 +396,17 @@ Editor::do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode
 	vector<ustring> to_embed;
 	bool multi = paths.size() > 1;
 	int nth = 0;
+	bool use_timestamp = (pos == -1);
 
 	switch (chns) {
 	case Editing::ImportDistinctFiles:
 		for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
 
+			/* have to reset this for every file we handle */
+			if (use_timestamp) {
+				pos = -1;
+			}
+
 			to_embed.clear ();
 			to_embed.push_back (*a);
 
@@ -417,6 +423,11 @@ Editor::do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode
 	case Editing::ImportDistinctChannels:
 		for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
 
+			/* have to reset this for every file we handle */
+			if (use_timestamp) {
+				pos = -1;
+			}
+
 			to_embed.clear ();
 			to_embed.push_back (*a);
 
@@ -435,6 +446,11 @@ Editor::do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode
 	case Editing::ImportSerializeFiles:
 		for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
 
+			/* have to reset this for every file we handle */
+			if (use_timestamp) {
+				pos = -1;
+			}
+
 			to_embed.clear ();
 			to_embed.push_back (*a);