rename Marker class

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 309e4239fb09bd7dded471af69ba2f655b32b832..784f646f39a651583ceb2eff43eef0c1d5200efd 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -61,8 +61,8 @@ Selection::Selection (const PublicEditor* e)
        void (Selection::*track_remove)(TimeAxisView*) = &Selection::remove;
        TimeAxisView::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (track_remove, this, _1), gui_context());
 
-       void (Selection::*marker_remove)(Marker*) = &Selection::remove;
-       Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context());
+       void (Selection::*marker_remove)(ArdourMarker*) = &Selection::remove;
+       ArdourMarker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context());
 
        void (Selection::*point_remove)(ControlPoint*) = &Selection::remove;
        ControlPoint::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (point_remove, this, _1), gui_context());
@@ -911,7 +911,7 @@ Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
 }
 
 bool
-Selection::selected (Marker* m)
+Selection::selected (ArdourMarker* m)
 {
        return find (markers.begin(), markers.end(), m) != markers.end();
 }
@@ -1126,7 +1126,7 @@ Selection::set (ControlPoint* cp)
 }
 
 void
-Selection::set (Marker* m)
+Selection::set (ArdourMarker* m)
 {
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
@@ -1136,7 +1136,7 @@ Selection::set (Marker* m)
 }
 
 void
-Selection::toggle (Marker* m)
+Selection::toggle (ArdourMarker* m)
 {
        MarkerSelection::iterator i;
 
@@ -1148,7 +1148,7 @@ Selection::toggle (Marker* m)
 }
 
 void
-Selection::remove (Marker* m)
+Selection::remove (ArdourMarker* m)
 {
        MarkerSelection::iterator i;
 
@@ -1159,7 +1159,7 @@ Selection::remove (Marker* m)
 }
 
 void
-Selection::add (Marker* m)
+Selection::add (ArdourMarker* m)
 {
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
@@ -1171,7 +1171,7 @@ Selection::add (Marker* m)
 }
 
 void
-Selection::add (const list<Marker*>& m)
+Selection::add (const list<ArdourMarker*>& m)
 {
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
@@ -1233,7 +1233,7 @@ Selection::get_state () const
        }
 
        /* midi region views have thir own internal selection. */
-       XMLNode* n;
+       XMLNode* n = NULL;
        list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > > rid_notes;
        editor->get_per_region_note_selection (rid_notes);
        if (!rid_notes.empty()) {
@@ -1486,7 +1486,7 @@ Selection::set_state (XMLNode const & node, int)
                        assert (prop_start);
 
                        PBD::ID id (prop_id->value ());
-                       Marker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
+                       ArdourMarker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
                        if (m) {
                                add (m);
                        }