the endless quest to plug memory leaks -- episode 379

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 605a7857358407d0a2b999b3d873136658190b46..757b767b7ed338897c0b33b0e85578b5abc1d21d 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -139,7 +139,7 @@
 #include "vca_time_axis.h"
 #include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -805,9 +805,11 @@ Editor::Editor ()
        ControlProtocol::VerticalZoomInSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_in_selected, this), gui_context());
        ControlProtocol::VerticalZoomOutSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_out_selected, this), gui_context());
 
-       ControlProtocol::AddStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
-       ControlProtocol::ToggleStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
+       ControlProtocol::AddStripableToSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
+       ControlProtocol::RemoveStripableFromSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
        ControlProtocol::SetStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Set), gui_context());
+       ControlProtocol::ToggleStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
+       ControlProtocol::ClearStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_unselect, this), gui_context());
 
        BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context());
 
@@ -859,12 +861,13 @@ Editor::Editor ()
 
 Editor::~Editor()
 {
-        delete button_bindings;
+       delete button_bindings;
        delete _routes;
        delete _route_groups;
        delete _track_canvas_viewport;
        delete _drags;
        delete nudge_clock;
+       delete _verbose_cursor;
        delete quantize_dialog;
        delete _summary;
        delete _group_tabs;
@@ -1011,27 +1014,9 @@ Editor::control_unselect ()
 }
 
 void
-Editor::control_select (PresentationInfo::order_t order, Selection::Operation op)
+Editor::control_select (boost::shared_ptr<Stripable> s, Selection::Operation op)
 {
-       /* handles the (static) signal from the ControlProtocol class that
-        * requests setting the selected track to a given RID
-        */
-
-       if (!_session) {
-               return;
-       }
-
-       boost::shared_ptr<Stripable> s = _session->get_nth_stripable (order);
-
-       /* selected object may not be a Route */
-
-       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
-
-       if (!r) {
-               return;
-       }
-
-       TimeAxisView* tav = axis_view_from_route (r);
+       TimeAxisView* tav = axis_view_from_stripable (s);
 
        if (tav) {
                switch (op) {
@@ -1422,6 +1407,25 @@ Editor::set_session (Session *t)
                break;
        }
 
+       /* catch up on selection of stripables (other selection state is lost
+        * when a session is closed
+        */
+
+       StripableList sl;
+       TrackViewList tl;
+       _session->get_stripables (sl);
+       for (StripableList::const_iterator s = sl.begin(); s != sl.end(); ++s) {
+               if ((*s)->presentation_info().selected()) {
+                       RouteTimeAxisView* rtav = get_route_view_by_route_id ((*s)->id());
+                       if (rtav) {
+                               tl.push_back (rtav);
+                       }
+               }
+       }
+       if (!tl.empty()) {
+               selection->set (tl);
+       }
+
        /* register for undo history */
        _session->register_with_memento_command_factory(id(), this);
        _session->register_with_memento_command_factory(_selection_memento->id(), _selection_memento);
@@ -4410,7 +4414,7 @@ Editor::current_visual_state (bool with_tracks)
        vs->zoom_focus = zoom_focus;
 
        if (with_tracks) {
-               *vs->gui_state = *ARDOUR_UI::instance()->gui_object_state;
+               vs->gui_state->set_state (ARDOUR_UI::instance()->gui_object_state->get_state());
        }
 
        return vs;
@@ -4475,7 +4479,7 @@ Editor::use_visual_state (VisualState& vs)
        reposition_and_zoom (vs.leftmost_frame, vs.samples_per_pixel);
 
        if (vs.gui_state) {
-               *ARDOUR_UI::instance()->gui_object_state = *vs.gui_state;
+               ARDOUR_UI::instance()->gui_object_state->set_state (vs.gui_state->get_state());
 
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        (*i)->clear_property_cache();
@@ -5046,7 +5050,7 @@ Editor::first_idle ()
                        true
                        );
                dialog->present ();
-               ARDOUR_UI::instance()->flush_pending ();
+               ARDOUR_UI::instance()->flush_pending (60);
        }
 
        for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
@@ -5182,16 +5186,13 @@ Editor::region_view_removed ()
        _summary->set_background_dirty ();
 }
 
-RouteTimeAxisView*
-Editor::axis_view_from_route (boost::shared_ptr<Route> r) const
+TimeAxisView*
+Editor::axis_view_from_stripable (boost::shared_ptr<Stripable> s) const
 {
-       TrackViewList::const_iterator j = track_views.begin ();
-       while (j != track_views.end()) {
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*j);
-               if (rtv && rtv->route() == r) {
-                       return rtv;
+       for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) {
+               if ((*j)->stripable() == s) {
+                       return *j;
                }
-               ++j;
        }
 
        return 0;
@@ -5204,7 +5205,7 @@ Editor::axis_views_from_routes (boost::shared_ptr<RouteList> r) const
        TrackViewList t;
 
        for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
-               TimeAxisView* tv = axis_view_from_route (*i);
+               TimeAxisView* tv = axis_view_from_stripable (*i);
                if (tv) {
                        t.push_back (tv);
                }