changes to help strp silence

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 72658f2d530eb5f66a5b982e4a845eeb1ffe2e5c..3939c46a4b897f3e4e8b0dd0029128d0454747fd 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,14 +21,13 @@
 #define __ardour_gtk_ghost_region_h__
 
 #include <vector>
-#include <sigc++/signal.h>
 #include <libgnomecanvasmm.h>
-#include <ardour/configuration.h>
+#include "pbd/signals.h"
 #include "canvas.h"
 
 namespace Gnome {
        namespace Canvas {
-               class CanvasMidiEvent;
+               class CanvasNoteEvent;
                class CanvasNote;
                class CanvasHit;
                class Diamond;
@@ -38,7 +37,7 @@ namespace Gnome {
 class MidiStreamView;
 class TimeAxisView;
 
-class GhostRegion : public sigc::trackable 
+class GhostRegion
 {
 public:
        GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
@@ -53,12 +52,12 @@ public:
        guint source_track_color(unsigned char alpha = 0xff);
        bool is_automation_ghost();
 
-       sigc::signal<void,GhostRegion*> GoingAway;
-
        TimeAxisView& trackview;
        TimeAxisView& source_trackview;
        ArdourCanvas::Group* group;
        ArdourCanvas::SimpleRect* base_rect;
+
+       static PBD::Signal1<void,GhostRegion*> CatchDeletion;
 };
 
 class AudioGhostRegion : public GhostRegion {
@@ -76,11 +75,11 @@ class MidiGhostRegion : public GhostRegion {
 public:
        class Event : public sigc::trackable {
        public:
-               Event(ArdourCanvas::CanvasMidiEvent*);
+               Event(ArdourCanvas::CanvasNoteEvent*);
                virtual ~Event() {}
 
                virtual void x_changed() = 0;
-               ArdourCanvas::CanvasMidiEvent* event;
+               ArdourCanvas::CanvasNoteEvent* event;
        };
 
        class Note : public Event {
@@ -100,7 +99,7 @@ public:
                void x_changed();
                ArdourCanvas::Diamond* diamond;
        };
-       
+
        MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
        MidiGhostRegion(MidiStreamView& msv, TimeAxisView& source_tv, double initial_unit_pos);
        ~MidiGhostRegion();