diff options
| author | Robin Gareus <robin@gareus.org> | 2015-07-23 13:23:47 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-07-23 17:58:40 +0200 |
| commit | e1f168de110322e7024dfa334b97f3b433907ae1 (patch) | |
| tree | bd700545929b7aa5ec95c69b88a5a4e983845547 /gtk2_ardour/selection.h | |
| parent | 2cc64168d379790eb3d162cd59b7f1a8effb4156 (diff) | |
rename Marker class
Classes are in the global namespace.
OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
Diffstat (limited to 'gtk2_ardour/selection.h')
| -rw-r--r-- | gtk2_ardour/selection.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h index 7585c0ae56..c28b42a443 100644 --- a/gtk2_ardour/selection.h +++ b/gtk2_ardour/selection.h @@ -113,7 +113,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList bool selected (TimeAxisView*); bool selected (RegionView*); - bool selected (Marker*); + bool selected (ArdourMarker*); bool selected (ControlPoint*); void set (std::list<Selectable*> const &); @@ -132,7 +132,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList void set (boost::shared_ptr<ARDOUR::Playlist>); void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); void set (ControlPoint *); - void set (Marker*); + void set (ArdourMarker*); void set (const RegionSelection&); void toggle (TimeAxisView*); @@ -148,7 +148,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList void toggle (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); void toggle (ControlPoint *); void toggle (std::vector<ControlPoint*> const &); - void toggle (Marker*); + void toggle (ArdourMarker*); void add (TimeAxisView*); void add (const TrackViewList&); @@ -163,8 +163,8 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList void add (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); void add (ControlPoint *); void add (std::vector<ControlPoint*> const &); - void add (Marker*); - void add (const std::list<Marker*>&); + void add (ArdourMarker*); + void add (const std::list<ArdourMarker*>&); void add (const RegionSelection&); void add (const PointSelection&); void remove (TimeAxisView*); @@ -179,7 +179,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList void remove (boost::shared_ptr<ARDOUR::Playlist>); void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&); void remove (const std::list<Selectable*>&); - void remove (Marker*); + void remove (ArdourMarker*); void remove (ControlPoint *); void remove_regions (TimeAxisView *); |