X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fsys_ex.cc;h=9b2f8c1d087a21bb8e6438093aab0883ffe429ed;hb=3c25d26e91d4703ba76c90d5175aa94e4ddd850b;hp=eb824842babe2f1a18563d4a00cc160d8c3903bb;hpb=1fd681604e7ee2e98d5bb08704da05abaa8227c3;p=ardour.git diff --git a/gtk2_ardour/sys_ex.cc b/gtk2_ardour/sys_ex.cc index eb824842ba..9b2f8c1d08 100644 --- a/gtk2_ardour/sys_ex.cc +++ b/gtk2_ardour/sys_ex.cc @@ -19,32 +19,38 @@ #include #include "canvas/flag.h" -#include "ardour_ui.h" #include "sys_ex.h" +#include "ui_config.h" using namespace std; SysEx::SysEx ( - MidiRegionView& region, - ArdourCanvas::Container* parent, - string& text, - double height, - double x, - double y) + MidiRegionView& region, + ArdourCanvas::Container* parent, + string& text, + double height, + double x, + double y, + ARDOUR::MidiModel::SysExPtr sysex) + : _sysex (sysex) { _flag = new ArdourCanvas::Flag ( parent, - height, - ARDOUR_UI::config()->color ("midi sysex outline"), - ARDOUR_UI::config()->color_mod ("midi sysex fill", "midi sysex fill"), + height, + UIConfiguration::instance().color ("midi sysex outline"), + UIConfiguration::instance().color_mod ("midi sysex fill", "midi sysex fill"), ArdourCanvas::Duple (x, y) ); - + _flag->set_text (text); } SysEx::~SysEx() { + /* do not delete flag because it was added to a parent/container which + will delete it. + */ + _flag = 0; } bool