add Group::clear(), do not clear _canvas member of Item when unparented (only the...

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 04f4f514fd72ac8945ffaf1f30a84d636cc830d5..d458b41b840505249265d110080e810839e99387 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -371,11 +371,11 @@ Editor::Editor ()
 
        sfbrowser = 0;
 
-       location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
-       location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
-       location_cd_marker_color = ARDOUR_UI::config()->canvasvar_LocationCDMarker.get();
-       location_loop_color = ARDOUR_UI::config()->canvasvar_LocationLoop.get();
-       location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
+       location_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationMarker();
+       location_range_color = ARDOUR_UI::config()->get_canvasvar_LocationRange();
+       location_cd_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationCDMarker();
+       location_loop_color = ARDOUR_UI::config()->get_canvasvar_LocationLoop();
+       location_punch_color = ARDOUR_UI::config()->get_canvasvar_LocationPunch();
 
        _edit_point = EditAtMouse;
        _internal_editing = false;
@@ -3725,8 +3725,14 @@ Editor::set_show_measures (bool yn)
                        if (tempo_lines) {
                                tempo_lines->show();
                        }
-                       (void) redraw_measures ();
+
+                       ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+                       ARDOUR::TempoMap::BBTPointList::const_iterator end;
+                       
+                       compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_samples(), begin, end);
+                       draw_measures (begin, end);
                }
+
                instant_save ();
        }
 }
@@ -5528,12 +5534,3 @@ Editor::shift_key_released ()
 {
        _stepping_axis_view = 0;
 }
-
-
-void
-Editor::save_canvas_state ()
-{
-       XMLTree* tree = static_cast<ArdourCanvas::Canvas*>(_track_canvas)->get_state ();
-       string path = string_compose ("%1/canvas-state.xml", _session->path());
-       tree->write (path);
-}