From dc7878760da040ad74b077318d2e9868d427199a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 23 Dec 2013 10:28:32 +0100 Subject: vtl: do not lock audio [to video] when extracting audio-only. --- gtk2_ardour/editor_videotimeline.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gtk2_ardour/editor_videotimeline.cc') diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 7d1c009d58..d4522353c2 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -93,13 +93,10 @@ Editor::toggle_video_timeline_locked () } void -Editor::embed_audio_from_video (std::string path, framepos_t n) +Editor::embed_audio_from_video (std::string path, framepos_t n, bool lock_position_to_video) { vector paths; paths.push_back(path); -#if 0 - do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, n); -#else current_interthread_info = &import_status; import_status.current = 1; import_status.total = paths.size (); @@ -111,13 +108,14 @@ Editor::embed_audio_from_video (std::string path, framepos_t n) boost::shared_ptr track; bool ok = (import_sndfiles (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, n, 1, 1, track, false) == 0); if (ok && track) { - boost::shared_ptr pl = track->playlist(); - pl->find_next_region(n, ARDOUR::End, 0)->set_video_locked(true); + if (lock_position_to_video) { + boost::shared_ptr pl = track->playlist(); + pl->find_next_region(n, ARDOUR::End, 0)->set_video_locked(true); + } _session->save_state (""); } import_status.all_done = true; -#endif unlink(path.c_str()); } -- cgit v1.2.3