Merged with trunk R992.

[ardour.git] / gtk2_ardour / marker_view.cc

diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc
index d73440ad540a7f3e8a2fd8ce18127620d315e7fa..f45a3ce9710432e7de3d6ee876a969db98a77dad 100644 (file)
--- a/gtk2_ardour/marker_view.cc
+++ b/gtk2_ardour/marker_view.cc
@@ -54,8 +54,8 @@ MarkerView::MarkerView(ArdourCanvas::Group *parent,
                       Gdk::Color& basic_color,
                       std::string mark_type,
                       std::string mark_id,
-                      jack_nframes_t start,
-                      jack_nframes_t duration)
+                      nframes_t start,
+                      nframes_t duration)
   : TimeAxisViewItem(mark_id, *parent,*tv,spu,basic_color,start,duration)
 {
        mark_type_text = mark_type ;