Merge branch 'windows+cc' into cairocanvas

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index b9cae8cb234120393ee4aef7511482fcb38baccf..a22ba9443959d12be288aeb8d7b9f345cd0d6533 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -105,7 +105,6 @@ class TimeAxisView : public virtual AxisView
         virtual void leave_internal_edit_mode () {}
 
        ArdourCanvas::Group* canvas_display () { return _canvas_display; }
-       ArdourCanvas::Group* canvas_background () { return _canvas_background; }
        ArdourCanvas::Group* ghost_group () { return _ghost_group; }
 
        /** @return effective height (taking children into account) in canvas units, or
@@ -125,8 +124,6 @@ class TimeAxisView : public virtual AxisView
        virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent);
        virtual void hide ();
 
-       void clip_to_viewport ();
-
        bool touched (double top, double bot);
 
        /** @return true if hidden, otherwise false */
@@ -154,7 +151,7 @@ class TimeAxisView : public virtual AxisView
        virtual ARDOUR::RouteGroup* route_group() const { return 0; }
        virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); }
 
-       virtual void set_frames_per_pixel (double);
+       virtual void set_samples_per_pixel (double);
        virtual void show_selection (TimeSelection&);
        virtual void hide_selection ();
        virtual void reshow_selection (TimeSelection&);
@@ -215,6 +212,7 @@ class TimeAxisView : public virtual AxisView
        Gtk::Menu*             display_menu; /* The standard LHS Track control popup-menus */
        TimeAxisView*          parent;
        ArdourCanvas::Group*   selection_group;
+       ArdourCanvas::Group*  _ghost_group;
        std::list<GhostRegion*> ghosts;
        std::list<SelectionRect*> free_selection_rects;
        std::list<SelectionRect*> used_selection_rects;
@@ -281,14 +279,12 @@ class TimeAxisView : public virtual AxisView
        void build_size_menu ();
 
 private:
-       ArdourCanvas::Group* _canvas_background;
        Gtk::VBox*            control_parent;
        int                  _order;
        uint32_t             _effective_height;
        double               _resize_drag_start;
        GdkCursor*           _preresize_cursor;
        bool                 _have_preresize_cursor;
-       ArdourCanvas::Group* _ghost_group;
         bool                  _ebox_release_can_act;
 
        static uint32_t button_height;