summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-07-23 13:23:47 +0200
committerRobin Gareus <robin@gareus.org>2015-07-23 17:58:40 +0200
commite1f168de110322e7024dfa334b97f3b433907ae1 (patch)
treebd700545929b7aa5ec95c69b88a5a4e983845547 /gtk2_ardour/editor.cc
parent2cc64168d379790eb3d162cd59b7f1a8effb4156 (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.cc')
-rw-r--r--gtk2_ardour/editor.cc2
1 files changed, 1 insertions, 1 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;