diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
| commit | 6a436fd826d1c9d88b60287696cc0836ccce35aa (patch) | |
| tree | 460a08b4d46359b6b168ece26f592c75fc2fe41f /gtk2_ardour/editor_videotimeline.cc | |
| parent | bb59def1ca8a21f915cf636dd1e54957df981656 (diff) | |
| parent | 4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff) | |
fix merge conflict from master
Diffstat (limited to 'gtk2_ardour/editor_videotimeline.cc')
| -rw-r--r-- | gtk2_ardour/editor_videotimeline.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 5da8a295b7..e9360d9d09 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -111,7 +111,7 @@ Editor::embed_audio_from_video (std::string path, framepos_t n) ipw.show (); boost::shared_ptr<ARDOUR::Track> track; - bool ok = (import_sndfiles (paths, Editing::ImportAsTrack, ARDOUR::SrcBest, n, 1, 1, track, false) == 0); + 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); |