Allow more than one peaks_ready callback to be pending for an AudioRegionView

[ardour.git] / gtk2_ardour / canvas-flag.cc

diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index f0361c5bf900a36325e12e42962af01ae03940f3..55bf853b7cd3df0fd41b4fe453b19e791f7e8472 100644 (file)
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -5,8 +5,7 @@
 using namespace Gnome::Canvas;
 using namespace std;
 
-
-void 
+void
 CanvasFlag::delete_allocated_objects()
 {
        delete _text;
@@ -19,11 +18,11 @@ CanvasFlag::delete_allocated_objects()
        _rect = 0;
 }
 
-void 
-CanvasFlag::set_text(string& a_text)
+void
+CanvasFlag::set_text(const string& a_text)
 {
        delete_allocated_objects();
-       
+
        _text = new InteractiveText(*this, this, 0.0, 0.0, Glib::ustring(a_text));
        _text->property_justification() = Gtk::JUSTIFY_CENTER;
        _text->property_fill_color_rgba() = _outline_color_rgba;
@@ -37,7 +36,7 @@ CanvasFlag::set_text(string& a_text)
        _rect = new InteractiveRect(*this, this, 0.0, 0.0, flagwidth, flagheight);
        _rect->property_outline_color_rgba() = _outline_color_rgba;
        _rect->property_fill_color_rgba() = _fill_color_rgba;
-       _text->raise_to_top();  
+       _text->raise_to_top();
 }
 
 CanvasFlag::~CanvasFlag()
@@ -46,8 +45,7 @@ CanvasFlag::~CanvasFlag()
 }
 
 bool
-CanvasFlag::on_event(GdkEvent* ev)
+CanvasFlag::on_event(GdkEvent* /*ev*/)
 {
-       cerr << "CanvasFlag::on_event(GdkEvent* ev)" << endl;
        return false;
 }