add locale-guard when saving engine states, also #6418

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 646de24dfcebe88c3cdb77308db05bf5e1babaaf..64211669d12511bb7a7a49f45d990c1af41e1d99 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -36,10 +36,10 @@ class TimeAxisView;
 class GhostRegion : public sigc::trackable
 {
 public:
-       GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
+       GhostRegion(ArdourCanvas::Container* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
        virtual ~GhostRegion();
 
-       virtual void set_frames_per_pixel (double) = 0;
+       virtual void set_samples_per_pixel (double) = 0;
        virtual void set_height();
        virtual void set_colors();
 
@@ -52,7 +52,7 @@ public:
        TimeAxisView& trackview;
        /** TimeAxisView that we are a ghost for */
        TimeAxisView& source_trackview;
-       ArdourCanvas::Group* group;
+       ArdourCanvas::Container* group;
        ArdourCanvas::Rectangle* base_rect;
 
        static PBD::Signal1<void,GhostRegion*> CatchDeletion;
@@ -62,7 +62,7 @@ class AudioGhostRegion : public GhostRegion {
 public:
        AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
 
-       void set_frames_per_pixel (double);
+       void set_samples_per_pixel (double);
        void set_height();
        void set_colors();
 
@@ -73,11 +73,11 @@ class MidiGhostRegion : public GhostRegion {
 public:
        class GhostEvent : public sigc::trackable {
          public:
-           GhostEvent(::NoteBase *, ArdourCanvas::Group *);
+           GhostEvent(::NoteBase *, ArdourCanvas::Container *);
            virtual ~GhostEvent ();
            
            NoteBase* event;
-           ArdourCanvas::Rectangle* rect;
+           ArdourCanvas::Item* item;
        };
 
        MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
@@ -87,7 +87,7 @@ public:
        MidiStreamView* midi_view();
 
        void set_height();
-       void set_frames_per_pixel (double spu);
+       void set_samples_per_pixel (double spu);
        void set_colors();
 
        void update_range();