save global state when quitting BEFORE we stop the engine, so that global MIDI ports...

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

diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h
index 57a78ef99265b027681da5dd675a1d002fe2bb54..781430f8e4b1257b29a3dc38a6255645f9baa02e 100644 (file)
--- a/gtk2_ardour/canvas-flag.h
+++ b/gtk2_ardour/canvas-flag.h
@@ -1,103 +1,60 @@
 #ifndef CANVASFLAG_H_
 #define CANVASFLAG_H_
 
+#include <string>
 #include <libgnomecanvasmm/group.h>
-#include <libgnomecanvasmm/text.h>
 #include <libgnomecanvasmm/widget.h>
 
-#include <ardour/midi_model.h>
+#include "ardour/midi_model.h"
 
 #include "simplerect.h"
 #include "simpleline.h"
+#include "interactive-item.h"
 
 class MidiRegionView;
 
 namespace Gnome {
 namespace Canvas {
 
-class CanvasFlagRect;
-class CanvasFlagText;
-
-class CanvasFlag : public Group
+class CanvasFlag : public Group, public InteractiveItem
 {
 public:
        CanvasFlag(
-               MidiRegionView&                       region,
-               Group&                                parent,
-               double                                height,
-               guint                                 outline_color_rgba = 0xc0c0c0ff,
-               guint                                 fill_color_rgba = 0x07070707,
-               double                                x = 0.0,
-               double                                y = 0.0
-       )       : Group(parent, x, y)
-       , _text(0)
-       , _height(height)
-       , _outline_color_rgba(outline_color_rgba)
-       , _fill_color_rgba(fill_color_rgba)
-       , _region(region)
-       , _line(0)
-       , _rect(0)
+                       MidiRegionView& region,
+                       Group&          parent,
+                       double          height,
+                       guint           outline_color_rgba = 0xc0c0c0ff,
+                       guint           fill_color_rgba = 0x07070707,
+                       double          x = 0.0,
+                       double          y = 0.0)
+               : Group(parent, x, y)
+               , _text(0)
+               , _height(height)
+               , _outline_color_rgba(outline_color_rgba)
+               , _fill_color_rgba(fill_color_rgba)
+               , _region(region)
+               , _line(0)
+               , _rect(0)
        {}
-                       
+
        virtual ~CanvasFlag();
-       
+
        virtual bool on_event(GdkEvent* ev);
 
-       void set_text(string& a_text);
+       void set_text(const std::string& a_text);
 
 protected:
-       CanvasFlagText*                   _text;
-       double                            _height;
-       guint                             _outline_color_rgba;
-       guint                             _fill_color_rgba;
-       MidiRegionView&                   _region;
-       
-private:
-       void delete_allocated_objects();
-       
-       SimpleLine*                       _line;
-       CanvasFlagRect*                   _rect;
-};
-
-class CanvasFlagText: public Text
-{
-public:
-       CanvasFlagText(Group& parent, double x, double y, const Glib::ustring& text) 
-               : Text(parent, x, y, text) {
-               _parent = dynamic_cast<CanvasFlag*>(&parent);
-;
-       }
-       
-       virtual bool on_event(GdkEvent* ev) {
-               if(_parent) {
-                       return _parent->on_event(ev);
-               } else {
-                       return false;
-               }
-       }
+       InteractiveText* _text;
+       double           _height;
+       guint            _outline_color_rgba;
+       guint            _fill_color_rgba;
+       MidiRegionView&  _region;
 
 private:
-       CanvasFlag* _parent;
-};
-
-class CanvasFlagRect: public SimpleRect
-{
-public:
-       CanvasFlagRect(Group& parent, double x1, double y1, double x2, double y2) 
-               : SimpleRect(parent, x1, y1, x2, y2) {
-               _parent = dynamic_cast<CanvasFlag*>(&parent);
-       }
-       
-       virtual bool on_event(GdkEvent* ev) {
-               if(_parent) {
-                       return _parent->on_event(ev);
-               } else {
-                       return false;
-               }
-       }
+       void delete_allocated_objects();
 
-private:
-       CanvasFlag* _parent;
+       SimpleLine*      _line;
+       InteractiveRect* _rect;
 };