mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-02 19:59:30 +01:00
e664fa5e63
This reverts commit 0ddc050555.
It is not clear what this commit was really trying to do - when canvas items
are deleted they are removed from their parent, so just *not* deleting them
should not by itself fix an issue.
It turns out that not deleting the canvas item means that it remains in the
canvas scene graph to deliver events to, at which time it references its
now-deleted owner object, leading to a crash.
We need to keep an eye open for crashes resembling the double-free that this
reverted commit claimed to fix.
97 lines
2.2 KiB
C++
97 lines
2.2 KiB
C++
/*
|
|
* Copyright (C) 2013-2017 Paul Davis <paul@linuxaudiosystems.com>
|
|
*
|
|
* 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.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include <iostream>
|
|
|
|
#include "canvas/flag.h"
|
|
|
|
#include "gtkmm2ext/keyboard.h"
|
|
|
|
#include "editor.h"
|
|
#include "midi_view.h"
|
|
#include "sys_ex.h"
|
|
#include "ui_config.h"
|
|
|
|
using namespace std;
|
|
|
|
SysEx::SysEx (
|
|
MidiView& view,
|
|
ArdourCanvas::Container* parent,
|
|
string& text,
|
|
double height,
|
|
double x,
|
|
double y,
|
|
ARDOUR::MidiModel::SysExPtr sysex)
|
|
: _sysex (sysex)
|
|
, _view (view)
|
|
{
|
|
_flag = new ArdourCanvas::Flag (
|
|
parent,
|
|
height,
|
|
UIConfiguration::instance().color ("midi sysex outline"),
|
|
UIConfiguration::instance().color_mod ("midi sysex fill", "midi sysex fill"),
|
|
ArdourCanvas::Duple (x, y)
|
|
);
|
|
|
|
_flag->Event.connect (sigc::mem_fun (*this, &SysEx::event_handler));
|
|
_flag->set_font_description (UIConfiguration::instance ().get_SmallFont ());
|
|
_flag->set_text (text);
|
|
}
|
|
|
|
SysEx::~SysEx()
|
|
{
|
|
delete _flag;
|
|
}
|
|
|
|
bool
|
|
SysEx::event_handler (GdkEvent* ev)
|
|
{
|
|
switch (ev->type) {
|
|
case GDK_BUTTON_PRESS:
|
|
if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
|
|
_view.delete_sysex (this);
|
|
return true;
|
|
}
|
|
break;
|
|
|
|
case GDK_SCROLL:
|
|
if (ev->scroll.direction == GDK_SCROLL_UP) {
|
|
return true;
|
|
} else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
|
|
return true;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void
|
|
SysEx::hide ()
|
|
{
|
|
_flag->hide ();
|
|
}
|
|
|
|
void
|
|
SysEx::show ()
|
|
{
|
|
_flag->show ();
|
|
}
|