leftmost_position => leftmost_sample, current_page_frames => current_page_samples

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index fb31ba513a0543e4caf227f8af6e6d8dda71919b..256a1a593e44b41f947a4f365747d416353bf2a0 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -121,9 +121,7 @@ ARDOUR_UI::set_session (Session *s)
        secondary_clock->set_session (s);
        big_clock->set_session (s);
        time_info_box->set_session (s);
-#ifdef WITH_VIDEOTIMELINE
        video_timeline->set_session (s);
-#endif
 
        /* sensitize menu bar options that are now valid */
 
@@ -215,15 +213,10 @@ ARDOUR_UI::set_session (Session *s)
 int
 ARDOUR_UI::unload_session (bool hide_stuff)
 {
-#ifdef WITH_VIDEOTIMELINE
        if (_session) {
-               /* close video-monitor
-                * this needed to enfore querying its settings (window size,..)
-                * which are reported asynchroneously.
-                */
-               ARDOUR_UI::instance()->video_timeline->close_session();
+               ARDOUR_UI::instance()->video_timeline->sync_session_state();
        }
-#endif
+
        if (_session && _session->dirty()) {
                std::vector<std::string> actions;
                actions.push_back (_("Don't close"));
@@ -231,7 +224,6 @@ ARDOUR_UI::unload_session (bool hide_stuff)
                actions.push_back (_("Save and close"));
                switch (ask_about_saving_session (actions)) {
                case -1:
-                       ARDOUR_UI::instance()->video_timeline->set_session(_session);
                        // cancel
                        return 1;
 
@@ -256,6 +248,8 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        rec_button.set_sensitive (false);
 
+       ARDOUR_UI::instance()->video_timeline->close_session();
+
        stop_blinking ();
        stop_clocking ();