Merged with trunk R992.

[ardour.git] / gtk2_ardour / marker_time_axis_view.h

diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h
index 1dd742a4591060f8e63a43b755b57014afab5924..4853f298552cdb998eb7eeacb2fa2f2a113067ce 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -131,7 +131,7 @@ class MarkerTimeAxisView : public sigc::trackable
                 * @param duration the duration the new item should be placed upon the timeline
                 * @param src the identity of the object that initiated the change
                 */
-               MarkerView* add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, jack_nframes_t start, jack_nframes_t dur, void* src) ;
+               MarkerView* add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, nframes_t start, nframes_t dur, void* src) ;
                
                /**
                 * Returns the named MarkerView or 0 if the named marker does not exist