diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
commit | 93c7aeba048f19df5abee5e4325ef8b0ef62c279 (patch) | |
tree | 5bc2149d17fb5272c5b6284f7e902faad39a92f7 /gtk2_ardour/marker_time_axis_view.cc | |
parent | 3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (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_time_axis_view.cc')
-rw-r--r-- | gtk2_ardour/marker_time_axis_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index 53e0aa8758..55d5742e8e 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -199,7 +199,7 @@ MarkerTimeAxisView::apply_color(Gdk::Color& color) * @param src the identity of the object that initiated the change */ MarkerView* -MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, jack_nframes_t start, jack_nframes_t dur, void* src) +MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, nframes_t start, nframes_t dur, void* src) { if(ifv->has_marker_view_item(mark_id)) { @@ -345,7 +345,7 @@ MarkerTimeAxisView::set_marker_duration_sec(double sec) { if(get_selected_time_axis_item() != 0) { - get_selected_time_axis_item()->set_duration((jack_nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ; + get_selected_time_axis_item()->set_duration((nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ; } } |