X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsys_ex.cc;h=9b2f8c1d087a21bb8e6438093aab0883ffe429ed;hb=HEAD;hp=2097de4fa91f42733e0a307ae2365acf0c2bd866;hpb=5d6c986748d77ca9f0cda698113dd19a10ba8fd0;p=ardour.git

diff --git a/gtk2_ardour/sys_ex.cc b/gtk2_ardour/sys_ex.cc
index 2097de4fa9..9b2f8c1d08 100644
--- a/gtk2_ardour/sys_ex.cc
+++ b/gtk2_ardour/sys_ex.cc
@@ -19,33 +19,38 @@
 
 #include <iostream>
 #include "canvas/flag.h"
-#include "ardour_ui.h"
 #include "sys_ex.h"
+#include "ui_config.h"
 
 using namespace std;
 
 SysEx::SysEx (
-	MidiRegionView& region,
-	ArdourCanvas::Group* parent,
-	string&         text,
-	double          height,
-	double          x,
-	double          y)
-	: _region (region)
+	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()->get_canvasvar_MidiSysExOutline(),
-		ARDOUR_UI::config()->get_canvasvar_MidiSysExFill(),
+		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