diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-02 15:24:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-02 15:24:53 +0000 |
| commit | a48742043be3ecc3d0522ae48ff4401665d7e83f (patch) | |
| tree | 7e4fe1effd2a924a6db19f61568deadd8644859f /libs/ardour | |
| parent | 3dd7f05fb1a5a1bd693abb2098e0fb65a8686313 (diff) | |
remove PBD::Connection (replace use with PBD::ScopedConnection); remove limitation on transport roll after session end
git-svn-id: svn://localhost/ardour2/branches/3.0@6834 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/audiosource.h | 2 | ||||
| -rw-r--r-- | libs/ardour/audiosource.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_transport.cc | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index c39dbdfd8c..e78fb049d7 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -72,7 +72,7 @@ class AudioSource : virtual public Source, framepos_t start, framecnt_t cnt, double samples_per_visual_peak) const; int build_peaks (); - bool peaks_ready (boost::function<void()> callWhenReady, PBD::Connection& connection_created_if_not_ready, PBD::EventLoop* event_loop) const; + bool peaks_ready (boost::function<void()> callWhenReady, PBD::ScopedConnection& connection_created_if_not_ready, PBD::EventLoop* event_loop) const; mutable PBD::Signal0<void> PeaksReady; mutable PBD::Signal2<void,framepos_t,framepos_t> PeakRangeReady; diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index f3206412f8..8a367f32a7 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -149,7 +149,7 @@ AudioSource::update_length (sframes_t pos, sframes_t cnt) ***********************************************************************/ bool -AudioSource::peaks_ready (boost::function<void()> doThisWhenReady, Connection& connect_here_if_not, EventLoop* event_loop) const +AudioSource::peaks_ready (boost::function<void()> doThisWhenReady, ScopedConnection& connect_here_if_not, EventLoop* event_loop) const { bool ret; Glib::Mutex::Lock lm (_peaks_ready_lock); diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index db06a2d703..a7f347da5c 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -933,10 +933,6 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state) /* we are stopped and we want to start rolling at speed 1 */ - if (!get_record_enabled() && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) { - return; - } - if (Config->get_monitoring_model() == HardwareMonitoring) { boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader(); @@ -957,12 +953,6 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state) } else { - /* if not recording, don't roll forward past end if told to stop there */ - - if (!get_record_enabled() && (speed > 0.0 && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame())) { - return; - } - if ((synced_to_jack()) && speed != 0.0 && speed != 1.0) { warning << string_compose (_("Global varispeed cannot be supported while %1 is connected to JACK transport control"), PROGRAM_NAME) |