projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2747260
)
remove InputConfigurationChange from session events, since it is a no-op in this...
author
Paul Davis
<paul@linuxaudiosystems.com>
Tue, 27 Jun 2017 19:32:30 +0000
(15:32 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 18 Sep 2017 15:40:53 +0000
(11:40 -0400)
libs/ardour/ardour/session.h
patch
|
blob
|
history
libs/ardour/ardour/session_event.h
patch
|
blob
|
history
libs/ardour/session.cc
patch
|
blob
|
history
libs/ardour/session_process.cc
patch
|
blob
|
history
libs/ardour/session_transport.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/ardour/session.h
b/libs/ardour/ardour/session.h
index 1175ec189c82e1b045ad9071fe4dd3c7b6ce547b..6a61293642034f840a09e4a83f4531203d696b76 100644
(file)
--- 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<Route>);
void adjust_playback_buffering();
void adjust_capture_buffering();
void request_overwrite_buffer (boost::shared_ptr<Route>);
void adjust_playback_buffering();
void adjust_capture_buffering();
- void request_input_change_handling ();
bool locate_pending() const { return static_cast<bool>(post_transport_work()&PostTransportLocate); }
bool declick_out_pending() const { return static_cast<bool>(transport_sub_state&(PendingDeclickOut)); }
bool locate_pending() const { return static_cast<bool>(post_transport_work()&PostTransportLocate); }
bool declick_out_pending() const { return static_cast<bool>(transport_sub_state&(PendingDeclickOut)); }
diff --git
a/libs/ardour/ardour/session_event.h
b/libs/ardour/ardour/session_event.h
index 2780924c276ad12138bc9ed713103047206ec5ff..7649960ee1d0dd3f526b9c8cd34ab370294ffdba 100644
(file)
--- a/
libs/ardour/ardour/session_event.h
+++ b/
libs/ardour/ardour/session_event.h
@@
-52,7
+52,6
@@
public:
Overwrite,
SetSyncSource,
Audition,
Overwrite,
SetSyncSource,
Audition,
- InputConfigurationChange,
SetPlayAudioRange,
CancelPlayAudioRange,
RealTimeOperation,
SetPlayAudioRange,
CancelPlayAudioRange,
RealTimeOperation,
diff --git
a/libs/ardour/session.cc
b/libs/ardour/session.cc
index 01c8bfa62f5db7d00aa9003596250400e078695d..b658487969c3827479096ab426e66c538c20892d 100644
(file)
--- a/
libs/ardour/session.cc
+++ b/
libs/ardour/session.cc
@@
-5721,12
+5721,6
@@
Session::graph_reordered ()
return;
}
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
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 9254a8c1ec329ad7bfc3a60277ebdf91db69c5e6..a162303d428980e6f6358962c76fb13feb21c487 100644
(file)
--- 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;
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;
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 f8f241d11ab8805453fb40f7b533db9a2416176d..3cd5d77709ba08390e9bc7ec2a0c3c51e0445f09 100644
(file)
--- 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;
}
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)
{
void
Session::request_sync_source (Slave* new_slave)
{