fix newly-appearing crash-at-close caused by muddled thinking in pbd/pthread_utils

[ardour.git] / gtk2_ardour / editor_videotimeline.cc

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 564e3016e78be7d2f6cedd8e65e8664269de757c..0a516fb748e08a7cd4fe3adf951f08321c5d0e01 100644 (file)
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -17,7 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
 
 #include <jack/types.h>
 
@@ -37,6 +36,7 @@
 #include "export_video_infobox.h"
 #include "interthread_progress_window.h"
 
+#include "pbd/openuri.h"
 #include "i18n.h"
 
 using namespace std;
@@ -109,7 +109,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);
@@ -126,10 +126,17 @@ Editor::export_video ()
 {
        if (ARDOUR::Config->get_show_video_export_info()) {
                ExportVideoInfobox infobox (_session);
-               infobox.run();
+               Gtk::ResponseType rv = (Gtk::ResponseType) infobox.run();
                if (infobox.show_again()) {
                        ARDOUR::Config->set_show_video_export_info(false);
                }
+               switch (rv) {
+                       case GTK_RESPONSE_YES:
+                               PBD::open_uri (ARDOUR::Config->get_reference_manual_url() + "/video-timeline/operations/#export");
+                               break;
+                       default:
+                               break;
+               }
        }
        ExportVideoDialog dialog (*this, _session);
        Gtk::ResponseType r = (Gtk::ResponseType) dialog.run();
@@ -140,5 +147,3 @@ Editor::export_video ()
        }
 #endif
 }
-
-#endif /* WITH_VIDEOTIMELINE */