smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Remove Session::process_can_proceed

Browse source 
Auditioning uses dedicated callback method. There is no need to
return early when starting to audition.
butler_completed_transport_work() which handles PostTransportAudition
and switches process-callbacks happens in sync in Session::process().
This commit is contained in:
Robin Gareus 2022-02-02 15:55:12 +01:00
parent 65e3177910
commit 58d81f0227
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/session.h
View file

@ -1613,8 +1613,6 @@ private:
TransportFSM* _transport_fsm; TransportFSM* _transport_fsm;
static const PostTransportWork ProcessCannotProceedMask = PostTransportWork (PostTransportAudition);
GATOMIC_QUAL gint _post_transport_work; /* accessed only atomic ops */ GATOMIC_QUAL gint _post_transport_work; /* accessed only atomic ops */
PostTransportWork post_transport_work() const { return (PostTransportWork) g_atomic_int_get (const_cast<GATOMIC_QUAL gint*> (&_post_transport_work)); } PostTransportWork post_transport_work() const { return (PostTransportWork) g_atomic_int_get (const_cast<GATOMIC_QUAL gint*> (&_post_transport_work)); }
void set_post_transport_work (PostTransportWork ptw) { g_atomic_int_set (&_post_transport_work, (gint) ptw); } void set_post_transport_work (PostTransportWork ptw) { g_atomic_int_set (&_post_transport_work, (gint) ptw); }
@ -1836,7 +1834,6 @@ private:
int fail_roll (pframes_t nframes); int fail_roll (pframes_t nframes);
bool non_realtime_work_pending() const { return static_cast<bool>(post_transport_work()); } bool non_realtime_work_pending() const { return static_cast<bool>(post_transport_work()); }
bool process_can_proceed() const { return !(post_transport_work() & ProcessCannotProceedMask); }
MidiControlUI* midi_control_ui; MidiControlUI* midi_control_ui;

15
libs/ardour/session_process.cc
View file

@ -490,11 +490,6 @@ Session::process_with_events (pframes_t nframes)
send_full_time_code (_transport_sample, nframes); send_full_time_code (_transport_sample, nframes);
} }
if (!process_can_proceed()) {
_silent = true;
return;
}
if (events.empty() || next_event == events.end()) { if (events.empty() || next_event == events.end()) {
try_run_lua (nframes); // also during export ?? ->move to process_without_events() try_run_lua (nframes); // also during export ?? ->move to process_without_events()
/* lua scripts may inject events */ /* lua scripts may inject events */
@ -518,11 +513,6 @@ Session::process_with_events (pframes_t nframes)
SessionEvent* this_event; SessionEvent* this_event;
Events::iterator the_next_one; Events::iterator the_next_one;
if (!process_can_proceed()) {
_silent = true;
return;
}
if (!_exporting && config.get_external_sync()) { if (!_exporting && config.get_external_sync()) {
if (!implement_master_strategy ()) { if (!implement_master_strategy ()) {
no_roll (nframes); no_roll (nframes);
@ -656,11 +646,6 @@ Session::process_without_events (pframes_t nframes)
bool session_needs_butler = false; bool session_needs_butler = false;
samplecnt_t samples_moved; samplecnt_t samples_moved;
if (!process_can_proceed()) {
_silent = true;
return;
}
if (!_exporting && config.get_external_sync()) { if (!_exporting && config.get_external_sync()) {
if (!implement_master_strategy ()) { if (!implement_master_strategy ()) {
no_roll (nframes); no_roll (nframes);