enable videotimeline by default

56 files changed, 43 insertions, 338 deletions

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 7490042222..395e16142c 100644
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <cmath>
 
@@ -684,5 +682,3 @@ AddVideoDialog::request_preview(std::string u)
 	preview_image->set(imgbuf);
 	preview_image->show();
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h
index 985d64e4cc..1d91383c85 100644
--- a/gtk2_ardour/add_video_dialog.h
+++ b/gtk2_ardour/add_video_dialog.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __gtk_ardour_add_video_dialog_h__
 #define __gtk_ardour_add_video_dialog_h__
 
@@ -109,5 +107,3 @@ class AddVideoDialog : public ArdourDialog
 };
 
 #endif /* __gtk_ardour_add_video_dialog_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index e50f62cfbb..10881a0fb0 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -34,16 +34,14 @@
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
       <!--menuitem action='importFromSession'/-->
-#ifdef WITH_VIDEOTIMELINE
+
       <menuitem action='OpenVideo'/>
       <menuitem action='CloseVideo'/>
-#endif
+
       <menu name='Export' action='Export'>
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
-#ifdef WITH_VIDEOTIMELINE
         <menuitem action='ExportVideo'/>
-#endif
       </menu>
       <menu name='Cleanup' action='Cleanup'>
         <menuitem action='CleanupUnused'/>
@@ -283,9 +281,7 @@
         <menuitem action='snap-regions-to-grid'/>
         <menuitem action='toggle-region-lock'/>
         <menuitem action='toggle-region-lock-style'/>
-#ifdef WITH_VIDEOTIMELINE
         <menuitem action='toggle-region-video-lock'/>
-#endif
         <menuitem action='set-region-sync-position'/>
         <menuitem action='remove-region-sync'/>
         <menuitem action='nudge-forward'/>
@@ -437,7 +433,6 @@
         <menuitem action="toggle-loop-punch-ruler"/>
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
-#ifdef WITH_VIDEOTIMELINE
         <separator/>
         <menuitem action="toggle-video-ruler"/>
       </menu>
@@ -451,7 +446,6 @@
         <menuitem action="toggle-vmon-timecode"/>
         <menuitem action="toggle-vmon-frame"/>
         <menuitem action="toggle-vmon-osdbg"/>
-#endif
       </menu>
       <menu action="ScrollMenu">
         <menuitem action='scroll-tracks-down'/>
@@ -526,10 +520,8 @@
 
       <separator/>
 
-#ifdef WITH_VIDEOTIMELINE
       <menuitem action='ToggleJadeo'/>
       <separator/>
-#endif
 
       <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-audio-connection-manager'/>
@@ -560,10 +552,8 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
-#ifdef WITH_VIDEOTIMELINE
 	  <separator/>
 	  <menuitem action="toggle-video-ruler"/>
-#endif
   </popup>
 
   <popup name='ProcessorMenu'>
@@ -659,9 +649,7 @@
       <menuitem action='naturalize-region'/>
       <menuitem action='toggle-region-lock'/>
       <menuitem action='toggle-region-lock-style'/>
-#ifdef WITH_VIDEOTIMELINE
       <menuitem action='toggle-region-video-lock'/>
-#endif
       <menuitem action='snap-regions-to-grid'/>
       <menuitem action='set-region-sync-position'/>
       <menuitem action='remove-region-sync'/>
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b7cccbfaa5..eebd35aefb 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -116,12 +116,10 @@ typedef uint64_t microseconds_t;
 #include "time_axis_view_item.h"
 #include "utils.h"
 #include "window_proxy.h"
-#ifdef WITH_VIDEOTIMELINE
 #include "video_server_dialog.h"
 #include "add_video_dialog.h"
 #include "transcode_video_dialog.h"
-#include "system_exec.h" /* to launch video-server */
-#endif
+#include "system_exec.h"
 
 #include "i18n.h"
 
@@ -201,10 +199,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	session_selector_window = 0;
 	last_key_press_time = 0;
 	add_route_dialog = 0;
-#ifdef WITH_VIDEOTIMELINE
 	add_video_dialog = 0;
 	video_server_process = 0;
-#endif
 	route_params = 0;
 	bundle_manager = 0;
 	rc_option_editor = 0;
@@ -471,10 +467,10 @@ ARDOUR_UI::~ARDOUR_UI ()
 	delete editor;
 	delete mixer;
 	delete add_route_dialog;
-#ifdef WITH_VIDEOTIMELINE
-	if (add_video_dialog) delete add_video_dialog;
+	if (add_video_dialog) {
+		delete add_video_dialog;
+	}
 	stop_video_server();
-#endif
 }
 
 void
@@ -835,9 +831,7 @@ void
 ARDOUR_UI::finish()
 {
 	if (_session) {
-#ifdef WITH_VIDEOTIMELINE
 		ARDOUR_UI::instance()->video_timeline->sync_session_state();
-#endif
 
 		if (_session->dirty()) {
 			vector<string> actions;
@@ -873,10 +867,8 @@ If you still wish to quit, please use the\n\n\
 		point_zero_one_second_connection.disconnect();
 	}
 
-#ifdef WITH_VIDEOTIMELINE
 	delete ARDOUR_UI::instance()->video_timeline;
 	stop_video_server();
-#endif
 
 	/* Save state before deleting the session, as that causes some
 	   windows to be destroyed before their visible state can be
@@ -2552,11 +2544,11 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 	 * treat a non-dirty session this way, so that it stays visible 
 	 * as we bring up the new session dialog.
 	 */
-#ifdef WITH_VIDEOTIMELINE
+
 	if (_session && ARDOUR_UI::instance()->video_timeline) {
 		ARDOUR_UI::instance()->video_timeline->sync_session_state();
 	}
-#endif
+
 	if (_session && _session->dirty()) {
 		if (unload_session (false)) {
 			/* unload cancelled by user */
@@ -3332,7 +3324,6 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 	/* idle connection will end at scope end */
 }
 
-#ifdef WITH_VIDEOTIMELINE
 void
 ARDOUR_UI::stop_video_server (bool ask_confirm)
 {
@@ -3573,7 +3564,6 @@ ARDOUR_UI::flush_videotimeline_cache (bool localcacheonly)
 	}
 	editor->queue_visual_videotimeline_update();
 }
-#endif
 
 XMLNode*
 ARDOUR_UI::mixer_settings () const
@@ -3843,9 +3833,7 @@ ARDOUR_UI::update_transport_clocks (framepos_t pos)
 	if (big_clock_window->get()) {
 		big_clock->set (pos);
 	}
-#ifdef WITH_VIDEOTIMELINE
 	ARDOUR_UI::instance()->video_timeline->manual_seek_video_monitor(pos);
-#endif
 }
 
 
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 40b71cea78..6300a352d5 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -65,9 +65,7 @@
 #include "ardour/plugin.h"
 #include "ardour/session_handle.h"
 
-#ifdef WITH_VIDEOTIMELINE
 #include "video_timeline.h"
-#endif
 
 #include "ardour_dialog.h"
 #include "ardour_button.h"
@@ -80,11 +78,9 @@
 
 class About;
 class AddRouteDialog;
-#ifdef WITH_VIDEOTIMELINE
 class AddVideoDialog;
 class VideoTimeLine;
 class SystemExec;
-#endif
 class ArdourStartup;
 class ArdourKeyboard;
 class AudioClock;
@@ -213,9 +209,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	TimeInfoBox* time_info_box;
 
-#ifdef WITH_VIDEOTIMELINE
 	VideoTimeLine *video_timeline;
-#endif
 
 	void store_clock_modes ();
 	void restore_clock_modes ();
@@ -226,14 +220,13 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void add_route (Gtk::Window* float_window);
         void add_routes_part_two ();
         void add_routes_thread ();
-#ifdef WITH_VIDEOTIMELINE
+
 	void add_video (Gtk::Window* float_window);
 	void remove_video ();
 	void start_video_server_menu (Gtk::Window* float_window);
 	bool start_video_server (Gtk::Window* float_window, bool popup_msg);
 	void stop_video_server (bool ask_confirm=false);
 	void flush_videotimeline_cache (bool localcacheonly=false);
-#endif
 
 	void session_add_audio_track (
 		int input_channels,
@@ -630,11 +623,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	AddRouteDialog *add_route_dialog;
 
-#ifdef WITH_VIDEOTIMELINE
 	/* video dialog */
+
 	AddVideoDialog *add_video_dialog;
 	SystemExec *video_server_process;
-#endif
 
 	/* Keyboard Handling */
 
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 0cfe341211..256a1a593e 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -121,9 +121,7 @@ ARDOUR_UI::set_session (Session *s)
 	secondary_clock->set_session (s);
 	big_clock->set_session (s);
 	time_info_box->set_session (s);
-#ifdef WITH_VIDEOTIMELINE
 	video_timeline->set_session (s);
-#endif
 
 	/* sensitize menu bar options that are now valid */
 
@@ -215,11 +213,10 @@ ARDOUR_UI::set_session (Session *s)
 int
 ARDOUR_UI::unload_session (bool hide_stuff)
 {
-#ifdef WITH_VIDEOTIMELINE
 	if (_session) {
 		ARDOUR_UI::instance()->video_timeline->sync_session_state();
 	}
-#endif
+
 	if (_session && _session->dirty()) {
 		std::vector<std::string> actions;
 		actions.push_back (_("Don't close"));
@@ -250,9 +247,8 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 	ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
 
 	rec_button.set_sensitive (false);
-#ifdef WITH_VIDEOTIMELINE
+
 	ARDOUR_UI::instance()->video_timeline->close_session();
-#endif
 
 	stop_blinking ();
 	stop_clocking ();
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 3685233efa..2d279385ae 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -132,7 +132,6 @@ ARDOUR_UI::install_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::write_sensitive_actions.push_back (act);
 
-#ifdef WITH_VIDEOTIMELINE
 	act = ActionManager::register_action (main_actions, X_("OpenVideo"), _("Open Video"),
 					      sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_video), (Gtk::Window*) 0));
 	ActionManager::session_sensitive_actions.push_back (act);
@@ -142,7 +141,6 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_action (main_actions, X_("ExportVideo"), _("Export To Video File"),
 					      sigc::mem_fun (*editor, &PublicEditor::export_video));
 	ActionManager::session_sensitive_actions.push_back (act);
-#endif
 
 #ifdef WITH_CMT
 
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 9b7f8fb178..8cb1376522 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -382,9 +382,7 @@ ARDOUR_UI::parameter_changed (std::string p)
 
 		synchronize_sync_source_and_video_pullup ();
 		reset_main_clocks ();
-#ifdef WITH_VIDEOTIMELINE
 		editor->queue_visual_videotimeline_update();
-#endif
 
 	} else if (p == "sync-source") {
 
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 33a48f3ec6..97e58ddb62 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -151,9 +151,7 @@ CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
 CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
 CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
 CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
-#ifdef WITH_VIDEOTIMELINE
 CANVAS_VARIABLE(canvasvar_VideoBar, "video timeline bar")
-#endif
 CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
 CANVAS_VARIABLE(canvasvar_CoveredRegion, "region area covered by another region")
 CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index f2acaca749..b7cc7b9f27 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -246,9 +246,7 @@ Editor::Editor ()
 	, range_mark_label (_("Range Markers"))
 	, transport_mark_label (_("Loop/Punch Ranges"))
 	, cd_mark_label (_("CD Markers"))
-#ifdef WITH_VIDEOTIMELINE
 	, videotl_label (_("Video Timeline"))
-#endif
 	, edit_packer (4, 4, true)
 
 	  /* the values here don't matter: layout widgets
@@ -440,7 +438,6 @@ Editor::Editor ()
 	cd_mark_label.hide();
 	cd_mark_label.set_no_show_all();
 
-#ifdef WITH_VIDEOTIMELINE
 	videotl_bar_height = 4;
 	videotl_label.set_name ("EditorRulerLabel");
 	videotl_label.set_size_request (-1, (int)timebar_height * videotl_bar_height);
@@ -448,7 +445,6 @@ Editor::Editor ()
 	videotl_label.set_padding (5,0);
 	videotl_label.hide();
 	videotl_label.set_no_show_all();
-#endif
 
 	range_mark_label.set_name ("EditorRulerLabel");
 	range_mark_label.set_size_request (-1, (int)timebar_height);
@@ -4293,7 +4289,6 @@ Editor::set_frames_per_unit (double fpu)
 	instant_save ();
 }
 
-#ifdef WITH_VIDEOTIMELINE
 void
 Editor::queue_visual_videotimeline_update ()
 {
@@ -4306,7 +4301,6 @@ Editor::queue_visual_videotimeline_update ()
 	 */
 	ensure_visual_change_idle_handler ();
 }
-#endif
 
 void
 Editor::ensure_visual_change_idle_handler ()
@@ -4358,11 +4352,9 @@ Editor::idle_visual_changer ()
 		update_tempo_based_rulers (current_bbt_points_begin, current_bbt_points_end);
 	}
 
-#ifdef WITH_VIDEOTIMELINE
 	if (p & VisualChange::ZoomLevel) {
 		update_video_timeline();
 	}
-#endif
 
 	if (p & VisualChange::TimeOrigin) {
 		set_horizontal_position (pending_visual_change.time_origin / frames_per_unit);
@@ -4377,11 +4369,10 @@ Editor::idle_visual_changer ()
 		update_fixed_rulers ();
 		redisplay_tempo (true);
 	}
-#ifdef WITH_VIDEOTIMELINE
+
 	if (!(p & VisualChange::ZoomLevel)) {
 		update_video_timeline();
 	}
-#endif
 
 	_summary->set_overlays_dirty ();
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 676b4f1830..910df94c26 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -783,9 +783,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 		ruler_time_range_marker = 7,
 		ruler_time_transport_marker = 8,
 		ruler_time_cd_marker = 9,
-#ifdef WITH_VIDEOTIMELINE
 		ruler_video_timeline = 10,
-#endif
 	};
 
 	static GtkCustomMetric ruler_metrics[4];
@@ -921,7 +919,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	Gtk::Label  transport_mark_label;
 	Gtk::Label  cd_mark_label;
 
-#ifdef WITH_VIDEOTIMELINE
+	/* videtimline related actions */
 	ArdourCanvas::SimpleRect* videotl_bar;
 	Gtk::Label                videotl_label;
 	ArdourCanvas::Group*      videotl_bar_group;
@@ -945,7 +943,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	int get_videotl_bar_height () const { return videotl_bar_height; }
 	void export_video ();
 	void toggle_region_video_lock ();
-#endif
 
 	Gtk::VBox          time_button_vbox;
 	Gtk::HBox          time_button_hbox;
@@ -1456,7 +1453,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
 	bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
 	bool canvas_cd_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
-#ifdef WITH_VIDEOTIMELINE
+
 	bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*);
 	void update_video_timeline (bool flush = false);
 	void set_video_timeline_height (const int);
@@ -1465,7 +1462,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void set_video_timeline_locked (const bool);
 	void queue_visual_videotimeline_update ();
 	void embed_audio_from_video (std::string, framepos_t n = 0);
-#endif
 
 	bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);
 	bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*);
@@ -2183,9 +2179,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	friend class RegionCreateDrag;
 	friend class RegionMotionDrag;
 	friend class RegionInsertDrag;
-#ifdef WITH_VIDEOTIMELINE
 	friend class VideoTimeLineDrag;
-#endif
 
 	friend class EditorSummary;
 	friend class EditorGroupTabs;
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index fb6cd7df81..fefb0c6dd6 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -543,7 +543,6 @@ Editor::register_actions ()
 	ruler_samples_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-samples-ruler"), _("Samples"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_samples)));
 	ruler_timecode_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-timecode-ruler"), _("Timecode"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_timecode)));
 	ruler_minsec_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-minsec-ruler"), _("Min:Sec"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_minsec)));
-#ifdef WITH_VIDEOTIMELINE
 
 	ActionManager::register_action (editor_menu_actions, X_("VideoMonitorMenu"), _("Video Monitor"));
 
@@ -558,8 +557,6 @@ Editor::register_actions ()
 	xjadeo_letterbox_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-letterbox"), _("Letterbox"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 6)));
 	xjadeo_zoom_100 = reg_sens (editor_actions, "zoom-vmon-100", _("Original Size"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 7));
 
-#endif
-
 	/* set defaults here */
 
 	no_ruler_shown_update = true;
@@ -569,7 +566,7 @@ Editor::register_actions ()
 	ruler_range_action->set_active (true);
 	ruler_loop_punch_action->set_active (true);
 	ruler_loop_punch_action->set_active (true);
-#ifdef WITH_VIDEOTIMELINE
+
 	ruler_video_action->set_active (false);
 	xjadeo_proc_action->set_active (false);
 	xjadeo_proc_action->set_sensitive (false);
@@ -586,7 +583,7 @@ Editor::register_actions ()
 	xjadeo_letterbox_action->set_active (false);
 	xjadeo_letterbox_action->set_sensitive (false);
 	xjadeo_zoom_100->set_sensitive (false);
-#endif
+
 	if (Profile->get_sae()) {
 		ruler_bbt_action->set_active (true);
 		ruler_cd_marker_action->set_active (false);
@@ -742,11 +739,9 @@ Editor::toggle_ruler_visibility (RulerType rt)
 	case ruler_time_cd_marker:
 		action = "toggle-cd-marker-ruler";
 		break;
-#ifdef WITH_VIDEOTIMELINE
 	case ruler_video_timeline:
 		action = "toggle-video-ruler";
 		break;
-#endif
 	}
 
 	Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), action);
@@ -778,7 +773,6 @@ Editor::set_group_tabs ()
 	}
 }
 
-#ifdef WITH_VIDEOTIMELINE
 void
 Editor::set_xjadeo_sensitive (bool onoff)
 {
@@ -896,7 +890,6 @@ Editor::set_xjadeo_viewoption (int what)
 		ARDOUR_UI::instance()->video_timeline->control_video_monitor(what, 0);
 	}
 }
-#endif
 
 void
 Editor::toggle_measure_visibility ()
@@ -1734,9 +1727,7 @@ Editor::register_region_actions ()
 	/* Toggle `locked' status of selected regions */
 	toggle_reg_sens (_region_actions, "toggle-region-lock", _("Lock"), sigc::mem_fun(*this, &Editor::toggle_region_lock));
 
-#ifdef WITH_VIDEOTIMELINE
 	toggle_reg_sens (_region_actions, "toggle-region-video-lock", _("Lock to Video"), sigc::mem_fun(*this, &Editor::toggle_region_video_lock));
-#endif
 
 	toggle_reg_sens (
 		_region_actions,
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 8be0e61a7b..c4b07eb738 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -188,7 +188,6 @@ Editor::initialize_canvas ()
 	cd_marker_bar->property_outline_pixels() = 1;
  	cd_marker_bar->property_outline_what() = 0x8;
 
-#ifdef WITH_VIDEOTIMELINE
 	videotl_bar_group = new ArdourCanvas::Group (*track_canvas->root ());
 	if (Profile->get_sae()) {
 		videotl_bar = new ArdourCanvas::SimpleRect (*videotl_bar_group, 0.0, 0.0, phys_width, (timebar_height * videotl_bar_height - 1));
@@ -199,7 +198,6 @@ Editor::initialize_canvas ()
 	}
 	videotl_bar->property_outline_what() = (0x1 | 0x8);
 	ARDOUR_UI::instance()->video_timeline = new VideoTimeLine(this, videotl_bar_group, (timebar_height * videotl_bar_height));
-#endif
 
 	timebar_group =  new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
 	cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
@@ -210,9 +208,7 @@ Editor::initialize_canvas ()
 	transport_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 2.0);
 	marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height);
 	cd_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, 0.0);
-#ifdef WITH_VIDEOTIMELINE
 	videotl_group = new ArdourCanvas::Group (*timebar_group, 0.0, 0.0);
-#endif
 
 	cd_marker_bar_drag_rect = new ArdourCanvas::SimpleRect (*cd_marker_group, 0.0, 0.0, 100, timebar_height);
 	cd_marker_bar_drag_rect->property_outline_pixels() = 0;
@@ -257,10 +253,7 @@ Editor::initialize_canvas ()
 	meter_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
 	marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
 	cd_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-#ifdef WITH_VIDEOTIMELINE
 	videotl_bar_group->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_bar));
-	//videotl_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_bar));
-#endif
 	range_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
 	transport_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
 
@@ -843,9 +836,7 @@ Editor::set_horizontal_position (double p)
 		_summary->set_overlays_dirty ();
 	}
 
-#ifdef WITH_VIDEOTIMELINE
 	update_video_timeline();
-#endif
 
 	HorizontalPositionChanged (); /* EMIT SIGNAL */
 
@@ -896,10 +887,8 @@ Editor::color_handler()
 	cd_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CDMarkerBar.get();
 	cd_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
 
-#ifdef WITH_VIDEOTIMELINE
 	videotl_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VideoBar.get();
 	videotl_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
-#endif
 
 	range_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeMarkerBar.get();
 	range_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index e76b4ce8ee..4c49dd1a9b 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -948,13 +948,11 @@ Editor::canvas_cd_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 	return typed_event (item, event, CdMarkerBarItem);
 }
 
-#ifdef WITH_VIDEOTIMELINE
 bool
 Editor::canvas_videotl_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
 	return typed_event (item, event, VideoBarItem);
 }
-#endif
 
 bool
 Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* /*marker*/)
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 1713fe58c0..8f992266e7 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -659,11 +659,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
 
 		RegionView* rv = i->view;
 
-		if (rv->region()->locked()
-#ifdef WITH_VIDEOTIMELINE
-				|| rv->region()->video_locked()
-#endif
-				) {
+		if (rv->region()->locked() || rv->region()->video_locked()) {
 			continue;
 		}
 
@@ -934,11 +930,7 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed
 	/* insert the regions into their new playlists */
 	for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
 
-		if (i->view->region()->locked()
-#ifdef WITH_VIDEOTIMELINE
-				|| i->view->region()->video_locked()
-#endif
-				) {
+		if (i->view->region()->locked() || i->view->region()->video_locked()) {
 			continue;
 		}
 
@@ -1017,11 +1009,7 @@ RegionMoveDrag::finished_no_copy (
 		RouteTimeAxisView* const dest_rtv = dynamic_cast<RouteTimeAxisView*> (_time_axis_views[i->time_axis_view]);
 		double const dest_layer = i->layer;
 
-		if (rv->region()->locked()
-#ifdef WITH_VIDEOTIMELINE
-				|| rv->region()->video_locked()
-#endif
-				) {
+		if (rv->region()->locked() || rv->region()->video_locked()) {
 			++i;
 			continue;
 		}
@@ -1610,8 +1598,6 @@ NoteResizeDrag::aborted (bool)
 	}
 }
 
-#ifdef WITH_VIDEOTIMELINE
-
 AVDraggingView::AVDraggingView (RegionView* v)
 	: view (v)
 {
@@ -1623,16 +1609,12 @@ VideoTimeLineDrag::VideoTimeLineDrag (Editor* e, ArdourCanvas::Item* i)
 {
 	DEBUG_TRACE (DEBUG::Drags, "New VideoTimeLineDrag\n");
 
-	/* create a list of regions to move along */
-#if 1 /* all reagions -- with video_locked() */
 	RegionSelection rs;
 	TrackViewList empty;
 	empty.clear();
 	_editor->get_regions_after(rs, (framepos_t) 0, empty);
 	std::list<RegionView*> views = rs.by_layer();
-#else /* selected regions -- with video_locked() */
-	std::list<RegionView*> views = _editor->selection->regions.by_layer();
-#endif
+
 	for (list<RegionView*>::iterator i = views.begin(); i != views.end(); ++i) {
 		RegionView* rv = (*i);
 		if (!rv->region()->video_locked()) {
@@ -1776,7 +1758,6 @@ VideoTimeLineDrag::aborted (bool)
 		i->view->region()->set_position(i->initial_position);
 	}
 }
-#endif
 
 TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v, bool preserve_fade_anchor)
 	: RegionDrag (e, i, p, v)
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index 9e9f263d76..6267956ed7 100644
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -505,7 +505,6 @@ private:
 	double _cumulative_dx;
 };
 
-#ifdef WITH_VIDEOTIMELINE
 /** Container for details about audio regions being dragged along with video */
 class AVDraggingView
 {
@@ -518,7 +517,6 @@ public:
 
 /** Drag of video offset */
 class VideoTimeLineDrag : public Drag
-	//TODO , public sigc::trackable
 {
 public:
 	VideoTimeLineDrag (Editor *e, ArdourCanvas::Item *i);
@@ -544,7 +542,6 @@ private:
 	ARDOUR::frameoffset_t _startdrag_video_offset;
 	ARDOUR::frameoffset_t _max_backwards_drag;
 };
-#endif
 
 /** Drag to trim region(s) */
 class TrimDrag : public RegionDrag
diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h
index 39b6310a67..303bddb103 100644
--- a/gtk2_ardour/editor_items.h
+++ b/gtk2_ardour/editor_items.h
@@ -28,9 +28,7 @@ enum ItemType {
 	MarkerBarItem,
 	RangeMarkerBarItem,
 	CdMarkerBarItem,
-#ifdef WITH_VIDEOTIMELINE
 	VideoBarItem,
-#endif
 	TransportMarkerBarItem,
 	SelectionItem,
 	ControlPointItem,
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 8709a0fcfe..b42a009415 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -737,12 +737,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 		}
 	}
 
-#ifdef WITH_VIDEOTIMELINE
 	case VideoBarItem:
 		_drags->set (new VideoTimeLineDrag (this, item), event);
 		return true;
 		break;
-#endif
 
 	case MarkerBarItem:
 	case TempoBarItem:
@@ -1554,9 +1552,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 			case CdMarkerBarItem:
 			case TempoBarItem:
 			case MeterBarItem:
-#ifdef WITH_VIDEOTIMELINE
 			case VideoBarItem:
-#endif
 				popup_ruler_menu (where, item_type);
 				break;
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 9797c0ef7e..8cd025eaf8 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -5052,7 +5052,6 @@ Editor::toggle_region_lock ()
 	_session->commit_reversible_command ();
 }
 
-#ifdef WITH_VIDEOTIMELINE
 void
 Editor::toggle_region_video_lock ()
 {
@@ -5076,8 +5075,6 @@ Editor::toggle_region_video_lock ()
 
 	_session->commit_reversible_command ();
 }
-#endif
-
 
 void
 Editor::toggle_region_lock_style ()
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 76152208c3..2752f96553 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -131,9 +131,7 @@ Editor::initialize_rulers ()
 	lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START));
 	lab_children.push_back (Element(cd_mark_label, PACK_SHRINK, PACK_START));
 	lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START));
-#ifdef WITH_VIDEOTIMELINE
 	lab_children.push_back (Element(videotl_label, PACK_SHRINK, PACK_START));
-#endif
 
 	ruler_lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START));
 	ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START));
@@ -371,7 +369,6 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
 		ruler_items.push_back (SeparatorElem ());
 		break;
 
-#ifdef WITH_VIDEOTIMELINE
 	case VideoBarItem:
 		ruler_items.push_back (MenuElem (_("Timeline height")));
 		static_cast<MenuItem*>(&ruler_items.back())->set_sensitive(false);
@@ -395,7 +392,6 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
 
 		ruler_items.push_back (SeparatorElem ());
 		break;
-#endif
 
 	default:
 		break;
@@ -447,12 +443,10 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
 	if (action) {
 		ruler_items.push_back (MenuElem (*action->create_menu_item()));
 	}
-#ifdef WITH_VIDEOTIMELINE
 	action = ActionManager::get_action ("Rulers", "toggle-video-ruler");
 	if (action) {
 		ruler_items.push_back (MenuElem (*action->create_menu_item()));
 	}
-#endif
 
 	editor_ruler_menu->popup (1, gtk_get_current_event_time());
 
@@ -474,9 +468,7 @@ Editor::store_ruler_visibility ()
 	node->add_property (X_("rangemarker"), ruler_range_action->get_active() ? "yes": "no");
 	node->add_property (X_("transportmarker"), ruler_loop_punch_action->get_active() ? "yes": "no");
 	node->add_property (X_("cdmarker"), ruler_cd_marker_action->get_active() ? "yes": "no");
-#ifdef WITH_VIDEOTIMELINE
 	node->add_property (X_("videotl"), ruler_video_action->get_active() ? "yes": "no");
-#endif
 
 	_session->add_extra_xml (*node);
 	_session->set_dirty ();
@@ -577,7 +569,6 @@ Editor::restore_ruler_visibility ()
 			}
 		}
 
-#ifdef WITH_VIDEOTIMELINE
 		if ((prop = node->property ("videotl")) != 0) {
 			if (string_is_affirmative (prop->value())) {
 				ruler_video_action->set_active (true);
@@ -585,7 +576,6 @@ Editor::restore_ruler_visibility ()
 				ruler_video_action->set_active (false);
 			}
 		}
-#endif
 
 	}
 
@@ -652,9 +642,7 @@ Editor::update_ruler_visibility ()
 	transport_mark_label.hide();
 	cd_mark_label.hide();
 	mark_label.hide();
- #ifdef WITH_VIDEOTIMELINE
 	videotl_label.hide();
- #endif
 #endif
 	if (ruler_meter_action->get_active()) {
 		old_unit_pos = meter_group->property_y();
@@ -787,8 +775,6 @@ Editor::update_ruler_visibility ()
 		mark_label.hide();
 	}
 
-#ifdef WITH_VIDEOTIMELINE
-
 	if (ruler_video_action->get_active()) {
 		old_unit_pos = videotl_group->property_y();
 		if (tbpos != old_unit_pos) {
@@ -811,7 +797,6 @@ Editor::update_ruler_visibility ()
 		videotl_label.hide();
 	  update_video_timeline(true);
 	}
-#endif
 
 	gdouble old_canvas_timebars_vsize = canvas_timebars_vsize;
 	canvas_timebars_vsize = (timebar_height * visible_timebars) - 1;
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index fbe46a1ae9..e19afe375c 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1047,10 +1047,8 @@ Editor::sensitize_the_right_region_actions ()
 	bool have_midi = false;
 	bool have_locked = false;
 	bool have_unlocked = false;
-#ifdef WITH_VIDEOTIMELINE
 	bool have_video_locked = false;
 	bool have_video_unlocked = false;
-#endif
 	bool have_position_lock_style_audio = false;
 	bool have_position_lock_style_music = false;
 	bool have_muted = false;
@@ -1092,13 +1090,12 @@ Editor::sensitize_the_right_region_actions ()
 		} else {
 			have_unlocked = true;
 		}
-#ifdef WITH_VIDEOTIMELINE
+
 		if (r->video_locked()) {
 			have_video_locked = true;
 		} else {
 			have_video_unlocked = true;
 		}
-#endif
 
 		if (r->position_lock_style() == MusicTime) {
 			have_position_lock_style_music = true;
@@ -1223,13 +1220,11 @@ Editor::sensitize_the_right_region_actions ()
 		// a->set_inconsistent ();
 	}
 
-#ifdef WITH_VIDEOTIMELINE
 	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-video-lock"));
 	a->set_active (have_video_locked && !have_video_unlocked);
 	if (have_video_locked && have_video_unlocked) {
 		// a->set_inconsistent ();
 	}
-#endif
 
 	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"));
 	a->set_active (have_position_lock_style_music && !have_position_lock_style_audio);
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 564e3016e7..fa42211d19 100644
--- 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>
 
@@ -140,5 +139,3 @@ Editor::export_video ()
 	}
 #endif
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 03b64cfbe3..417f793f3a 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <string>
 #include <sstream>
@@ -966,5 +964,3 @@ ExportVideoDialog::open_invid_dialog ()
 		}
 	}
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h
index 72376512d1..2594c2073b 100644
--- a/gtk2_ardour/export_video_dialog.h
+++ b/gtk2_ardour/export_video_dialog.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __gtk_ardour_export_video_dialog_h__
 #define __gtk_ardour_export_video_dialog_h__
 
@@ -125,5 +123,3 @@ class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
 };
 
 #endif /* __gtk_ardour_export_video_dialog_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/export_video_infobox.cc b/gtk2_ardour/export_video_infobox.cc
index ab2363838e..a7508702c2 100644
--- a/gtk2_ardour/export_video_infobox.cc
+++ b/gtk2_ardour/export_video_infobox.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include "ardour/session.h"
 #include "export_video_infobox.h"
 #include "i18n.h"
@@ -65,12 +63,3 @@ ExportVideoInfobox::ExportVideoInfobox (Session* s)
 ExportVideoInfobox::~ExportVideoInfobox ()
 {
 }
-/*
-void
-ExportVideoInfobox::on_show ()
-{
-	Dialog::on_show ();
-}
-*/
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/export_video_infobox.h b/gtk2_ardour/export_video_infobox.h
index 20944b934c..6bd6c64533 100644
--- a/gtk2_ardour/export_video_infobox.h
+++ b/gtk2_ardour/export_video_infobox.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __gtk_ardour_export_video_infobox_h__
 #define __gtk_ardour_export_video_infobox_h__
 
@@ -45,5 +43,3 @@ class ExportVideoInfobox : public ArdourDialog
 };
 
 #endif /* __gtk_ardour_export_video_infobox_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index ce21b8a40d..c5bf8a006b 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -292,7 +292,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual framecnt_t get_nudge_distance (framepos_t pos, framecnt_t& next) = 0;
 	virtual Evoral::MusicalTime get_grid_type_as_beats (bool& success, framepos_t position) = 0;
 
-#ifdef WITH_VIDEOTIMELINE
 	virtual void queue_visual_videotimeline_update () = 0;
 	virtual void toggle_ruler_video (bool) = 0;
 	virtual void toggle_xjadeo_proc (int) = 0;
@@ -302,7 +301,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual void set_video_timeline_height (const int h) = 0;
 	virtual void embed_audio_from_video (std::string, framepos_t n = 0) = 0;
 	virtual void export_video () = 0;
-#endif
 
 #ifdef WITH_CMT
 	virtual void connect_to_image_compositor()  = 0;
@@ -348,9 +346,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0;
 	virtual bool canvas_stream_view_event (GdkEvent* event, ArdourCanvas::Item*, RouteTimeAxisView*) = 0;
 	virtual bool canvas_marker_event (GdkEvent* event, ArdourCanvas::Item*, Marker*) = 0;
-#ifdef WITH_VIDEOTIMELINE
 	virtual bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
-#endif
 	virtual bool canvas_zoom_rect_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
 	virtual bool canvas_tempo_marker_event (GdkEvent* event, ArdourCanvas::Item*, TempoMarker*) = 0;
 	virtual bool canvas_meter_marker_event (GdkEvent* event, ArdourCanvas::Item*, MeterMarker*) = 0;
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 2a79772bb9..676ebf8332 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -809,7 +809,6 @@ private:
         PBD::ScopedConnection protocol_status_connection;
 };
 
-#ifdef WITH_VIDEOTIMELINE
 class VideoTimelineOptions : public OptionEditorBox
 {
 public:
@@ -927,7 +926,6 @@ private:
 	CheckButton _show_video_server_dialog_button;
 	CheckButton _video_advanced_setup_button;
 };
-#endif
 
 /** A class which allows control of visibility of some editor components usign
  *  a VisibilityGroup.  The caller should pass in a `dummy' VisibilityGroup
@@ -1832,10 +1830,8 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("User interaction"), rm);
 
-#ifdef WITH_VIDEOTIMELINE
 	/* VIDEO Timeline */
 	add_option (_("Video"), new VideoTimelineOptions (_rc_config));
-#endif
 
 	/* INTERFACE */
 
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index dd99a5237b..3f20353ee5 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -386,12 +386,10 @@ RegionView::region_changed (const PropertyChange& what_changed)
 	if (what_changed.contains (ARDOUR::Properties::locked)) {
 		region_locked ();
 	}
-#ifdef WITH_VIDEOTIMELINE
 	if (what_changed.contains (ARDOUR::Properties::locked)) {
 		/* name will show locked status */
 		region_renamed ();
 	}
-#endif
 }
 
 void
@@ -584,12 +582,10 @@ RegionView::make_name () const
 		str += '{';
 		str += _region->name();
 		str += '}';
-#ifdef WITH_VIDEOTIMELINE
 	} else if (_region->video_locked()) {
 		str += '[';
 		str += _region->name();
 		str += ']';
-#endif
 	} else {
 		str = _region->name();
 	}
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index 229d376255..17f909a08a 100644
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -79,7 +79,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
 	add_option (_("Timecode"), _vpu);
 
-#ifdef WITH_VIDEOTIMELINE
 	add_option (_("Sync"), new BoolOption (
 			    "use-video-file-fps",
 			    _("Use Video File's FPS Instead of Timecode Value for Timeline and Video Monitor."),
@@ -93,7 +92,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_videotimeline_pullup),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_videotimeline_pullup)
 			    ));
-#endif
 
 	add_option (_("Timecode"), new OptionEditorHeading (_("Ext Timecode Offsets")));
 
diff --git a/gtk2_ardour/system_exec.cc b/gtk2_ardour/system_exec.cc
index 309f38b4da..1f178a6c68 100644
--- a/gtk2_ardour/system_exec.cc
+++ b/gtk2_ardour/system_exec.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -673,5 +671,3 @@ SystemExec::write_to_stdin(std::string d, size_t len)
 }
 
 #endif // end UNIX process
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/system_exec.h b/gtk2_ardour/system_exec.h
index 35123d4ccf..cf8518f547 100644
--- a/gtk2_ardour/system_exec.h
+++ b/gtk2_ardour/system_exec.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_system_exec_h__
 #define __ardour_system_exec_h__
 
@@ -201,4 +199,3 @@ class SystemExec
 };
 
 #endif /* __ardour_system_exec_h__ */
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 854b7def22..9cbc40564c 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <stdio.h>
 #include <string.h>
 #include <sstream>
@@ -563,5 +561,3 @@ TranscodeFfmpeg::ffmpegparse_v (std::string d, size_t /* s */)
 		Progress(f, m_duration); /* EMIT SIGNAL */
 	}
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/transcode_ffmpeg.h b/gtk2_ardour/transcode_ffmpeg.h
index b809719f01..932bfe051b 100644
--- a/gtk2_ardour/transcode_ffmpeg.h
+++ b/gtk2_ardour/transcode_ffmpeg.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_transcode_ffmpeg_h__
 #define __ardour_transcode_ffmpeg_h__
 
@@ -164,4 +162,3 @@ class TranscodeFfmpeg : public sigc::trackable
 };
 
 #endif /* __ardour_transcode_ffmpeg_h__ */
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index 5a29d129ae..5ac73a581b 100644
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <string>
 #include <sstream>
@@ -512,5 +510,3 @@ TranscodeVideoDialog::import_option() {
 	int i = video_combo.get_active_row_number();
 	return static_cast<VtlTranscodeOption>(i);
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/transcode_video_dialog.h b/gtk2_ardour/transcode_video_dialog.h
index 981079b3a8..eb2808e560 100644
--- a/gtk2_ardour/transcode_video_dialog.h
+++ b/gtk2_ardour/transcode_video_dialog.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __gtk_ardour_transcode_video_dialog_h__
 #define __gtk_ardour_transcode_video_dialog_h__
 
@@ -106,5 +104,3 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL
 };
 
 #endif /* __gtk_ardour_transcode_video_dialog_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc
index 93d5444902..b90abf7fb8 100644
--- a/gtk2_ardour/utils_videotl.cc
+++ b/gtk2_ardour/utils_videotl.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <string>
 #include <cerrno>
@@ -316,5 +314,3 @@ video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
 		if (n_channels>3) p[3] = 255;
 	}
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/utils_videotl.h b/gtk2_ardour/utils_videotl.h
index 08ab429e4c..913af2ab55 100644
--- a/gtk2_ardour/utils_videotl.h
+++ b/gtk2_ardour/utils_videotl.h
@@ -17,7 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
 /** @file utils_videotl.h
  *  @brief common functions used for video-file im/export
  */
@@ -55,5 +54,3 @@ bool video_query_info (
 		);
 
 #endif /* __gtk_ardour_video_utils_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc
index 4c8203f5a2..fda3d4e96c 100644
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <sigc++/bind.h>
 #include "ardour/tempo.h"
 
@@ -370,5 +368,3 @@ extern "C" {
 	}
 
 } /* end extern "C" */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index 2f384c3d8e..feeab37039 100644
--- a/gtk2_ardour/video_image_frame.h
+++ b/gtk2_ardour/video_image_frame.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_video_image_frame_h__
 #define __ardour_video_image_frame_h__
 
@@ -112,5 +110,3 @@ extern "C" {
 }
 
 #endif /* __ardour_video_image_frame_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 9bcd244cf0..550dd46816 100644
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include "pbd/file_utils.h"
 #include "gui_thread.h"
 #include "ardour_ui.h"
@@ -517,4 +515,3 @@ VideoMonitor::xjadeo_sync_setup ()
 		sync_by_manual_seek = my_manual_seek;
 	}
 }
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index 0f954e9cd5..59b90f5e46 100644
--- a/gtk2_ardour/video_monitor.h
+++ b/gtk2_ardour/video_monitor.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_video_monitor_h__
 #define __ardour_video_monitor_h__
 
@@ -114,5 +112,3 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 };
 
 #endif /* __ardour_video_monitor_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index ca70c11a0f..5ee4c02844 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <cmath>
 
@@ -216,5 +214,3 @@ std::string
 VideoServerDialog::get_docroot () {
 	return docroot_entry.get_text();
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_server_dialog.h b/gtk2_ardour/video_server_dialog.h
index fae0f06390..12635d9dca 100644
--- a/gtk2_ardour/video_server_dialog.h
+++ b/gtk2_ardour/video_server_dialog.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __gtk_ardour_video_server_dialog_h__
 #define __gtk_ardour_video_server_dialog_h__
 
@@ -68,5 +66,3 @@ class VideoServerDialog : public ArdourDialog
 };
 
 #endif /* __gtk_ardour_video_server_dialog_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 2953fd8277..d8913f27aa 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <algorithm>
 #include <sigc++/bind.h>
 #include "ardour/tempo.h"
@@ -803,5 +801,3 @@ VideoTimeLine::manual_seek_video_monitor (framepos_t pos)
 	if (!vmonitor->synced_by_manual_seeks()) { return; }
 	vmonitor->manual_seek(pos, false, GOFFSET); // XXX -> set offset in xjadeo
 }
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index b80faa3b27..3f7b7742d6 100644
--- a/gtk2_ardour/video_timeline.h
+++ b/gtk2_ardour/video_timeline.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_video_timeline_h__
 #define __ardour_video_timeline_h__
 
@@ -143,5 +141,3 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
 };
 
 #endif /* __ardour_video_timeline_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index d8dcf6d21f..02e163e3ee 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -242,7 +242,20 @@ gtk2_ardour_sources = [
         'visibility_group.cc',
         'volume_controller.cc',
         'waveview.cc',
-        'window_proxy.cc'
+        'window_proxy.cc',
+# video-timeline related sources:
+        'video_image_frame.cc',
+        'add_video_dialog.cc',
+        'editor_videotimeline.cc',
+        'video_timeline.cc',
+        'system_exec.cc',
+        'video_monitor.cc',
+        'transcode_ffmpeg.cc',
+        'transcode_video_dialog.cc',
+        'video_server_dialog.cc',
+        'utils_videotl.cc',
+        'export_video_dialog.cc',
+        'export_video_infobox.cc'
 ]
 
 def options(opt):
@@ -419,22 +432,6 @@ def build(bld):
         ]
     obj.includes += ['../libs']
 
-    if bld.env['VIDEOTIMELINE']:
-        obj.source += [
-            'video_image_frame.cc',
-            'add_video_dialog.cc',
-            'editor_videotimeline.cc',
-            'video_timeline.cc',
-            'system_exec.cc',
-            'video_monitor.cc',
-            'transcode_ffmpeg.cc',
-            'transcode_video_dialog.cc',
-            'video_server_dialog.cc',
-            'utils_videotl.cc',
-            'export_video_dialog.cc',
-            'export_video_infobox.cc'
-            ]
-
     if bld.is_defined('HAVE_SUIL'):
         obj.source += [ 'lv2_plugin_ui.cc' ]
         obj.use += [ 'SUIL' ]
@@ -655,8 +652,6 @@ def build(bld):
     else:
         menus_argv = [ '-E', '-P' ]
 
-    if bld.env['VIDEOTIMELINE']:
-        menus_argv.append ('-DWITH_VIDEOTIMELINE')
     obj = bld(features = 'command-output')
     obj.command = 'cpp'
     obj.command_is_external = True
@@ -664,7 +659,7 @@ def build(bld):
     obj.argv = menus_argv
     obj.stdin = 'ardour.menus.in'
     obj.stdout = 'ardour.menus'
-    obj.dep_vars = ['GTKOSX', 'VIDEOTIMELINE']
+    obj.dep_vars = ['GTKOSX']
     bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'),
                       'ardour.menus')
 
diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h
index 1f9c48eba3..9f7c778d33 100644
--- a/libs/ardour/ardour/directory_names.h
+++ b/libs/ardour/ardour/directory_names.h
@@ -27,9 +27,7 @@ extern const char* const old_sound_dir_name;
 extern const char* const sound_dir_name;
 extern const char* const midi_dir_name;
 extern const char* const midi_patch_dir_name;
-#ifdef WITH_VIDEOTIMELINE
 extern const char* const video_dir_name;
-#endif
 extern const char* const dead_dir_name;
 extern const char* const interchange_dir_name;
 extern const char* const peak_dir_name;
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index f1a7e9c428..f19f8fe808 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -216,10 +216,9 @@ CONFIG_VARIABLE (std::string, reference_manual_url, "reference-manual-url", "htt
 CONFIG_VARIABLE (std::string, updates_url, "updates-url", "http://ardour.org/whatsnew.html")
 CONFIG_VARIABLE (std::string, donate_url, "donate-url", "http://ardour.org/donate")
 
-#ifdef WITH_VIDEOTIMELINE
+/* video timeline configuration */
 CONFIG_VARIABLE (bool, video_advanced_setup, "video-advanced-setup", false)
 CONFIG_VARIABLE (std::string, video_server_url, "video-server-url", "http://localhost:1554")
 CONFIG_VARIABLE (std::string, video_server_docroot, "video-server-docroot", "/")
 CONFIG_VARIABLE (bool, show_video_export_info, "show-video-export-info", true)
 CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", false)
-#endif
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index eaa23cc8f6..3ee829ed12 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -45,9 +45,7 @@ namespace Properties {
 	extern PBD::PropertyDescriptor<bool>              muted;
 	extern PBD::PropertyDescriptor<bool>              opaque;
 	extern PBD::PropertyDescriptor<bool>              locked;
-#ifdef WITH_VIDEOTIMELINE
 	extern PBD::PropertyDescriptor<bool>              video_locked;
-#endif
 	extern PBD::PropertyDescriptor<bool>              automatic;
 	extern PBD::PropertyDescriptor<bool>              whole_file;
 	extern PBD::PropertyDescriptor<bool>              import;
@@ -166,9 +164,7 @@ class Region
 	bool opaque ()           const { return _opaque; }
 	bool locked ()           const { return _locked; }
 	bool position_locked ()  const { return _position_locked; }
-#ifdef WITH_VIDEOTIMELINE
 	bool video_locked ()     const { return _video_locked; }
-#endif
 	bool valid_transients () const { return _valid_transients; }
 	bool automatic ()        const { return _automatic; }
 	bool whole_file ()       const { return _whole_file; }
@@ -246,9 +242,7 @@ class Region
 	void set_automatic (bool yn);
 	void set_opaque (bool yn);
 	void set_locked (bool yn);
-#ifdef WITH_VIDEOTIMELINE
 	void set_video_locked (bool yn);
-#endif
 	void set_position_locked (bool yn);
 
 	int apply (Filter &, Progress* progress = 0);
@@ -401,9 +395,7 @@ class Region
 	PBD::Property<bool>        _muted;
 	PBD::Property<bool>        _opaque;
 	PBD::Property<bool>        _locked;
-#ifdef WITH_VIDEOTIMELINE
 	PBD::Property<bool>        _video_locked;
-#endif
 	PBD::Property<bool>        _automatic;
 	PBD::Property<bool>        _whole_file;
 	PBD::Property<bool>        _import;
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index cce4bf86d7..9def8f3aad 100644
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -55,7 +55,5 @@ CONFIG_VARIABLE (std::string, timecode_generator_offset, "timecode-generator-off
 CONFIG_VARIABLE (bool, glue_new_markers_to_bars_and_beats, "glue-new-markers-to-bars-and-beats", false)
 CONFIG_VARIABLE (bool, midi_copy_is_fork, "midi-copy-is-fork", false)
 CONFIG_VARIABLE (bool, glue_new_regions_to_bars_and_beats, "glue-new-regions-to-bars-and-beats", false)
-#ifdef WITH_VIDEOTIMELINE
 CONFIG_VARIABLE (bool, use_video_file_fps, "use-video-file-fps", false)
 CONFIG_VARIABLE (bool, videotimeline_pullup, "videotimeline-pullup", true)
-#endif
diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h
index 72bc731a01..a4c372d6ed 100644
--- a/libs/ardour/ardour/session_directory.h
+++ b/libs/ardour/ardour/session_directory.h
@@ -85,13 +85,11 @@ public:
 	 */
 	const std::string peak_path () const;
 
-#ifdef WITH_VIDEOTIMELINE
 	/**
 	 * @return The absolute path to the directory in which all
 	 * video files are stored for a session.
 	 */
 	const std::string video_path () const;
-#endif
 
 	/**
 	 * @return The absolute path to the directory that source
diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index b500fdc193..0632c6f8f2 100644
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -27,9 +27,7 @@ const char* const old_sound_dir_name = X_("sounds");
 const char* const sound_dir_name = X_("audiofiles");
 const char* const midi_dir_name = X_("midifiles");
 const char* const midi_patch_dir_name = X_("patchfiles");
-#ifdef WITH_VIDEOTIMELINE
 const char* const video_dir_name = X_("videofiles");
-#endif
 const char* const peak_dir_name = X_("peaks");
 const char* const dead_dir_name = X_("dead");
 const char* const interchange_dir_name = X_("interchange");
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index cc57e774c8..706dda4a0a 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -49,9 +49,7 @@ namespace ARDOUR {
 		PBD::PropertyDescriptor<bool> muted;
 		PBD::PropertyDescriptor<bool> opaque;
 		PBD::PropertyDescriptor<bool> locked;
-#ifdef WITH_VIDEOTIMELINE
 		PBD::PropertyDescriptor<bool> video_locked;
-#endif
 		PBD::PropertyDescriptor<bool> automatic;
 		PBD::PropertyDescriptor<bool> whole_file;
 		PBD::PropertyDescriptor<bool> import;
@@ -87,10 +85,8 @@ Region::make_property_quarks ()
 	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for opaque = %1\n", 	Properties::opaque.property_id));
 	Properties::locked.property_id = g_quark_from_static_string (X_("locked"));
 	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for locked = %1\n", 	Properties::locked.property_id));
-#ifdef WITH_VIDEOTIMELINE
 	Properties::video_locked.property_id = g_quark_from_static_string (X_("video-locked"));
 	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for video-locked = %1\n", 	Properties::video_locked.property_id));
-#endif
 	Properties::automatic.property_id = g_quark_from_static_string (X_("automatic"));
 	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for automatic = %1\n", 	Properties::automatic.property_id));
 	Properties::whole_file.property_id = g_quark_from_static_string (X_("whole-file"));
@@ -143,9 +139,7 @@ Region::register_properties ()
 	add_property (_muted);
 	add_property (_opaque);
 	add_property (_locked);
-#ifdef WITH_VIDEOTIMELINE
 	add_property (_video_locked);
-#endif
 	add_property (_automatic);
 	add_property (_whole_file);
 	add_property (_import);
@@ -167,13 +161,6 @@ Region::register_properties ()
 	add_property (_position_lock_style);
 	add_property (_layering_index);
 }
-#ifdef WITH_VIDEOTIMELINE
-#define VTLSTATE	, _video_locked (Properties::video_locked, false)
-#define VTLCSTATE	, _video_locked (Properties::video_locked, other->_video_locked)
-#else
-#define VTLSTATE
-#define VTLCSTATE
-#endif
 
 #define REGION_DEFAULT_STATE(s,l) \
 	_sync_marked (Properties::sync_marked, false) \
@@ -187,7 +174,7 @@ Region::register_properties ()
 	, _muted (Properties::muted, false) \
 	, _opaque (Properties::opaque, true) \
 	, _locked (Properties::locked, false) \
-  VTLSTATE \
+  , _video_locked (Properties::video_locked, false) \
 	, _automatic (Properties::automatic, false) \
 	, _whole_file (Properties::whole_file, false) \
 	, _import (Properties::import, false) \
@@ -213,7 +200,7 @@ Region::register_properties ()
         , _muted (Properties::muted, other->_muted)	        \
 	, _opaque (Properties::opaque, other->_opaque)		\
 	, _locked (Properties::locked, other->_locked)		\
-  VTLCSTATE \
+  , _video_locked (Properties::video_locked, other->_video_locked) \
 	, _automatic (Properties::automatic, other->_automatic)	\
 	, _whole_file (Properties::whole_file, other->_whole_file) \
 	, _import (Properties::import, other->_import)		\
@@ -646,11 +633,7 @@ Region::recompute_position_from_lock_style ()
 void
 Region::nudge_position (frameoffset_t n)
 {
-	if (locked()
-#ifdef WITH_VIDEOTIMELINE
-			|| video_locked()
-#endif
-			) {
+	if (locked() || video_locked()) {
 		return;
 	}
 
@@ -691,11 +674,7 @@ Region::set_ancestral_data (framepos_t s, framecnt_t l, float st, float sh)
 void
 Region::set_start (framepos_t pos)
 {
-	if (locked() || position_locked()
-#ifdef WITH_VIDEOTIMELINE
-			|| video_locked()
-#endif
-			) {
+	if (locked() || position_locked() || video_locked()) {
 		return;
 	}
 	/* This just sets the start, nothing else. It effectively shifts
@@ -721,11 +700,7 @@ Region::set_start (framepos_t pos)
 void
 Region::trim_start (framepos_t new_position)
 {
-	if (locked() || position_locked()
-#ifdef WITH_VIDEOTIMELINE
-			|| video_locked()
-#endif
-			) {
+	if (locked() || position_locked() || video_locked()) {
 		return;
 	}
 
@@ -1010,7 +985,6 @@ Region::set_locked (bool yn)
 	}
 }
 
-#ifdef WITH_VIDEOTIMELINE
 void
 Region::set_video_locked (bool yn)
 {
@@ -1019,7 +993,6 @@ Region::set_video_locked (bool yn)
 		send_change (Properties::video_locked);
 	}
 }
-#endif
 
 void
 Region::set_position_locked (bool yn)
diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc
index 61b313f6b3..9d0be414da 100644
--- a/libs/ardour/session_directory.cc
+++ b/libs/ardour/session_directory.cc
@@ -145,13 +145,11 @@ SessionDirectory::midi_patch_path () const
 	return Glib::build_filename (sources_root(), midi_patch_dir_name);
 }
 
-#ifdef WITH_VIDEOTIMELINE
 const std::string
 SessionDirectory::video_path () const
 {
 	return Glib::build_filename (sources_root(), video_dir_name);
 }
-#endif
 
 const std::string
 SessionDirectory::peak_path () const
diff --git a/wscript b/wscript
index 433f1a6f3c..99e4a9ccc4 100644
--- a/wscript
+++ b/wscript
@@ -409,8 +409,6 @@ def options(opt):
                    help='Build internal libs as shared libraries')
     opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs',
                    help='Build internal libs as static libraries')
-    opt.add_option('--videotimeline', action='store_true', default=False, dest='videotimeline',
-                    help='Compile with support for video-timeline')
     opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
                     help='Compile with support for LV2 (if Lilv+Suil is available)')
     opt.add_option('--no-lv2', action='store_false', dest='lv2',
@@ -632,9 +630,6 @@ def configure(conf):
         conf.env['BUILD_TESTS'] = opts.build_tests
     #if opts.tranzport:
     #    conf.env['TRANZPORT'] = 1
-    if opts.videotimeline:
-        conf.define('WITH_VIDEOTIMELINE',1)
-        conf.env['VIDEOTIMELINE'] = 1
     if opts.windows_vst:
         conf.define('WINDOWS_VST_SUPPORT', 1)
         conf.env['WINDOWS_VST_SUPPORT'] = True
@@ -713,7 +708,6 @@ const char* const ardour_config_info = "\\n\\
 #    write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.env['BUILD_TESTS'])
     write_config_text('Universal binary',      opts.universal)
-    write_config_text('Videotimeline',         opts.videotimeline)
     write_config_text('Generic x86 CPU',       opts.generic)
     write_config_text('Windows VST support',   opts.windows_vst)
     write_config_text('Wiimote support',       conf.is_defined('BUILD_WIIMOTE'))