summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-04-11 19:49:29 +0200
committerRobin Gareus <robin@gareus.org>2013-04-11 19:49:48 +0200
commit66ee2c8e597ca9a07d614cf56b4002e5303e3645 (patch)
tree9131785c3f5d4b419f127f9f6726b820d8de4fae /gtk2_ardour/editor.cc
parentb7c617b0578ec7e8d75dcd604c316459d6ac0708 (diff)
enable videotimeline by default
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc11
1 files changed, 1 insertions, 10 deletions
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 ();