Use sys::path and SessionDirectory in Session::find_all_sources for portability

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index cc5f9cb41428399345a47aee9c439de310907224..f83b35191ddbf95b4ce7d259dba8e0e706e90de0 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -20,7 +20,6 @@
 #define __ardour_streamview_h__
 
 #include <list>
-#include <map>
 #include <cmath>
 
 #include <ardour/location.h>
@@ -68,11 +67,13 @@ public:
        void set_zoom_all();
 
        int set_position (gdouble x, gdouble y);
-       virtual int set_height (gdouble);
+       virtual int set_height (double);
 
        virtual int set_samples_per_unit (gdouble spp);
        gdouble     get_samples_per_unit () { return _samples_per_unit; }
 
+       void set_layer_display (LayerDisplay);
+
        ArdourCanvas::Item* canvas_item() { return canvas_group; }
 
        enum ColorTarget {
@@ -105,9 +106,9 @@ protected:
        void         sess_rec_enable_changed();
        virtual void setup_rec_box () = 0;
        void         update_rec_box ();
-       virtual void update_rec_regions () = 0;
+       //virtual void update_rec_regions () = 0;
        
-       virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0;
+       virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0;
        virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
        //void         remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused)
 
@@ -116,12 +117,13 @@ protected:
        virtual void redisplay_diskstream () = 0;
        void         diskstream_changed ();
        
-       void         playlist_state_changed (ARDOUR::Change);
        virtual void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
-       virtual void playlist_modified ();
+       virtual void playlist_modified_weak (boost::weak_ptr<ARDOUR::Diskstream>);
+       virtual void playlist_modified (boost::shared_ptr<ARDOUR::Diskstream>);
        
        virtual void color_handler (ColorID, uint32_t) = 0;
 
+       virtual void update_contents_y_position_and_height ();
 
        RouteTimeAxisView&        _trackview;
        ArdourCanvas::Group*      canvas_group;
@@ -134,7 +136,7 @@ protected:
 
        sigc::connection       screen_update_connection;
        vector<RecBoxInfo>     rec_rects;
-       list<boost::shared_ptr<ARDOUR::Region> > rec_regions;
+       list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
        bool                   rec_updating;
        bool                   rec_active;
        bool                   use_rec_regions;
@@ -144,6 +146,13 @@ protected:
 
        vector<sigc::connection> playlist_connections;
        sigc::connection         playlist_change_connection;
+
+       int layers;
+       double height;
+       LayerDisplay layer_display;
+
+       list<sigc::connection> rec_data_ready_connections;
+       jack_nframes_t         last_rec_data_frame;
 };
 
 #endif /* __ardour_streamview_h__ */