diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index a89a3baaf5..b107ea8be4 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -375,9 +375,7 @@ public: } void get_cue_markers (CueMarkers&, bool abs = false) const; - void remove_cue_marker (CueMarker&); - void clear_cue_markers (); - + protected: virtual XMLNode& state (); diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index 64f917b3a5..1faa4dd4bc 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -114,8 +114,8 @@ public: CueMarkers const & cue_markers() const { return _cue_markers; } void add_cue_marker (CueMarker const &); - void remove_cue_marker (CueMarker const &); - void clear_cue_markers (); + bool remove_cue_marker (CueMarker const &); + bool clear_cue_markers (); PBD::Signal0 CueMarkersChanged; virtual samplepos_t natural_position() const { return _natural_position; } diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 068421f7e3..a38f30a24e 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -1937,22 +1937,6 @@ Region::get_cue_markers (CueMarkers& cues, bool abs) const } } -void -Region::remove_cue_marker (CueMarker& cm) -{ - for (SourceList::iterator s = _sources.begin (); s != _sources.end(); ++s) { - (*s)->remove_cue_marker (cm); - } -} - -void -Region::clear_cue_markers () -{ - for (SourceList::iterator s = _sources.begin (); s != _sources.end(); ++s) { - (*s)->clear_cue_markers (); - } -} - void Region::drop_sources () { diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc index cdec2c00ac..c03495c118 100644 --- a/libs/ardour/source.cc +++ b/libs/ardour/source.cc @@ -420,17 +420,25 @@ Source::add_cue_marker (CueMarker const & cm) CueMarkersChanged(); /* EMIT SIGNAL */ } -void +bool Source::remove_cue_marker (CueMarker const & cm) { if (_cue_markers.erase (cm)) { CueMarkersChanged(); /* EMIT SIGNAL */ + return true; } + + return false; } -void +bool Source::clear_cue_markers () { + if (_cue_markers.empty()) { + return false; + } + _cue_markers.clear(); CueMarkersChanged(); /* EMIT SIGNAL */ + return true; }