Fix for SMPTE clock text entry

[ardour.git] / gtk2_ardour / selection.h

diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 102e6e941078691178adb321f14037f24d8ae066..a2997cd7b55ee83bfbfc876feef5d0c09ab0b0e1 100644 (file)
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -35,7 +35,7 @@
 #include "point_selection.h"
 
 class TimeAxisView;
-class AudioRegionView;
+class RegionView;
 class Selectable;
 
 namespace ARDOUR {
@@ -56,12 +56,13 @@ class Selection : public sigc::trackable
 
        enum Operation {
                Set,
+               Add,
                Toggle,
                Extend
        };
 
        TrackSelection       tracks;
-       AudioRegionSelection audio_regions;
+       RegionSelection      regions;
        TimeSelection        time;
        AutomationSelection  lines;
        PlaylistSelection    playlists;
@@ -89,55 +90,55 @@ class Selection : public sigc::trackable
        void dump_region_layers();
 
        bool selected (TimeAxisView*);
-       bool selected (AudioRegionView*);
+       bool selected (RegionView*);
 
        void set (list<Selectable*>&);
        void add (list<Selectable*>&);
        
        void set (TimeAxisView*);
        void set (const list<TimeAxisView*>&);
-       void set (AudioRegionView*);
-       void set (std::vector<AudioRegionView*>&);
-       long set (TimeAxisView*, jack_nframes_t, jack_nframes_t);
+       void set (RegionView*);
+       void set (std::vector<RegionView*>&);
+       long set (TimeAxisView*, nframes_t, nframes_t);
        void set (ARDOUR::AutomationList*);
-       void set (ARDOUR::Playlist*);
-       void set (const list<ARDOUR::Playlist*>&);
+       void set (boost::shared_ptr<ARDOUR::Playlist>);
+       void set (const list<boost::shared_ptr<ARDOUR::Playlist> >&);
        void set (boost::shared_ptr<ARDOUR::Redirect>);
        void set (AutomationSelectable*);
 
        void toggle (TimeAxisView*);
        void toggle (const list<TimeAxisView*>&);
-       void toggle (AudioRegionView*);
-       void toggle (std::vector<AudioRegionView*>&);
-       long toggle (jack_nframes_t, jack_nframes_t);
+       void toggle (RegionView*);
+       void toggle (std::vector<RegionView*>&);
+       long toggle (nframes_t, nframes_t);
        void toggle (ARDOUR::AutomationList*);
-       void toggle (ARDOUR::Playlist*);
-       void toggle (const list<ARDOUR::Playlist*>&);
+       void toggle (boost::shared_ptr<ARDOUR::Playlist>);
+       void toggle (const list<boost::shared_ptr<ARDOUR::Playlist> >&);
        void toggle (boost::shared_ptr<ARDOUR::Redirect>);
 
        void add (TimeAxisView*);
        void add (const list<TimeAxisView*>&);
-       void add (AudioRegionView*);
-       void add (std::vector<AudioRegionView*>&);
-       long add (jack_nframes_t, jack_nframes_t);
+       void add (RegionView*);
+       void add (std::vector<RegionView*>&);
+       long add (nframes_t, nframes_t);
        void add (ARDOUR::AutomationList*);
-       void add (ARDOUR::Playlist*);
-       void add (const list<ARDOUR::Playlist*>&);
+       void add (boost::shared_ptr<ARDOUR::Playlist>);
+       void add (const list<boost::shared_ptr<ARDOUR::Playlist> >&);
        void add (boost::shared_ptr<ARDOUR::Redirect>);
        
        void remove (TimeAxisView*);
        void remove (const list<TimeAxisView*>&);
-       void remove (AudioRegionView*);
+       void remove (RegionView*);
        void remove (uint32_t selection_id);
-       void remove (jack_nframes_t, jack_nframes_t);
+       void remove (nframes_t, nframes_t);
        void remove (ARDOUR::AutomationList*);
-       void remove (ARDOUR::Playlist*);
-       void remove (const list<ARDOUR::Playlist*>&);
+       void remove (boost::shared_ptr<ARDOUR::Playlist>);
+       void remove (const list<boost::shared_ptr<ARDOUR::Playlist> >&);
        void remove (boost::shared_ptr<ARDOUR::Redirect>);
 
-       void replace (uint32_t time_index, jack_nframes_t start, jack_nframes_t end);
+       void replace (uint32_t time_index, nframes_t start, nframes_t end);
        
-       void clear_audio_regions();
+       void clear_regions();
        void clear_tracks ();
        void clear_time();
        void clear_lines ();
@@ -145,10 +146,8 @@ class Selection : public sigc::trackable
        void clear_redirects ();
        void clear_points ();
 
-       void foreach_audio_region (void (ARDOUR::AudioRegion::*method)(void));
-       void foreach_audio_region (void (ARDOUR::Region::*method)(void));
-       template<class A> void foreach_audio_region (void (ARDOUR::AudioRegion::*method)(A), A arg);
-       template<class A> void foreach_audio_region (void (ARDOUR::Region::*method)(A), A arg);
+       void foreach_region (void (ARDOUR::Region::*method)(void));
+       template<class A> void foreach_region (void (ARDOUR::Region::*method)(A), A arg);
 
   private:
        uint32_t next_time_id;