vtl: import audio at video-offset, forget offset on "Remove Video"

1 files changed, 8 insertions, 1 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index e74d02eb41..97726cd7ae 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3525,7 +3525,10 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
 					return;
 				}
 				if (!transcode_video_dialog->get_audiofile().empty()) {
-					editor->embed_audio_from_video(transcode_video_dialog->get_audiofile());
+					editor->embed_audio_from_video(
+							transcode_video_dialog->get_audiofile(),
+							video_timeline->get_offset()
+							);
 				}
 				switch (transcode_video_dialog->import_option()) {
 					case VTL_IMPORT_TRANSCODED:
@@ -3589,6 +3592,10 @@ ARDOUR_UI::remove_video ()
 	video_timeline->close_session();
 	editor->toggle_ruler_video(false);
 
+	/* reset state */
+	video_timeline->set_offset_locked(false);
+	video_timeline->set_offset(0);
+
 	/* delete session state */
 	XMLNode* node = new XMLNode(X_("Videotimeline"));
 	_session->add_extra_xml(*node);