From b01bdb7e70f021da764e81a4b55722e746e4885d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 12 Nov 2007 22:23:01 +0000 Subject: merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/public_editor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/public_editor.h') diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index f32c0565e3..3410dc025a 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -85,7 +85,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway PublicEditor (); virtual ~PublicEditor (); - typedef list TrackViewList; + typedef TrackSelection TrackViewList; /** @return Singleton PublicEditor instance */ static PublicEditor& instance () { return *_instance; } @@ -252,7 +252,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway virtual void remove_last_capture () = 0; virtual void maximise_editing_space () = 0; virtual void restore_editing_space () = 0; - virtual nframes_t edit_cursor_position (bool sync) = 0; + virtual nframes64_t get_preferred_edit_position () = 0; #ifdef WITH_CMT virtual void add_imageframe_time_axis(const std::string & track_name, void*) = 0; -- cgit v1.2.3