Remove ambiguity to keep MSVC happy

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 73b1f0a420b3563e2eca3397b4281b513732a549..834890f57d51eafb7d037451fd23130206c37bad 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -76,7 +76,8 @@ public:
        virtual int set_samples_per_pixel (double);
        gdouble     get_samples_per_pixel () const { return _samples_per_pixel; }
 
-       void set_layer_display (LayerDisplay);
+       virtual void set_layer_display (LayerDisplay);
+       virtual bool can_change_layer_display() const { return true; }
        LayerDisplay layer_display () const { return _layer_display; }
 
        ArdourCanvas::Container* canvas_item() { return _canvas_group; }
@@ -97,7 +98,7 @@ public:
        void         foreach_selected_regionview (sigc::slot<void,RegionView*> slot);
 
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable* >&);
+       void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable* >&, bool within = false);
        void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
        virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region>) {}
@@ -118,7 +119,7 @@ public:
        void check_record_layers (boost::shared_ptr<ARDOUR::Region>, ARDOUR::framepos_t);
 
        virtual void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
-       
+
        sigc::signal<void, RegionView*> RegionViewAdded;
        sigc::signal<void> RegionViewRemoved;
        /** Emitted when the height of regions has changed */