Fix for edit cursor clock being out of sync with edit cursor when session is loaded

git-svn-id: svn://localhost/ardour2/trunk@1560 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/ardour_ui.cc

@@ -1992,6 +1992,7 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string*
 		session->set_clean ();
 	}
 
+	editor->edit_cursor_position (true);
 	return 0;
 }
 

gtk2_ardour/editor.cc

@@ -3684,3 +3684,12 @@ Editor::sort_track_selection ()
 	selection->tracks.sort (cmp);
 }
 
+nframes_t
+Editor::edit_cursor_position(bool sync)
+{
+	if (sync && edit_cursor->current_frame != edit_cursor_clock.current_time()) {
+		edit_cursor_clock.set(edit_cursor->current_frame, true);
+	}
+
+	return edit_cursor->current_frame;
+}

gtk2_ardour/editor.h

@@ -339,6 +339,8 @@ class Editor : public PublicEditor
 	void reset_zoom (double);
 	void reposition_and_zoom (nframes_t, double);
 
+	nframes_t edit_cursor_position(bool);
+
   protected:
 	void map_transport_state ();
 	void map_position_change (nframes_t);

gtk2_ardour/public_editor.h

@@ -134,6 +134,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;
 
 	sigc::signal<void> ZoomFocusChanged;
 	sigc::signal<void> ZoomChanged;