summaryrefslogtreecommitdiff
path: root/gtk2_ardour/marker.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-09-28 17:23:52 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-09-28 17:23:52 +0000
commit93c7aeba048f19df5abee5e4325ef8b0ef62c279 (patch)
tree5bc2149d17fb5272c5b6284f7e902faad39a92f7 /gtk2_ardour/marker.cc
parent3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (diff)
fixes for destructive track offsets of various kinds; move from jack_nframes_t -> nframes_t
git-svn-id: svn://localhost/ardour2/trunk@933 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
-rw-r--r--gtk2_ardour/marker.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index fb2afb00b4..d5517b4bce 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -29,7 +29,7 @@
#include "i18n.h"
Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation,
- Type type, jack_nframes_t frame, bool handle_events)
+ Type type, nframes_t frame, bool handle_events)
: editor (ed), _type(type)
{
@@ -289,7 +289,7 @@ Marker::set_name (const string& name)
}
void
-Marker::set_position (jack_nframes_t frame)
+Marker::set_position (nframes_t frame)
{
double new_unit_position = editor.frame_to_unit (frame);
new_unit_position -= shift;