diff options
| author | Jesse Chappell <jesse@essej.net> | 2007-04-09 00:54:39 +0000 |
|---|---|---|
| committer | Jesse Chappell <jesse@essej.net> | 2007-04-09 00:54:39 +0000 |
| commit | be02eafef023ef21766abb3d684de74ea88d41b0 (patch) | |
| tree | 216c0f49c04f5dafc3370a91e3aa73d1770b0062 | |
| parent | 241af666ae155b8ebbdb10fb61f0d7cc2bc4c32d (diff) | |
fixed previous fix of initial autoplay issue, autoplay now works again
git-svn-id: svn://localhost/ardour2/trunk@1686 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_transport.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 53b6888dcb..8fa4f283f8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -187,7 +187,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) keybindings_path = ARDOUR::find_config_file ("ardour.bindings"); can_save_keybindings = false; - Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle)); last_configure_time.tv_sec = 0; last_configure_time.tv_usec = 0; diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 15940c2e56..c3b82c74a8 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -146,6 +146,8 @@ ARDOUR_UI::connect_to_session (Session *s) AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes)); + Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle)); + start_clocking (); start_blinking (); diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 950d74edec..e4811ca18d 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -639,7 +639,7 @@ Session::locate (nframes_t target_frame, bool with_roll, bool with_flush, bool w } } - if (transport_rolling() && (!auto_play_legal || Config->get_auto_play()) && !with_roll && !(synced_to_jack() && play_loop)) { + if (transport_rolling() && (!auto_play_legal || !Config->get_auto_play()) && !with_roll && !(synced_to_jack() && play_loop)) { realtime_stop (false); } |