vtl: get rid of unused "bar" inside the ruler

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 8ebda32372e8b029bf19babd7779c532372ca4c8..768e524e3aaaaaf39773da135fc60b01b39c5d21 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -893,7 +893,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        Gtk::Label  cd_mark_label;
 
        /* videtimline related actions */
-       ArdourCanvas::Rectangle*  videotl_bar;
        Gtk::Label                videotl_label;
        ArdourCanvas::Group*      videotl_group;
        Glib::RefPtr<Gtk::ToggleAction> ruler_video_action;

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 229989810baea2e8b9976e1258e235d11783fcde..a1d378037472ddf838f672511d9f938a8933aba7 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -145,7 +145,6 @@ Editor::initialize_canvas ()
        cd_marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0));
        videotl_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple(0.0, 0.0));
 
-       videotl_bar = new ArdourCanvas::Rectangle (videotl_group, ArdourCanvas::Rect (0.0, 0.0, 100,(timebar_height * videotl_bar_height)));
        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));
@@ -191,7 +190,7 @@ Editor::initialize_canvas ()
        meter_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
        marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
        cd_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
-       videotl_group->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_bar));
+       videotl_group->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_group));
        range_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
        transport_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
 
@@ -772,9 +771,6 @@ Editor::color_handler()
        cd_marker_bar->set_fill_color (ARDOUR_UI::config()->canvasvar_CDMarkerBar.get());
        cd_marker_bar->set_outline_color (ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get());
 
-       videotl_bar->set_fill_color (ARDOUR_UI::config()->canvasvar_VideoBar.get());
-       videotl_bar->set_outline_color (ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get());
-
        range_marker_bar->set_fill_color (ARDOUR_UI::config()->canvasvar_RangeMarkerBar.get());
        range_marker_bar->set_outline_color (ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get());
 

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 04741b09debdab174c5c38d402407206bf9a8a5c..dabbded508feef214f13fca13eb6b0815731614d 100644 (file)
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -45,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->set_y1(nh);
        ARDOUR_UI::instance()->video_timeline->set_height(videotl_bar_height * timebar_height);
        update_ruler_visibility();
 }