Remove excess menu separator.

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index fa5657f8661ae04c9517f581d393640668a7ad0c..39ca9f10d38716f4a96a12aa189300ed6ea8c5ff 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -22,7 +22,7 @@
 #include <list>
 #include <cmath>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "enums.h"
 #include "simplerect.h"
 #include "canvas.h"
@@ -46,7 +46,6 @@ struct RecBoxInfo {
        nframes_t                 length;
 };
 
-class PublicEditor;
 class Selectable;
 class RouteTimeAxisView;
 class RegionView;
@@ -90,19 +89,27 @@ public:
        void         foreach_regionview (sigc::slot<void,RegionView*> slot);
 
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (nframes_t start, nframes_t end, list<Selectable* >&);
-       void get_inverted_selectables (Selection&, list<Selectable* >& results);
+       void get_selectables (nframes_t, nframes_t, double, double, std::list<Selectable* >&);
+       void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
-       virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region> r) {}
+       virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region>) {}
+
+       void add_region_view_weak (boost::weak_ptr<ARDOUR::Region> r);
        void add_region_view (boost::shared_ptr<ARDOUR::Region>);
+
        void region_layered (RegionView*);
        virtual void update_contents_height ();
        
        virtual void redisplay_diskstream () = 0;
        double child_height () const;
        ARDOUR::layer_t layers () const { return _layers; }
+
+       virtual RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool) {
+               return 0;
+       }
        
        sigc::signal<void,RegionView*> RegionViewAdded;
+       sigc::signal<void> HeightChanged;
 
 protected:
        StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL);
@@ -115,7 +122,7 @@ protected:
        void         update_rec_box ();
        
        virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>,
-                       bool wait_for_waves, bool recording = false) = 0;
+                     bool wait_for_waves, bool recording = false) = 0;
        virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
 
        void         display_diskstream (boost::shared_ptr<ARDOUR::Diskstream>);
@@ -136,14 +143,14 @@ protected:
        ArdourCanvas::Group*      canvas_group;
        ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
 
-       typedef list<RegionView* > RegionViewList;
+       typedef std::list<RegionView* > RegionViewList;
        RegionViewList  region_views;
 
        double _samples_per_unit;
 
        sigc::connection       screen_update_connection;
-       vector<RecBoxInfo>     rec_rects;
-       list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
+       std::vector<RecBoxInfo>     rec_rects;
+       std::list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
        bool                   rec_updating;
        bool                   rec_active;
        bool                   use_rec_regions;
@@ -151,7 +158,7 @@ protected:
        Gdk::Color region_color;      ///< Contained region color
        uint32_t   stream_base_color; ///< Background color
 
-       vector<sigc::connection> playlist_connections;
+       std::vector<sigc::connection> playlist_connections;
        sigc::connection         playlist_change_connection;
 
        ARDOUR::layer_t _layers;
@@ -159,7 +166,7 @@ protected:
        
        double height;
 
-       list<sigc::connection> rec_data_ready_connections;
+       std::list<sigc::connection> rec_data_ready_connections;
        jack_nframes_t         last_rec_data_frame;
 
 private: