diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-08 01:40:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-08 01:40:25 +0000 |
| commit | badc087263990ecf360792c10e4d9f2d60828d43 (patch) | |
| tree | 7e4b7e0afea47be51cbad48f06bb1779f483f56f /gtk2_ardour/selection.h | |
| parent | df20e5935fbdaf7d27f924e4e2ea87707d8a2314 (diff) | |
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session)
git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/selection.h')
| -rw-r--r-- | gtk2_ardour/selection.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h index 5e9bc04759..2b2db77360 100644 --- a/gtk2_ardour/selection.h +++ b/gtk2_ardour/selection.h @@ -32,6 +32,7 @@ #include "playlist_selection.h" #include "processor_selection.h" #include "point_selection.h" +#include "marker_selection.h" class TimeAxisView; class RegionView; @@ -71,6 +72,7 @@ class Selection : public sigc::trackable AutomationSelection lines; PlaylistSelection playlists; PointSelection points; + MarkerSelection markers; Selection (PublicEditor const * e) : editor (e), next_time_id (0) { clear(); @@ -84,6 +86,7 @@ class Selection : public sigc::trackable sigc::signal<void> LinesChanged; sigc::signal<void> PlaylistsChanged; sigc::signal<void> PointsChanged; + sigc::signal<void> MarkersChanged; void clear (); bool empty(); @@ -106,6 +109,7 @@ class Selection : public sigc::trackable void set (boost::shared_ptr<ARDOUR::Playlist>); void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); void set (AutomationSelectable*); + void set (Marker*); void toggle (TimeAxisView*); void toggle (const std::list<TimeAxisView*>&); @@ -116,6 +120,7 @@ class Selection : public sigc::trackable void toggle (boost::shared_ptr<ARDOUR::Playlist>); void toggle (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); void toggle (const std::vector<AutomationSelectable*>&); + void toggle (Marker*); void add (TimeAxisView*); void add (const std::list<TimeAxisView*>&); @@ -125,7 +130,8 @@ class Selection : public sigc::trackable void add (ARDOUR::AutomationList*); void add (boost::shared_ptr<ARDOUR::Playlist>); void add (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); - + void add (Marker*); + void remove (TimeAxisView*); void remove (const std::list<TimeAxisView*>&); void remove (RegionView*); @@ -135,6 +141,7 @@ class Selection : public sigc::trackable void remove (boost::shared_ptr<ARDOUR::Playlist>); void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); void remove (const list<Selectable*>&); + void remove (Marker*); void replace (uint32_t time_index, nframes_t start, nframes_t end); @@ -144,6 +151,7 @@ class Selection : public sigc::trackable void clear_lines (); void clear_playlists (); void clear_points (); + void clear_markers (); void foreach_region (void (ARDOUR::Region::*method)(void)); void foreach_regionview (void (RegionView::*method)(void)); |