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 b83c082b08338ca77c693ef2db6f1c99f5e99f35..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;
@@ -87,7 +87,7 @@ public:
        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 (boost::shared_ptr<ARDOUR::Region>);
@@ -108,7 +108,7 @@ protected:
        virtual void update_rec_regions () = 0;
        
        virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0;
-       virtual void remove_region_view (boost::shared_ptr<ARDOUR::Region> );
+       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>);
@@ -116,7 +116,6 @@ 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 ();