From cb0d9f5607da6465efa619cc7f5fb2152bf1b498 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 27 Jun 2017 15:32:30 -0400 Subject: [PATCH] remove InputConfigurationChange from session events, since it is a no-op in this development branch --- libs/ardour/ardour/session.h | 1 - libs/ardour/ardour/session_event.h | 1 - libs/ardour/session.cc | 6 ------ libs/ardour/session_process.cc | 5 ----- libs/ardour/session_transport.cc | 9 --------- 5 files changed, 22 deletions(-) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 1175ec189c..6a61293642 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -432,7 +432,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void request_overwrite_buffer (boost::shared_ptr); void adjust_playback_buffering(); void adjust_capture_buffering(); - void request_input_change_handling (); bool locate_pending() const { return static_cast(post_transport_work()&PostTransportLocate); } bool declick_out_pending() const { return static_cast(transport_sub_state&(PendingDeclickOut)); } diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index 2780924c27..7649960ee1 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -52,7 +52,6 @@ public: Overwrite, SetSyncSource, Audition, - InputConfigurationChange, SetPlayAudioRange, CancelPlayAudioRange, RealTimeOperation, diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 01c8bfa62f..b658487969 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -5721,12 +5721,6 @@ Session::graph_reordered () return; } - /* every track/bus asked for this to be handled but it was deferred because - we were connecting. do it now. - */ - - request_input_change_handling (); - resort_routes (); /* force all diskstreams to update their capture offset values to diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 9254a8c1ec..a162303d42 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -1242,11 +1242,6 @@ Session::process_event (SessionEvent* ev) ev->region.reset (); break; - case SessionEvent::InputConfigurationChange: - add_post_transport_work (PostTransportInputChange); - _butler->schedule_transport_work (); - break; - case SessionEvent::SetPlayAudioRange: set_play_range (ev->audio_range, (ev->speed == 1.0f)); break; diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index f8f241d11a..3cd5d77709 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -76,15 +76,6 @@ Session::add_post_transport_work (PostTransportWork ptw) error << "Could not set post transport work! Crazy thread madness, call the programmers" << endmsg; } -void -Session::request_input_change_handling () -{ - if (!(_state_of_the_state & (InitialConnecting|Deletion))) { - SessionEvent* ev = new SessionEvent (SessionEvent::InputConfigurationChange, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); - queue_event (ev); - } -} - void Session::request_sync_source (Slave* new_slave) { -- 2.30.2