From e1f168de110322e7024dfa334b97f3b433907ae1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 23 Jul 2015 13:23:47 +0200 Subject: rename Marker class Classes are in the global namespace. OSX has a flat namespace and OSX32bit/Carbon has a Marker too. --- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor.h | 24 +++--- gtk2_ardour/editor_canvas_events.cc | 2 +- gtk2_ardour/editor_drag.cc | 24 +++--- gtk2_ardour/editor_drag.h | 8 +- gtk2_ardour/editor_export_audio.cc | 4 +- gtk2_ardour/editor_markers.cc | 144 ++++++++++++++++++------------------ gtk2_ardour/editor_mouse.cc | 20 ++--- gtk2_ardour/editor_tempodisplay.cc | 8 +- gtk2_ardour/marker.cc | 48 ++++++------ gtk2_ardour/marker.h | 16 ++-- gtk2_ardour/marker_selection.h | 2 +- gtk2_ardour/public_editor.h | 8 +- gtk2_ardour/selection.cc | 18 ++--- gtk2_ardour/selection.h | 12 +-- 15 files changed, 170 insertions(+), 170 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 42b3dfa613..6c46664dc7 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -415,7 +415,7 @@ Editor::Editor () timebar_height = std::max(12., ceil (15. * ARDOUR_UI::ui_scale)); TimeAxisView::setup_sizes (); - Marker::setup_sizes (timebar_height); + ArdourMarker::setup_sizes (timebar_height); _scroll_callbacks = 0; diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 9d0f83d040..1faf148e19 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -111,7 +111,7 @@ class EditorSnapshots; class EditorSummary; class GroupedButtons; class GUIObjectState; -class Marker; +class ArdourMarker; class MidiRegionView; class MixerStrip; class MouseCursors; @@ -642,8 +642,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD uint32_t location_cd_marker_color; struct LocationMarkers { - Marker* start; - Marker* end; + ArdourMarker* start; + ArdourMarker* end; bool valid; LocationMarkers () : start(0), end(0), valid (true) {} @@ -664,9 +664,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD }; LocationMarkers *find_location_markers (ARDOUR::Location *) const; - ARDOUR::Location* find_location_from_marker (Marker *, bool& is_start) const; - Marker* find_marker_from_location_id (PBD::ID const &, bool) const; - Marker* entered_marker; + ARDOUR::Location* find_location_from_marker (ArdourMarker *, bool& is_start) const; + ArdourMarker* find_marker_from_location_id (PBD::ID const &, bool) const; + ArdourMarker* entered_marker; bool _show_marker_lines; typedef std::map LocationMarkerMap; @@ -674,7 +674,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void update_marker_labels (); void update_marker_labels (ArdourCanvas::Container *); - void check_marker_label (Marker *); + void check_marker_label (ArdourMarker *); /** A set of lists of Markers that are in each of the canvas groups * for the marker sections at the top of the editor. These lists @@ -682,8 +682,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD * a marker has moved we can decide whether we need to update the labels * for all markers or for just a few. */ - std::map > _sorted_marker_lists; - void remove_sorted_marker (Marker *); + std::map > _sorted_marker_lists; + void remove_sorted_marker (ArdourMarker *); void hide_marker (ArdourCanvas::Item*, GdkEvent*); void clear_marker_display (); @@ -1554,7 +1554,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*); bool canvas_stream_view_event (GdkEvent* event,ArdourCanvas::Item*, RouteTimeAxisView*); - bool canvas_marker_event (GdkEvent* event,ArdourCanvas::Item*, Marker*); + bool canvas_marker_event (GdkEvent* event,ArdourCanvas::Item*, ArdourMarker*); bool canvas_tempo_marker_event (GdkEvent* event,ArdourCanvas::Item*, TempoMarker*); bool canvas_meter_marker_event (GdkEvent* event,ArdourCanvas::Item*, MeterMarker*); bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*); @@ -1642,7 +1642,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void marker_menu_edit (); void marker_menu_remove (); void marker_menu_rename (); - void rename_marker (Marker *marker); + void rename_marker (ArdourMarker *marker); void toggle_marker_menu_lock (); void toggle_marker_menu_glue (); void marker_menu_hide (); @@ -1679,7 +1679,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::Menu* cd_marker_menu; ArdourCanvas::Item* marker_menu_item; - typedef std::list Marks; + typedef std::list Marks; Marks metric_marks; void remove_metric_marks (); diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 92ebbd976d..adb896af8b 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -981,7 +981,7 @@ Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, Re } bool -Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/) +Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, ArdourMarker* /*marker*/) { return typed_event (item, event, MarkerItem); } diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 0877a8b4be..d17ee4b3a2 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3657,7 +3657,7 @@ MarkerDrag::MarkerDrag (Editor* e, ArdourCanvas::Item* i) { DEBUG_TRACE (DEBUG::Drags, "New MarkerDrag\n"); - _marker = reinterpret_cast (_item->get_data ("marker")); + _marker = reinterpret_cast (_item->get_data ("marker")); assert (_marker); _points.push_back (ArdourCanvas::Duple (0, 0)); @@ -3671,7 +3671,7 @@ MarkerDrag::~MarkerDrag () } } -MarkerDrag::CopiedLocationMarkerInfo::CopiedLocationMarkerInfo (Location* l, Marker* m) +MarkerDrag::CopiedLocationMarkerInfo::CopiedLocationMarkerInfo (Location* l, ArdourMarker* m) { location = new Location (*l); markers.push_back (m); @@ -3713,7 +3713,7 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) case Selection::Extend: { Locations::LocationList ll; - list to_add; + list to_add; framepos_t s, e; _editor->selection->markers.range (s, e); s = min (_marker->position(), s); @@ -3828,17 +3828,17 @@ MarkerDrag::motion (GdkEvent* event, bool) switch (_marker->type()) { - case Marker::SessionStart: - case Marker::RangeStart: - case Marker::LoopStart: - case Marker::PunchIn: + case ArdourMarker::SessionStart: + case ArdourMarker::RangeStart: + case ArdourMarker::LoopStart: + case ArdourMarker::PunchIn: f_delta = newframe - copy_location->start(); break; - case Marker::SessionEnd: - case Marker::RangeEnd: - case Marker::LoopEnd: - case Marker::PunchOut: + case ArdourMarker::SessionEnd: + case ArdourMarker::RangeEnd: + case ArdourMarker::LoopEnd: + case ArdourMarker::PunchOut: f_delta = newframe - copy_location->end(); break; default: @@ -4018,7 +4018,7 @@ MarkerDrag::aborted (bool movement_occured) /* move all markers to their original location */ - for (vector::iterator m = x->markers.begin(); m != x->markers.end(); ++m) { + for (vector::iterator m = x->markers.begin(); m != x->markers.end(); ++m) { bool is_start; Location * location = _editor->find_location_from_marker (*m, is_start); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index e5acbaad44..b9310c79fb 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -61,7 +61,7 @@ class RouteTimeAxisView; class RegionSelection; class MidiRegionView; class MeterMarker; -class Marker; +class ArdourMarker; class TempoMarker; class ControlPoint; class AudioRegionView; @@ -821,13 +821,13 @@ public: private: void update_item (ARDOUR::Location *); - Marker* _marker; ///< marker being dragged + ArdourMarker* _marker; ///< marker being dragged struct CopiedLocationMarkerInfo { ARDOUR::Location* location; - std::vector markers; + std::vector markers; bool move_both; - CopiedLocationMarkerInfo (ARDOUR::Location* l, Marker* m); + CopiedLocationMarkerInfo (ARDOUR::Location* l, ArdourMarker* m); }; typedef std::list CopiedLocationInfo; diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index f92cf07150..c2abbca856 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -86,9 +86,9 @@ Editor::export_selection () void Editor::export_range () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 392b3bb6c1..a0342327a1 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -106,10 +106,10 @@ Editor::add_new_location_internal (Location* location) if (location->is_mark()) { if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { - lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Mark, location->start()); + lam->start = new ArdourMarker (*this, *cd_marker_group, color, location->name(), ArdourMarker::Mark, location->start()); group = cd_marker_group; } else { - lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start()); + lam->start = new ArdourMarker (*this, *marker_group, color, location->name(), ArdourMarker::Mark, location->start()); group = marker_group; } @@ -118,41 +118,41 @@ Editor::add_new_location_internal (Location* location) } else if (location->is_auto_loop()) { // transport marker - lam->start = new Marker (*this, *transport_marker_group, color, - location->name(), Marker::LoopStart, location->start()); - lam->end = new Marker (*this, *transport_marker_group, color, - location->name(), Marker::LoopEnd, location->end()); + lam->start = new ArdourMarker (*this, *transport_marker_group, color, + location->name(), ArdourMarker::LoopStart, location->start()); + lam->end = new ArdourMarker (*this, *transport_marker_group, color, + location->name(), ArdourMarker::LoopEnd, location->end()); group = transport_marker_group; } else if (location->is_auto_punch()) { // transport marker - lam->start = new Marker (*this, *transport_marker_group, color, - location->name(), Marker::PunchIn, location->start()); - lam->end = new Marker (*this, *transport_marker_group, color, - location->name(), Marker::PunchOut, location->end()); + lam->start = new ArdourMarker (*this, *transport_marker_group, color, + location->name(), ArdourMarker::PunchIn, location->start()); + lam->end = new ArdourMarker (*this, *transport_marker_group, color, + location->name(), ArdourMarker::PunchOut, location->end()); group = transport_marker_group; } else if (location->is_session_range()) { // session range - lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start()); - lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end()); + lam->start = new ArdourMarker (*this, *marker_group, color, _("start"), ArdourMarker::SessionStart, location->start()); + lam->end = new ArdourMarker (*this, *marker_group, color, _("end"), ArdourMarker::SessionEnd, location->end()); group = marker_group; } else { // range marker if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { - lam->start = new Marker (*this, *cd_marker_group, color, - location->name(), Marker::RangeStart, location->start()); - lam->end = new Marker (*this, *cd_marker_group, color, - location->name(), Marker::RangeEnd, location->end()); + lam->start = new ArdourMarker (*this, *cd_marker_group, color, + location->name(), ArdourMarker::RangeStart, location->start()); + lam->end = new ArdourMarker (*this, *cd_marker_group, color, + location->name(), ArdourMarker::RangeEnd, location->end()); group = cd_marker_group; } else { - lam->start = new Marker (*this, *range_marker_group, color, - location->name(), Marker::RangeStart, location->start()); - lam->end = new Marker (*this, *range_marker_group, color, - location->name(), Marker::RangeEnd, location->end()); + lam->start = new ArdourMarker (*this, *range_marker_group, color, + location->name(), ArdourMarker::RangeStart, location->start()); + lam->end = new ArdourMarker (*this, *range_marker_group, color, + location->name(), ArdourMarker::RangeEnd, location->end()); group = range_marker_group; } } @@ -224,15 +224,15 @@ Editor::location_changed (Location *location) * lengthened) */ void -Editor::check_marker_label (Marker* m) +Editor::check_marker_label (ArdourMarker* m) { /* Get a time-ordered list of markers from the last time anything changed */ - std::list& sorted = _sorted_marker_lists[m->get_parent()]; + std::list& sorted = _sorted_marker_lists[m->get_parent()]; - list::iterator i = find (sorted.begin(), sorted.end(), m); + list::iterator i = find (sorted.begin(), sorted.end(), m); - list::iterator prev = sorted.end (); - list::iterator next = i; + list::iterator prev = sorted.end (); + list::iterator next = i; ++next; /* Look to see if the previous marker is still behind `m' in time */ @@ -299,7 +299,7 @@ Editor::check_marker_label (Marker* m) } struct MarkerComparator { - bool operator() (Marker const * a, Marker const * b) { + bool operator() (ArdourMarker const * a, ArdourMarker const * b) { return a->position() < b->position(); } }; @@ -308,7 +308,7 @@ struct MarkerComparator { void Editor::update_marker_labels () { - for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { + for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { update_marker_labels (i->first); } } @@ -317,7 +317,7 @@ Editor::update_marker_labels () void Editor::update_marker_labels (ArdourCanvas::Container* group) { - list& sorted = _sorted_marker_lists[group]; + list& sorted = _sorted_marker_lists[group]; if (sorted.empty()) { return; @@ -327,10 +327,10 @@ Editor::update_marker_labels (ArdourCanvas::Container* group) sorted.sort (MarkerComparator ()); - list::iterator i = sorted.begin (); + list::iterator i = sorted.begin (); - list::iterator prev = sorted.end (); - list::iterator next = i; + list::iterator prev = sorted.end (); + list::iterator next = i; if (next != sorted.end()) { ++next; @@ -467,7 +467,7 @@ Editor::find_location_markers (Location *location) const } Location * -Editor::find_location_from_marker (Marker *marker, bool& is_start) const +Editor::find_location_from_marker (ArdourMarker *marker, bool& is_start) const { LocationMarkerMap::const_iterator i; @@ -580,11 +580,11 @@ Editor::LocationMarkers::set_name (const string& str) { /* XXX: hack: don't change names of session start/end markers */ - if (start->type() != Marker::SessionStart) { + if (start->type() != ArdourMarker::SessionStart) { start->set_name (str); } - if (end && end->type() != Marker::SessionEnd) { + if (end && end->type() != ArdourMarker::SessionEnd) { end->set_name (str); } } @@ -726,10 +726,10 @@ Editor::mouse_add_new_range (framepos_t where) void Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) { - Marker* marker; + ArdourMarker* marker; bool is_start; - if ((marker = static_cast (item.get_data ("marker"))) == 0) { + if ((marker = static_cast (item.get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -815,8 +815,8 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It void Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) { - Marker * marker; - if ((marker = reinterpret_cast (item->get_data("marker"))) == 0) { + ArdourMarker * marker; + if ((marker = reinterpret_cast (item->get_data("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -999,9 +999,9 @@ Editor::build_new_transport_marker_menu () void Editor::marker_menu_hide () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1017,9 +1017,9 @@ Editor::marker_menu_hide () void Editor::marker_menu_select_using_range () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1035,9 +1035,9 @@ Editor::marker_menu_select_using_range () void Editor::marker_menu_select_all_selectables_using_range () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1054,9 +1054,9 @@ Editor::marker_menu_select_all_selectables_using_range () void Editor::marker_menu_separate_regions_using_location () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1073,9 +1073,9 @@ Editor::marker_menu_separate_regions_using_location () void Editor::marker_menu_play_from () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1103,9 +1103,9 @@ Editor::marker_menu_play_from () void Editor::marker_menu_set_playhead () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1131,12 +1131,12 @@ Editor::marker_menu_set_playhead () void Editor::marker_menu_range_to_next () { - Marker* marker; + ArdourMarker* marker; if (!_session) { return; } - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1164,9 +1164,9 @@ Editor::marker_menu_range_to_next () void Editor::marker_menu_set_from_playhead () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1192,9 +1192,9 @@ Editor::marker_menu_set_from_playhead () void Editor::marker_menu_set_from_selection (bool /*force_regions*/) { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1223,9 +1223,9 @@ Editor::marker_menu_set_from_selection (bool /*force_regions*/) void Editor::marker_menu_play_range () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1248,9 +1248,9 @@ Editor::marker_menu_play_range () void Editor::marker_menu_loop_range () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1274,7 +1274,7 @@ Editor::marker_menu_loop_range () void Editor::marker_menu_zoom_to_range () { - Marker* marker = reinterpret_cast (marker_menu_item->get_data ("marker")); + ArdourMarker* marker = reinterpret_cast (marker_menu_item->get_data ("marker")); assert (marker); bool is_start; @@ -1300,7 +1300,7 @@ Editor::marker_menu_zoom_to_range () void Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const { - Marker* marker = reinterpret_cast (p); + ArdourMarker* marker = reinterpret_cast (p); if (!marker) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ @@ -1343,9 +1343,9 @@ Editor::marker_menu_remove () void Editor::toggle_marker_menu_lock () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1369,9 +1369,9 @@ Editor::toggle_marker_menu_lock () void Editor::marker_menu_rename () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1381,7 +1381,7 @@ Editor::marker_menu_rename () } void -Editor::rename_marker(Marker *marker) +Editor::rename_marker(ArdourMarker *marker) { Location* loc; bool is_start; @@ -1563,9 +1563,9 @@ Editor::goto_nth_marker (int n) void Editor::toggle_marker_menu_glue () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1598,14 +1598,14 @@ Editor::toggle_marker_lines () } void -Editor::remove_sorted_marker (Marker* m) +Editor::remove_sorted_marker (ArdourMarker* m) { - for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { + for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { i->second.remove (m); } } -Marker * +ArdourMarker * Editor::find_marker_from_location_id (PBD::ID const & id, bool is_start) const { for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) { diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 26e8dd2872..0d9ad69181 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1228,10 +1228,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case TempoMarkerItem: { - Marker* marker; + ArdourMarker* marker; TempoMarker* tempo_marker; - if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1246,10 +1246,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } case MeterMarkerItem: { - Marker* marker; + ArdourMarker* marker; MeterMarker* meter_marker; - if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -1576,7 +1576,7 @@ bool Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) { ControlPoint* cp; - Marker * marker; + ArdourMarker * marker; double fraction; bool ret = true; @@ -1629,7 +1629,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; case MarkerItem: - if ((marker = static_cast (item->get_data ("marker"))) == 0) { + if ((marker = static_cast (item->get_data ("marker"))) == 0) { break; } entered_marker = marker; @@ -1710,7 +1710,7 @@ bool Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) { AutomationLine* al; - Marker *marker; + ArdourMarker *marker; Location *loc; bool is_start; bool ret = true; @@ -1736,7 +1736,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) break; case MarkerItem: - if ((marker = static_cast (item->get_data ("marker"))) == 0) { + if ((marker = static_cast (item->get_data ("marker"))) == 0) { break; } entered_marker = 0; @@ -2133,10 +2133,10 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound) void Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/) { - Marker* marker; + ArdourMarker* marker; bool is_start; - if ((marker = static_cast (item->get_data ("marker"))) == 0) { + if ((marker = static_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 4c2b40f1f0..dea576a16c 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -263,10 +263,10 @@ Editor::mouse_add_new_meter_event (framepos_t frame) void Editor::remove_tempo_marker (ArdourCanvas::Item* item) { - Marker* marker; + ArdourMarker* marker; TempoMarker* tempo_marker; - if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } @@ -363,10 +363,10 @@ Editor::real_remove_tempo_marker (TempoSection *section) void Editor::remove_meter_marker (ArdourCanvas::Item* item) { - Marker* marker; + ArdourMarker* marker; MeterMarker* meter_marker; - if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 97664d3b53..0c7376934c 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -50,16 +50,16 @@ using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; using namespace Gtkmm2ext; -PBD::Signal1 Marker::CatchDeletion; +PBD::Signal1 ArdourMarker::CatchDeletion; static double marker_height = 13.0; -void Marker::setup_sizes(const double timebar_height) +void ArdourMarker::setup_sizes(const double timebar_height) { marker_height = floor (timebar_height) - 2; } -Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation, +ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation, Type type, framepos_t frame, bool handle_events) : editor (ed) @@ -284,14 +284,14 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, Gtkmm2ext::get_ink_pixel_size (layout, width, name_height); _name_item = new ArdourCanvas::Text (group); - CANVAS_DEBUG_NAME (_name_item, string_compose ("Marker::_name_item for %1", annotation)); + CANVAS_DEBUG_NAME (_name_item, string_compose ("ArdourMarker::_name_item for %1", annotation)); _name_item->set_font_description (name_font); _name_item->set_color (RGBA_TO_UINT (0,0,0,255)); _name_item->set_position (ArdourCanvas::Duple (_label_offset, (marker_height - name_height - 1) * .5 )); set_name (annotation.c_str()); - editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition)); + editor.ZoomChanged.connect (sigc::mem_fun (*this, &ArdourMarker::reposition)); /* events will be handled by both the group and the mark itself, so * make sure they can both be used to lookup this object. @@ -305,7 +305,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, } } -Marker::~Marker () +ArdourMarker::~ArdourMarker () { CatchDeletion (this); /* EMIT SIGNAL */ @@ -314,28 +314,28 @@ Marker::~Marker () delete _track_canvas_line; } -void Marker::reparent(ArdourCanvas::Container & parent) +void ArdourMarker::reparent(ArdourCanvas::Container & parent) { group->reparent (&parent); _parent = &parent; } void -Marker::set_selected (bool s) +ArdourMarker::set_selected (bool s) { _selected = s; setup_line (); } void -Marker::set_show_line (bool s) +ArdourMarker::set_show_line (bool s) { _line_shown = s; setup_line (); } void -Marker::setup_line () +ArdourMarker::setup_line () { if (_shown && (_selected || _line_shown)) { @@ -365,20 +365,20 @@ Marker::setup_line () } void -Marker::canvas_height_set (double h) +ArdourMarker::canvas_height_set (double h) { _canvas_height = h; setup_line (); } ArdourCanvas::Item& -Marker::the_item() const +ArdourMarker::the_item() const { return *group; } void -Marker::set_name (const string& new_name) +ArdourMarker::set_name (const string& new_name) { _name = new_name; @@ -387,13 +387,13 @@ Marker::set_name (const string& new_name) /** @return true if our label is on the left of the mark, otherwise false */ bool -Marker::label_on_left () const +ArdourMarker::label_on_left () const { return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut); } void -Marker::setup_name_display () +ArdourMarker::setup_name_display () { double limit = DBL_MAX; @@ -438,7 +438,7 @@ Marker::setup_name_display () } void -Marker::set_position (framepos_t frame) +ArdourMarker::set_position (framepos_t frame) { unit_position = editor.sample_to_pixel (frame) - _shift; group->set_x_position (unit_position); @@ -447,13 +447,13 @@ Marker::set_position (framepos_t frame) } void -Marker::reposition () +ArdourMarker::reposition () { set_position (frame_position); } void -Marker::show () +ArdourMarker::show () { _shown = true; @@ -462,7 +462,7 @@ Marker::show () } void -Marker::hide () +ArdourMarker::hide () { _shown = false; @@ -471,7 +471,7 @@ Marker::hide () } void -Marker::set_color_rgba (uint32_t c) +ArdourMarker::set_color_rgba (uint32_t c) { _color = c; mark->set_fill_color (_color); @@ -488,7 +488,7 @@ Marker::set_color_rgba (uint32_t c) /** Set the number of pixels that are available for a label to the left of the centre of this marker */ void -Marker::set_left_label_limit (double p) +ArdourMarker::set_left_label_limit (double p) { /* Account for the size of the marker */ _left_label_limit = p - marker_height; @@ -503,7 +503,7 @@ Marker::set_left_label_limit (double p) /** Set the number of pixels that are available for a label to the right of the centre of this marker */ void -Marker::set_right_label_limit (double p) +ArdourMarker::set_right_label_limit (double p) { /* Account for the size of the marker */ _right_label_limit = p - marker_height; @@ -520,7 +520,7 @@ Marker::set_right_label_limit (double p) TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::TempoSection& temp) - : Marker (editor, parent, rgba, text, Tempo, 0, false), + : ArdourMarker (editor, parent, rgba, text, Tempo, 0, false), _tempo (temp) { set_position (_tempo.frame()); @@ -535,7 +535,7 @@ TempoMarker::~TempoMarker () MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::MeterSection& m) - : Marker (editor, parent, rgba, text, Meter, 0, false), + : ArdourMarker (editor, parent, rgba, text, Meter, 0, false), _meter (m) { set_position (_meter.frame()); diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index daa44bf0fa..b769f8d110 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -38,7 +38,7 @@ namespace ARDOUR { class PublicEditor; -class Marker : public sigc::trackable +class ArdourMarker : public sigc::trackable { public: enum Type { @@ -56,12 +56,12 @@ class Marker : public sigc::trackable }; - Marker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type, + ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type, framepos_t frame = 0, bool handle_events = true); - virtual ~Marker (); + virtual ~ArdourMarker (); - static PBD::Signal1 CatchDeletion; + static PBD::Signal1 CatchDeletion; static void setup_sizes (const double timebar_height); @@ -129,11 +129,11 @@ class Marker : public sigc::trackable private: /* disallow copy construction */ - Marker (Marker const &); - Marker & operator= (Marker const &); + ArdourMarker (ArdourMarker const &); + ArdourMarker & operator= (ArdourMarker const &); }; -class TempoMarker : public Marker +class TempoMarker : public ArdourMarker { public: TempoMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&); @@ -145,7 +145,7 @@ class TempoMarker : public Marker ARDOUR::TempoSection& _tempo; }; -class MeterMarker : public Marker +class MeterMarker : public ArdourMarker { public: MeterMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&); diff --git a/gtk2_ardour/marker_selection.h b/gtk2_ardour/marker_selection.h index eea0a3a77d..6d4749f039 100644 --- a/gtk2_ardour/marker_selection.h +++ b/gtk2_ardour/marker_selection.h @@ -24,7 +24,7 @@ #include "marker.h" -struct MarkerSelection : public std::list +struct MarkerSelection : public std::list { void range (ARDOUR::framepos_t& start, ARDOUR::framepos_t& end); }; diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index b5d139b543..63778dfaec 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -71,7 +71,7 @@ class AutomationTimeAxisView; class ControlPoint; class DragManager; class Editor; -class Marker; +class ArdourMarker; class MeterMarker; class MouseCursors; class PlaylistSelector; @@ -346,7 +346,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual bool canvas_region_view_name_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_stream_view_event (GdkEvent* event, ArdourCanvas::Item*, RouteTimeAxisView*) = 0; - virtual bool canvas_marker_event (GdkEvent* event, ArdourCanvas::Item*, Marker*) = 0; + virtual bool canvas_marker_event (GdkEvent* event, ArdourCanvas::Item*, ArdourMarker*) = 0; virtual bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0; virtual bool canvas_tempo_marker_event (GdkEvent* event, ArdourCanvas::Item*, TempoMarker*) = 0; virtual bool canvas_meter_marker_event (GdkEvent* event, ArdourCanvas::Item*, MeterMarker*) = 0; @@ -412,8 +412,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual void get_pointer_position (double &, double &) const = 0; - virtual ARDOUR::Location* find_location_from_marker (Marker *, bool &) const = 0; - virtual Marker* find_marker_from_location_id (PBD::ID const &, bool) const = 0; + virtual ARDOUR::Location* find_location_from_marker (ArdourMarker *, bool &) const = 0; + virtual ArdourMarker* find_marker_from_location_id (PBD::ID const &, bool) const = 0; virtual void snap_to_with_modifier (framepos_t & first, GdkEvent const * ev, diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 0118c1c679..784f646f39 100644 --- 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 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& m) +Selection::add (const list& m) { clear_time (); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity @@ -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); } 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 const &); @@ -132,7 +132,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList void set (boost::shared_ptr); void set (const std::list >&); 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 >&); void toggle (ControlPoint *); void toggle (std::vector 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 >&); void add (ControlPoint *); void add (std::vector const &); - void add (Marker*); - void add (const std::list&); + void add (ArdourMarker*); + void add (const std::list&); 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); void remove (const std::list >&); void remove (const std::list&); - void remove (Marker*); + void remove (ArdourMarker*); void remove (ControlPoint *); void remove_regions (TimeAxisView *); -- cgit v1.2.3