allow track selection to be toggled (ctrl-clicked); potential fixes for tape display...

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 8f7fb416bef79b4a61ddacbe3b306312f04d66a8..657bfa90448ff23324526a54831b11e87d485fec 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -44,8 +44,8 @@ namespace ARDOUR {
 
 struct RecBoxInfo {
        ArdourCanvas::SimpleRect* rectangle;
-       jack_nframes_t            start;
-       jack_nframes_t            length;
+       nframes_t            start;
+       nframes_t            length;
 };
 
 class PublicEditor;
@@ -83,14 +83,14 @@ public:
        Gdk::Color get_region_color () const { return region_color; }
        void       apply_color (Gdk::Color&, ColorTarget t);
 
-       RegionView*  find_view (const ARDOUR::Region&);
+       RegionView*  find_view (boost::shared_ptr<const ARDOUR::Region>);
        void         foreach_regionview (sigc::slot<void,RegionView*> slot);
 
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
+       void get_selectables (nframes_t start, nframes_t end, list<Selectable* >&);
        void get_inverted_selectables (Selection&, list<Selectable* >& results);
 
-       void add_region_view (ARDOUR::Region*);
+       void add_region_view (boost::shared_ptr<ARDOUR::Region>);
        void region_layered (RegionView*);
        
        sigc::signal<void,RegionView*> RegionViewAdded;
@@ -107,16 +107,15 @@ protected:
        void         update_rec_box ();
        virtual void update_rec_regions () = 0;
        
-       virtual void add_region_view_internal (ARDOUR::Region*, bool wait_for_waves) = 0;
-       virtual void remove_region_view (ARDOUR::Region* );
-       void         remove_rec_region (ARDOUR::Region*);
+       virtual void 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)
 
        void         display_diskstream (boost::shared_ptr<ARDOUR::Diskstream>);
        virtual void undisplay_diskstream ();
        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 ();
        
@@ -134,7 +133,7 @@ protected:
 
        sigc::connection       screen_update_connection;
        vector<RecBoxInfo>     rec_rects;
-       list<ARDOUR::Region* > rec_regions;
+       list<boost::shared_ptr<ARDOUR::Region> > rec_regions;
        bool                   rec_updating;
        bool                   rec_active;
        bool                   use_rec_regions;