ardour/livetrax
13
0
Fork 0
Code

Make the MidiRegionSelection notice when its MidiRegionViews go away; fixes one source of memory corruption during MIDI edits.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10991 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-12 19:03:46 +00:00
parent be371bedb9
commit af768486c9
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gtk2_ardour/midi_selection.cc Normal file
View File

@ -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);
}

14
gtk2_ardour/midi_selection.h
View File

@ -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__ */

1
gtk2_ardour/wscript
View File

@ -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',