X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_videotimeline.cc;h=e087034af0cfe6b897091d6274cd0a69517f95a9;hb=746665e89cf66c5688cd584555168bb8323b824e;hp=259e3e36e17f68126f18c4d8354ee44fa63ec815;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 259e3e36e1..e087034af0 100644
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
@@ -32,11 +32,10 @@
 #include "audio_time_axis.h"
 #include "video_image_frame.h"
 #include "export_video_dialog.h"
-#include "export_video_infobox.h"
 #include "interthread_progress_window.h"
 
 #include "pbd/openuri.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -54,6 +53,9 @@ Editor::set_video_timeline_height (const int h)
 void
 Editor::update_video_timeline (bool flush)
 {
+	// catch GUIIdle -> Editor::idle_visual_changer during quit/close
+	assert (ARDOUR_UI::instance()->video_timeline);
+
 	if (flush) {
 		ARDOUR_UI::instance()->video_timeline->flush_local_cache();
 	}
@@ -105,26 +107,3 @@ Editor::embed_audio_from_video (std::string path, framepos_t n, bool lock_positi
 	import_status.all_done = true;
 	::g_unlink(path.c_str());
 }
-
-void
-Editor::export_video (bool range)
-{
-	if (ARDOUR::Config->get_show_video_export_info()) {
-		ExportVideoInfobox infobox (_session);
-		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 (_session, get_selection().time, range);
-	Gtk::ResponseType r = (Gtk::ResponseType) dialog.run();
-	(void) r; // keep gcc quiet
-	dialog.hide();
-}