Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / editor_videotimeline.cc

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 7395d767c77083c7697d177e0792b8a561d956b4..e9360d9d09e457e690f9977df0e559cf8a00c900 100644 (file)
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -20,6 +20,8 @@
 
 #include <jack/types.h>
 
+#include <glib/gstdio.h>
+
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/audio_track.h"
@@ -109,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);
@@ -118,7 +120,7 @@ Editor::embed_audio_from_video (std::string path, framepos_t n)
 
        import_status.all_done = true;
 #endif
-       unlink(path.c_str());
+       ::g_unlink(path.c_str());
 }
 
 void