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/editor_tempodisplay.cc | |
| 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/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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<Marker *> (item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast<ArdourMarker *> (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<Marker *> (item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) { fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg; abort(); /*NOTREACHED*/ } |