summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_videotimeline.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-12-23 10:28:32 +0100
committerRobin Gareus <robin@gareus.org>2013-12-23 10:28:32 +0100
commitdc7878760da040ad74b077318d2e9868d427199a (patch)
tree8761ff74b9d8da9d7fbbeae2f0909954663751a7 /gtk2_ardour/editor_videotimeline.cc
parentd98c5f7aee5be267ebac3315e3f7a5a14154c60c (diff)
vtl: do not lock audio [to video] when extracting audio-only.
Diffstat (limited to 'gtk2_ardour/editor_videotimeline.cc')
-rw-r--r--gtk2_ardour/editor_videotimeline.cc12
1 files changed, 5 insertions, 7 deletions
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<std::string> 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<ARDOUR::Track> track;
bool ok = (import_sndfiles (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, n, 1, 1, track, false) == 0);
if (ok && track) {
- boost::shared_ptr<ARDOUR::Playlist> pl = track->playlist();
- pl->find_next_region(n, ARDOUR::End, 0)->set_video_locked(true);
+ if (lock_position_to_video) {
+ boost::shared_ptr<ARDOUR::Playlist> 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());
}