X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_videotimeline.cc;h=e5f5db34653ec38189c89418b748485de9d078c5;hb=4c4061359cb33011e3acab016e8e604cd413a93d;hp=d4522353c2c903d14e48a9d66b48b87b8b5df10b;hpb=dc7878760da040ad74b077318d2e9868d427199a;p=ardour.git

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index d4522353c2..e5f5db3465 100644
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include <jack/types.h>
+#include "pbd/gstdio_compat.h"
 
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
@@ -27,17 +27,15 @@
 
 #include "ardour_ui.h"
 #include "editor.h"
-#include "simplerect.h"
-#include "canvas_impl.h"
+#include "canvas/rectangle.h"
 #include "editing.h"
 #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;
 
@@ -47,9 +45,7 @@ Editor::set_video_timeline_height (const int h)
 	if (videotl_bar_height == h) { return; }
 	if (h < 2 || h > 8) { return; }
   videotl_bar_height = h;
-	const double nh = (videotl_bar_height * timebar_height - ((ARDOUR::Profile->get_sae())?1.0:0.0));
 	videotl_label.set_size_request (-1, (int)timebar_height * videotl_bar_height);
-	videotl_bar->property_y2().set_value(nh);
 	ARDOUR_UI::instance()->video_timeline->set_height(videotl_bar_height * timebar_height);
 	update_ruler_visibility();
 }
@@ -57,16 +53,6 @@ Editor::set_video_timeline_height (const int h)
 void
 Editor::update_video_timeline (bool flush)
 {
-#if DEBUG
-	framepos_t rightmost_frame = leftmost_frame + current_page_frames();
-	std::cout << "VIDEO SCROLL: " << leftmost_frame << " -- " << rightmost_frame << std::endl;
-	std::cout << "SCROLL UNITS: " << frame_to_unit(leftmost_frame) << " -- " << frame_to_unit(rightmost_frame)
-	          << " = " << frame_to_unit(rightmost_frame) - frame_to_unit(leftmost_frame)
-		        << std::endl;
-#endif
-
-	// TODO later: make this a list for mult. video tracks
-	// also modify  ardour_ui_dialogs.cc : set_session()
 	if (flush) {
 		ARDOUR_UI::instance()->video_timeline->flush_local_cache();
 	}
@@ -116,32 +102,5 @@ Editor::embed_audio_from_video (std::string path, framepos_t n, bool lock_positi
 	}
 
 	import_status.all_done = true;
-	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();
-	dialog.hide();
-#if 0
-	if (r == Gtk::RESPONSE_ACCEPT) {
-		ARDOUR_UI::instance()->popup_error(string_compose(_("Export Successful: %1"),dialog.get_exported_filename()));
-	}
-#endif
+	::g_unlink(path.c_str());
 }