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

Consistency: replace "x-run" with "xrun" (1/2)

Browse source
This commit is contained in:
Robin Gareus 2021-02-26 22:22:08 +01:00
parent 355528781d
commit ace11bd243
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/delayline.cc
View file

@ -330,7 +330,7 @@ DelayLine::allocate_pending_buffers (samplecnt_t signal_delay, ChanCount const&
#if 1 #if 1
/* If no buffers are required, don't allocate any. /* If no buffers are required, don't allocate any.
* This may backfire later, allocating buffers on demand * This may backfire later, allocating buffers on demand
* may take time and cause x-runs. * may take time and cause xruns.
* *
* The default buffersize is 4 * 16kB and - once allocated - * The default buffersize is 4 * 16kB and - once allocated -
* usually sufficies for the lifetime of the delayline instance. * usually sufficies for the lifetime of the delayline instance.

2
libs/ardour/disk_writer.cc
View file

@ -632,7 +632,7 @@ DiskWriter::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
if (_xrun_flag) { if (_xrun_flag) {
/* There still are `Port::resampler_quality () -1` samples in the resampler /* There still are `Port::resampler_quality () -1` samples in the resampler
* buffer from before the x-run. */ * buffer from before the xrun. */
_xruns.push_back (_capture_captured + Port::resampler_quality () - 1); _xruns.push_back (_capture_captured + Port::resampler_quality () - 1);
} }

6
libs/ardour/route.cc
View file

@ -2066,8 +2066,8 @@ Route::apply_processor_order (const ProcessorList& new_order)
* (note though that ::processors_reorder_needs_configure() ensured that * (note though that ::processors_reorder_needs_configure() ensured that
* this function will only ever be called from the rt-thread if no processor were removed) * this function will only ever be called from the rt-thread if no processor were removed)
* *
* either way, I can't proove it, but an x-run due to re-order here is less likley * either way, I can't proove it, but an xrun due to re-order here is less likley
* than an x-run-less 'ardour-silent cycle' both of which effectively "click". * than an xrun-less 'ardour-silent cycle' both of which effectively "click".
*/ */
ProcessorList as_it_will_be; ProcessorList as_it_will_be;
@ -4047,7 +4047,7 @@ Route::emit_pending_signals ()
* OTOH its more efficient (less overhead for summoning the butler and * OTOH its more efficient (less overhead for summoning the butler and
* telling her what do do) and signal emission is called * telling her what do do) and signal emission is called
* directly after the process callback, which decreases the chance * directly after the process callback, which decreases the chance
* of x-runs when taking the locks. * of xruns when taking the locks.
*/ */
while (!selfdestruct_sequence.empty ()) { while (!selfdestruct_sequence.empty ()) {
Glib::Threads::Mutex::Lock lx (selfdestruct_lock); Glib::Threads::Mutex::Lock lx (selfdestruct_lock);

4
libs/backends/alsa/alsa_audiobackend.cc
View file

@ -1870,7 +1870,7 @@ AlsaAudioBackend::main_process_thread ()
if (no_proc_errors > bailout) { if (no_proc_errors > bailout) {
PBD::error PBD::error
<< string_compose ( << string_compose (
_("AlsaAudioBackend: Audio Process Terminated after %1 consecutive x-runs."), _("AlsaAudioBackend: Audio Process Terminated after %1 consecutive xruns."),
no_proc_errors) no_proc_errors)
<< endmsg; << endmsg;
break; break;
@ -1985,7 +1985,7 @@ AlsaAudioBackend::main_process_thread ()
engine.Xrun (); engine.Xrun ();
reset_dll = true; reset_dll = true;
#if 0 #if 0
fprintf(stderr, "ALSA x-run read: %.2f ms, write: %.2f ms\n", fprintf(stderr, "ALSA xrun read: %.2f ms, write: %.2f ms\n",
_pcmi->capt_xrun() * 1000.0, _pcmi->play_xrun() * 1000.0); _pcmi->capt_xrun() * 1000.0, _pcmi->play_xrun() * 1000.0);
#endif #endif
} }

2
libs/backends/alsa/alsa_slave.cc
View file

@ -207,7 +207,7 @@ AlsaAudioSlave::process_thread ()
} }
if (no_proc_errors > bailout) { if (no_proc_errors > bailout) {
PBD::error << _("AlsaAudioBackend: Slave terminated due to continuous x-runs.") << endmsg; PBD::error << _("AlsaAudioBackend: Slave terminated due to continuous xruns.") << endmsg;
break; break;
} }

2
luasession/luasession.cc
View file

@ -544,7 +544,7 @@ usage ()
-i, --interactive enter interactive mode after executing 'script',\n\ -i, --interactive enter interactive mode after executing 'script',\n\
force the interpreter to run interactively\n\ force the interpreter to run interactively\n\
-X, --exit-when-halted terminate when the audio-engine halts\n\ -X, --exit-when-halted terminate when the audio-engine halts\n\
unexpectedly (disconnect, or too many x-runs)\n\ unexpectedly (disconnect, or too many xruns)\n\
-V, --version print version information and exit\n\ -V, --version print version information and exit\n\
\n"); \n");
printf ("\n\ printf ("\n\