Tidy.

[ardour.git] / gtk2_ardour / canvas-program-change.cc

diff --git a/gtk2_ardour/canvas-program-change.cc b/gtk2_ardour/canvas-program-change.cc
index 103bd7bb8def95aeec5773aa6efd26bdd2362fbb..e5a7768f348d05ca1d5060220f64218b9ac74265 100644 (file)
--- a/gtk2_ardour/canvas-program-change.cc
+++ b/gtk2_ardour/canvas-program-change.cc
@@ -8,22 +8,20 @@ using namespace std;
 CanvasProgramChange::CanvasProgramChange(
                MidiRegionView&                       region,
                Group&                                parent,
-               boost::shared_ptr<MIDI::Event>        event,
+               boost::shared_ptr<Evoral::Event>      event,
                double                                height,
                double                                x,
                double                                y)
-       : Group(parent, x, y),
-         _region(region),
-         _event(event),
-         _text(0),
-         _line(0),
-         _rect(0),
-         _widget(0)
+       : Group(parent, x, y)
+       , _region(region)
+       , _event(event)
+       , _text(0)
+       , _line(0)
+       , _rect(0)
 {
-       _text = new Text(*this);
-       ostringstream pgm(ios::ate);
-       pgm << int(event->pgm_number());
-       _text->property_text() = pgm.str();
+       char pgm_str[4];
+       snprintf(pgm_str, 4, "%d", (int)event->pgm_number());
+       _text = new Text(*this, 0.0, 0.0, pgm_str);
        _text->property_justification() = Gtk::JUSTIFY_CENTER;
        _text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiProgramChangeOutline.get();
        double flagwidth  = _text->property_text_width()  + 10.0;
@@ -38,22 +36,12 @@ CanvasProgramChange::CanvasProgramChange(
        _rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiProgramChangeFill.get();
        _text->lower_to_bottom();
        _text->raise(2);
-       assert(_widget == 0);
-       assert(_text != 0);
-       assert(_line != 0);
-       assert(_rect != 0);
 }
 
 CanvasProgramChange::~CanvasProgramChange()
 {
-       if(_line)
-               delete _line;
-       if(_rect)
-               delete _rect;
-       if(_text)
-               delete _text;
-       if(_widget)
-               delete _widget;
+       delete _line;
+       delete _rect;
+       delete _text;
 }
 
-