the endless quest to plug memory leaks -- episode 379

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index d869442b836751eb1d7f2a50772b683090147e6f..757b767b7ed338897c0b33b0e85578b5abc1d21d 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -861,12 +861,13 @@ Editor::Editor ()
 
 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 _routes;
        delete _route_groups;
        delete _track_canvas_viewport;
        delete _drags;
        delete nudge_clock;

+       delete _verbose_cursor;

        delete quantize_dialog;
        delete _summary;
        delete _group_tabs;
        delete quantize_dialog;
        delete _summary;
        delete _group_tabs;

diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc
index 7c4898056fc530d5bda9b085a8be13649008bb24..c813eeea63dafca66b860c9d1d6da6f9e255fe8f 100644 (file)
--- a/gtk2_ardour/luainstance.cc
+++ b/gtk2_ardour/luainstance.cc
@@ -1646,11 +1646,13 @@ LuaCallback::set_session (ARDOUR::Session *s)
 {
        SessionHandlePtr::set_session (s);
 
 {
        SessionHandlePtr::set_session (s);
 

-       if (_session) {
-               lua_State* L = lua.getState();
-               LuaBindings::set_session (L, _session);
+       if (!_session) {
+               return;

        }
 
        }
 

+       lua_State* L = lua.getState();
+       LuaBindings::set_session (L, _session);
+

        reconnect();
 }
 
        reconnect();
 }
 


@@ -1664,6 +1666,10 @@ LuaCallback::session_going_away ()
        _session = 0;
 
        drop_callback (); /* EMIT SIGNAL */
        _session = 0;
 
        drop_callback (); /* EMIT SIGNAL */

+
+       lua_State* L = lua.getState();
+       LuaBindings::set_session (L, 0);
+       lua.do_command ("collectgarbage();");

 }
 
 void
 }
 
 void

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 312c98bbf9cbeca35da4d19c126652fadbd11ee8..87c0c06ab20d260ff23f069505ab6bc6d4d324ab 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -198,7 +198,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g
 
        case SessionEnd:
        case RangeEnd:
 
        case SessionEnd:
        case RangeEnd:

-               points = new ArdourCanvas::Points ();
+               points = new ArdourCanvas::Points (); // leaks

                points->push_back (ArdourCanvas::Duple ( M6, 0.0));
                points->push_back (ArdourCanvas::Duple ( M6, MH));
                points->push_back (ArdourCanvas::Duple (0.0, MH * .5));
                points->push_back (ArdourCanvas::Duple ( M6, 0.0));
                points->push_back (ArdourCanvas::Duple ( M6, MH));
                points->push_back (ArdourCanvas::Duple (0.0, MH * .5));


@@ -316,6 +316,7 @@ ArdourMarker::~ArdourMarker ()
        /* destroying the parent group destroys its contents, namely any polygons etc. that we added */
        delete group;
        delete _track_canvas_line;
        /* destroying the parent group destroys its contents, namely any polygons etc. that we added */
        delete group;
        delete _track_canvas_line;

+       delete points;

 }
 
 void ArdourMarker::reparent(ArdourCanvas::Container & parent)
 }
 
 void ArdourMarker::reparent(ArdourCanvas::Container & parent)


@@ -543,6 +544,7 @@ TempoMarker::update_height_mark (const double& ratio)
        const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale()));
        const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale()));
 
        const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale()));
        const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale()));
 

+       delete points;

        points = new ArdourCanvas::Points ();
        points->push_back (ArdourCanvas::Duple ( M3, top));
        points->push_back (ArdourCanvas::Duple ( M6, min (top + (MH * .6), MH)));
        points = new ArdourCanvas::Points ();
        points->push_back (ArdourCanvas::Duple ( M3, top));
        points->push_back (ArdourCanvas::Duple ( M6, min (top + (MH * .6), MH)));

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e06355637e9251afd3d61a13fead54137ed31b52..3f2f39d0cdc59d5e3aadc7f1a9e149e665eb2d13 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -85,7 +85,9 @@ boost::weak_ptr<Route> RouteUI::_showing_sends_to;
 std::string RouteUI::program_port_prefix;
 
 RouteUI::RouteUI (ARDOUR::Session* sess)
 std::string RouteUI::program_port_prefix;
 
 RouteUI::RouteUI (ARDOUR::Session* sess)

-       : mute_menu(0)
+       : monitor_input_button (0)
+       , monitor_disk_button (0)
+       , mute_menu(0)

        , solo_menu(0)
        , sends_menu(0)
        , record_menu(0)
        , solo_menu(0)
        , sends_menu(0)
        , record_menu(0)


@@ -123,6 +125,8 @@ RouteUI::~RouteUI()
        delete comment_window;
        delete input_selector;
        delete output_selector;
        delete comment_window;
        delete input_selector;
        delete output_selector;

+       delete monitor_input_button;
+       delete monitor_disk_button;

        delete _invert_menu;
 
        send_blink_connection.disconnect ();
        delete _invert_menu;
 
        send_blink_connection.disconnect ();


@@ -182,13 +186,13 @@ RouteUI::init ()
        show_sends_button->set_name ("send alert button");
        UI::instance()->set_tip (show_sends_button, _("make mixer strips show sends to this bus"), "");
 
        show_sends_button->set_name ("send alert button");
        UI::instance()->set_tip (show_sends_button, _("make mixer strips show sends to this bus"), "");
 

-       monitor_input_button = manage (new ArdourButton (ArdourButton::default_elements));
+       monitor_input_button = new ArdourButton (ArdourButton::default_elements);

        monitor_input_button->set_name ("monitor button");
        monitor_input_button->set_text (_("In"));
        UI::instance()->set_tip (monitor_input_button, _("Monitor input"), "");
        monitor_input_button->set_no_show_all (true);
 
        monitor_input_button->set_name ("monitor button");
        monitor_input_button->set_text (_("In"));
        UI::instance()->set_tip (monitor_input_button, _("Monitor input"), "");
        monitor_input_button->set_no_show_all (true);
 

-       monitor_disk_button = manage (new ArdourButton (ArdourButton::default_elements));
+       monitor_disk_button = new ArdourButton (ArdourButton::default_elements);

        monitor_disk_button->set_name ("monitor button");
        monitor_disk_button->set_text (_("Disk"));
        UI::instance()->set_tip (monitor_disk_button, _("Monitor playback"), "");
        monitor_disk_button->set_name ("monitor button");
        monitor_disk_button->set_text (_("Disk"));
        UI::instance()->set_tip (monitor_disk_button, _("Monitor playback"), "");

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 938ba08c51fe3a35f9a51ba094082b686514ce83..2f933a989ac307fdc37d6cd8a99bc786f55e3f97 100644 (file)
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -104,6 +104,7 @@ ShuttleControl::~ShuttleControl ()
 {
        cairo_pattern_destroy (pattern);
        cairo_pattern_destroy (shine_pattern);
 {
        cairo_pattern_destroy (pattern);
        cairo_pattern_destroy (shine_pattern);

+       delete text_color;

 }
 
 void
 }
 
 void

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 8ddc2e51ca6faa11757bfd09924b29ef13831a80..540dddcb3df715b7d1bc9008b323bf08206d9dce 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -929,6 +929,8 @@ TimeAxisView::order_selection_trims (ArdourCanvas::Item *item, bool put_start_on
        }
 }
 
        }
 }
 

+// retuned rect is pushed back into the used_selection_rects list
+// in TimeAxisView::show_selection() which is the only caller.

 SelectionRect *
 TimeAxisView::get_selection_rect (uint32_t id)
 {
 SelectionRect *
 TimeAxisView::get_selection_rect (uint32_t id)
 {


@@ -938,7 +940,9 @@ TimeAxisView::get_selection_rect (uint32_t id)
 
        for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
                if ((*i)->id == id) {
 
        for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
                if ((*i)->id == id) {

-                       return (*i);
+                       SelectionRect* ret = (*i);
+                       used_selection_rects.erase (i);
+                       return ret;

                }
        }
 
                }
        }
 

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index e4e30fdc4f4726b02d8204a832856e57a793e1b6..f33379e4d63bc2660150b1d5a69f11d24721bf49 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -219,8 +219,6 @@ class TimeAxisView : public virtual AxisView
        typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
        Children get_child_list ();
 
        typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
        Children get_child_list ();
 

-       SelectionRect* get_selection_rect(uint32_t id);
-

        static uint32_t preset_height (Height);
 
        protected:
        static uint32_t preset_height (Height);
 
        protected:


@@ -320,6 +318,8 @@ class TimeAxisView : public virtual AxisView
        static uint32_t extra_height;
        static int const _max_order;
 
        static uint32_t extra_height;
        static int const _max_order;
 

+       SelectionRect* get_selection_rect(uint32_t id);
+

        void compute_heights ();
        bool maybe_set_cursor (int y);
 
        void compute_heights ();
        bool maybe_set_cursor (int y);