From af768486c9b354a1703b09810e21328e513ce51d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Mon, 12 Dec 2011 19:03:46 +0000
Subject: Make the MidiRegionSelection notice when its MidiRegionViews go away;
 fixes one source of memory corruption during MIDI edits.

git-svn-id: svn://localhost/ardour2/branches/3.0@10991 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/midi_selection.cc | 45 +++++++++++++++++++++++++++++++++++++++++++
 gtk2_ardour/midi_selection.h  | 14 +++++++++++++-
 gtk2_ardour/wscript           |  1 +
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 gtk2_ardour/midi_selection.cc

(limited to 'gtk2_ardour')

diff --git a/gtk2_ardour/midi_selection.cc b/gtk2_ardour/midi_selection.cc
new file mode 100644
index 0000000000..93f62f11a3
--- /dev/null
+++ b/gtk2_ardour/midi_selection.cc
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2009 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "gtkmm2ext/gui_thread.h"
+#include "midi_region_view.h"
+#include "midi_selection.h"
+#include "region_view.h"
+
+MidiRegionSelection::MidiRegionSelection ()
+{
+	RegionView::RegionViewGoingAway.connect (_death_connection, MISSING_INVALIDATOR, ui_bind (&MidiRegionSelection::remove_it, this, _1), gui_context());
+}
+
+/** Copy constructor.
+ *  @param other MidiRegionSelection to copy.
+ */
+MidiRegionSelection::MidiRegionSelection (MidiRegionSelection const & other)
+	: std::list<MidiRegionView*> (other)
+{
+	RegionView::RegionViewGoingAway.connect (_death_connection, MISSING_INVALIDATOR, ui_bind (&MidiRegionSelection::remove_it, this, _1), gui_context());
+}
+
+
+void
+MidiRegionSelection::remove_it (RegionView* rv)
+{
+	MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rv);
+	remove (mrv);
+}
diff --git a/gtk2_ardour/midi_selection.h b/gtk2_ardour/midi_selection.h
index de99392127..f2c2d3fc60 100644
--- a/gtk2_ardour/midi_selection.h
+++ b/gtk2_ardour/midi_selection.h
@@ -21,11 +21,23 @@
 #define __ardour_gtk_midi_selection_h__
 
 #include <list>
+#include "pbd/signals.h"
 
 class MidiRegionView;
 class MidiCutBuffer;
+class RegionView;
+
+class MidiRegionSelection : public std::list<MidiRegionView*>
+{
+public:
+	MidiRegionSelection ();
+	MidiRegionSelection (MidiRegionSelection const &);
+
+private:
+	void remove_it (RegionView *);	
+	PBD::ScopedConnection _death_connection;
+};
 
-struct MidiRegionSelection : std::list<MidiRegionView*> {};
 struct MidiNoteSelection   : std::list<MidiCutBuffer*> {};
 
 #endif /* __ardour_gtk_midi_selection_h__ */
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 1cb0898840..b659ff500a 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -144,6 +144,7 @@ gtk2_ardour_sources = [
         'midi_port_dialog.cc',
         'midi_region_view.cc',
         'midi_scroomer.cc',
+        'midi_selection.cc',
         'midi_streamview.cc',
         'midi_time_axis.cc',
         'midi_tracer.cc',
-- 
cgit v1.2.3