Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / region_view.h

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 16df6be245c1705e0bddd2679e22921d40aa95e6..389faf89210adda3c95ca2d4dece9a11585d52d5 100644 (file)
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -19,6 +19,10 @@
 #ifndef __gtk_ardour_region_view_h__
 #define __gtk_ardour_region_view_h__
 
+#ifdef interface
+#undef interface
+#endif
+
 #include <vector>
 
 #include <sigc++/signal.h>
@@ -45,11 +49,11 @@ namespace ArdourCanvas {
 class RegionView : public TimeAxisViewItem
 {
   public:
-       RegionView (ArdourCanvas::Group* parent,
+       RegionView (ArdourCanvas::Container* parent,
                    TimeAxisView&        time_view,
                    boost::shared_ptr<ARDOUR::Region> region,
                    double               samples_per_pixel,
-                   Gdk::Color const &   basic_color,
+                   uint32_t             base_color,
                    bool                 automation = false);
 
        RegionView (const RegionView& other);
@@ -57,7 +61,7 @@ class RegionView : public TimeAxisViewItem
 
        ~RegionView ();
 
-       virtual void init (Gdk::Color const & base_color, bool wait_for_data);
+       virtual void init (bool wait_for_data);
 
        boost::shared_ptr<ARDOUR::Region> region() const { return _region; }
 
@@ -75,7 +79,6 @@ class RegionView : public TimeAxisViewItem
        void lower_to_bottom ();
 
        bool set_position(framepos_t pos, void* src, double* delta = 0);
-       void fake_set_opaque (bool yn);
 
        virtual void show_region_editor ();
        void hide_region_editor ();
@@ -86,9 +89,7 @@ class RegionView : public TimeAxisViewItem
        void remove_ghost_in (TimeAxisView&);
        void remove_ghost (GhostRegion*);
 
-       uint32_t get_fill_color ();
-
-       virtual void entered (bool) {}
+       virtual void entered () {}
        virtual void exited () {}
 
        virtual void enable_display(bool yn) { _enable_display = yn; }
@@ -96,14 +97,6 @@ class RegionView : public TimeAxisViewItem
 
        static PBD::Signal1<void,RegionView*> RegionViewGoingAway;
 
-       ARDOUR::BeatsFramesConverter const & region_relative_time_converter () const {
-               return _region_relative_time_converter;
-       }
-
-       ARDOUR::BeatsFramesConverter const & source_relative_time_converter () const {
-               return _source_relative_time_converter;
-       }
-
        /** Called when a front trim is about to begin */
        virtual void trim_front_starting () {}
 
@@ -127,11 +120,11 @@ class RegionView : public TimeAxisViewItem
        /** Allows derived types to specify their visibility requirements
         * to the TimeAxisViewItem parent class
         */
-       RegionView (ArdourCanvas::Group *,
+       RegionView (ArdourCanvas::Container *,
                    TimeAxisView&,
                    boost::shared_ptr<ARDOUR::Region>,
                    double samples_per_pixel,
-                   Gdk::Color const & basic_color,
+                   uint32_t basic_color,
                    bool recording,
                    TimeAxisViewItem::Visibility);
 
@@ -153,6 +146,8 @@ class RegionView : public TimeAxisViewItem
        virtual void set_frame_color ();
        virtual void reset_width_dependent_items (double pixel_width);
 
+       uint32_t fill_opacity () const;
+
        virtual void color_handler () {}
 
        boost::shared_ptr<ARDOUR::Region> _region;
@@ -189,9 +184,6 @@ class RegionView : public TimeAxisViewItem
         /** a text item to display strip silence statistics
          */
         ArdourCanvas::Text* _silence_text;
-
-       ARDOUR::BeatsFramesConverter _region_relative_time_converter;
-       ARDOUR::BeatsFramesConverter _source_relative_time_converter;
 };
 
 #endif /* __gtk_ardour_region_view_h__ */