From 4a1f5c7f28a3a6e2dcd1799dc9506c7a644c6f86 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 12 Sep 2015 20:05:46 +0200 Subject: [PATCH] GUI part of memleak fixes --- gtk2_ardour/ardour_ui.cc | 1 + gtk2_ardour/editor.cc | 6 ++++++ gtk2_ardour/keyboard.cc | 2 +- gtk2_ardour/mixer_ui.cc | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 544fd54b30..89f0bb4f90 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -645,6 +645,7 @@ ARDOUR_UI::~ARDOUR_UI () delete nsm; delete gui_object_state; FastMeter::flush_pattern_cache (); + PixFader::flush_pattern_cache (); } #ifndef NDEBUG diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 197103a561..e69c28609e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -814,6 +814,12 @@ Editor::~Editor() delete _drags; delete nudge_clock; delete quantize_dialog; + delete _summary; + delete _group_tabs; + delete _regions; + delete _snapshots; + delete _locations; + delete _playlist_selector; } XMLNode* diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 96c73f63d4..39708a9f4a 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -69,7 +69,7 @@ ArdourKeyboard::setup_keybindings () /* set up the per-user bindings path */ - string lowercase_program_name = downcase (PROGRAM_NAME); + string lowercase_program_name = downcase (string(PROGRAM_NAME)); user_keybindings_path = Glib::build_filename (user_config_directory(), lowercase_program_name + ".bindings"); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index a1cb2365d5..b5451daea6 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -92,6 +92,7 @@ Mixer_UI::Mixer_UI () , in_group_row_change (false) , track_menu (0) , _monitor_section (0) + , _plugin_selector (0) , _strip_width (ARDOUR_UI::config()->get_default_narrow_ms() ? Narrow : Wide) , ignore_reorder (false) , _in_group_rebuild_or_clear (false) @@ -257,6 +258,7 @@ Mixer_UI::~Mixer_UI () if (_monitor_section) { delete _monitor_section; } + delete _plugin_selector; } void