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_canvas_events.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_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |