diff options
| author | Robin Gareus <robin@gareus.org> | 2013-08-04 17:23:58 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-08 15:26:41 -0400 |
| commit | 4c60dd983c7d7145f3babe0f27c9bf846cb6d761 (patch) | |
| tree | 40152163c6948625a68c0d8577e22d11b191fe13 /gtk2_ardour | |
| parent | 7744037c86488c30092b7255de7cbde96f2f68ef (diff) | |
vtl: import audio at video-offset, forget offset on "Remove Video"
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 34d7a238f3..8cff860d16 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3528,7 +3528,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: @@ -3592,6 +3595,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); |