merge with master

[ardour.git] / gtk2_ardour / editor_canvas.cc

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index ac4c845dd6756771a90678910c0aaa2cefcad928..d0ad6d68d39db8524196f9e945dbe278dbd13478 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -107,56 +107,66 @@ Editor::initialize_canvas ()
        CANVAS_DEBUG_NAME (_region_motion_group, "Canvas Region Motion");
 
        meter_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
-       meter_bar = new ArdourCanvas::Rectangle (meter_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1));
+       meter_bar = new ArdourCanvas::Rectangle (meter_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height));
        CANVAS_DEBUG_NAME (meter_bar, "meter Bar");
-       meter_bar->set_outline_what (0x8);
+       meter_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
 
        tempo_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
-       tempo_bar = new ArdourCanvas::Rectangle (tempo_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1));
+       tempo_bar = new ArdourCanvas::Rectangle (tempo_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height));
        CANVAS_DEBUG_NAME (tempo_bar, "Tempo  Bar");
-       tempo_bar->set_outline_what (0x8);
+       tempo_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
 
        range_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
-       range_marker_bar = new ArdourCanvas::Rectangle (range_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1));
+       range_marker_bar = new ArdourCanvas::Rectangle (range_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height));
        CANVAS_DEBUG_NAME (range_marker_bar, "Range Marker Bar");
-       range_marker_bar->set_outline_what (0x8);
+       range_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
 
        transport_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
-       transport_marker_bar = new ArdourCanvas::Rectangle (transport_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1));
+       transport_marker_bar = new ArdourCanvas::Rectangle (transport_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height));
        CANVAS_DEBUG_NAME (transport_marker_bar, "transport Marker Bar");
-       transport_marker_bar->set_outline_what (0x8);
+       transport_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
 
        marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
-       marker_bar = new ArdourCanvas::Rectangle (marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1));
+       marker_bar = new ArdourCanvas::Rectangle (marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height));
        CANVAS_DEBUG_NAME (marker_bar, "Marker Bar");
-       marker_bar->set_outline_what (0x8);
+       marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
 
        cd_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
-       cd_marker_bar = new ArdourCanvas::Rectangle (cd_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1));
+       cd_marker_bar = new ArdourCanvas::Rectangle (cd_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height));
        CANVAS_DEBUG_NAME (cd_marker_bar, "CD Marker Bar");
-       cd_marker_bar->set_outline_what (0x8);
-
+       cd_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
+       
        _time_markers_group = new ArdourCanvas::Group (_time_bars_canvas->root());
 
        meter_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height * 5.0));
+       CANVAS_DEBUG_NAME (meter_group, "meter group");
        tempo_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height * 4.0));
+       CANVAS_DEBUG_NAME (tempo_group, "tempo group");
        range_marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height * 3.0));
+       CANVAS_DEBUG_NAME (range_marker_group, "range marker group");
        transport_marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height * 2.0));
+       CANVAS_DEBUG_NAME (transport_marker_group, "transport marker group");
        marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height));
+       CANVAS_DEBUG_NAME (marker_group, "marker group");
        cd_marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0));
+       CANVAS_DEBUG_NAME (cd_marker_group, "cd marker group");
        videotl_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple(0.0, 0.0));
+       CANVAS_DEBUG_NAME (videotl_group, "videotl group");
 
        ARDOUR_UI::instance()->video_timeline = new VideoTimeLine(this, videotl_group, (timebar_height * videotl_bar_height));
 
        cd_marker_bar_drag_rect = new ArdourCanvas::Rectangle (cd_marker_group, ArdourCanvas::Rect (0.0, 0.0, 100, timebar_height));
+       CANVAS_DEBUG_NAME (cd_marker_bar_drag_rect, "cd marker drag");
        cd_marker_bar_drag_rect->set_outline (false);
        cd_marker_bar_drag_rect->hide ();
 
        range_bar_drag_rect = new ArdourCanvas::Rectangle (range_marker_group, ArdourCanvas::Rect (0.0, 0.0, 100, timebar_height));
+       CANVAS_DEBUG_NAME (range_bar_drag_rect, "range drag");
        range_bar_drag_rect->set_outline (false);
        range_bar_drag_rect->hide ();
 
        transport_bar_drag_rect = new ArdourCanvas::Rectangle (transport_marker_group, ArdourCanvas::Rect (0.0, 0.0, 100, timebar_height));
+       CANVAS_DEBUG_NAME (transport_bar_drag_rect, "transport drag");
        transport_bar_drag_rect->set_outline (false);
        transport_bar_drag_rect->hide ();
 
@@ -655,7 +665,7 @@ Editor::start_canvas_autoscroll (int dx, int dy)
        autoscroll_x = dx;
        autoscroll_y = dy;
        autoscroll_x_distance = (framepos_t) floor (current_page_samples()/50.0);
-       autoscroll_y_distance = fabs (dy * 5); /* pixels */
+       autoscroll_y_distance = fabs ((double)dy * 5); /* pixels */
        autoscroll_cnt = 0;
 
        /* do it right now, which will start the repeated callbacks */