From ace11bd2436b85a1e34e0a4a613debfaaa2bfba9 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 26 Feb 2021 22:22:08 +0100 Subject: [PATCH] Consistency: replace "x-run" with "xrun" (1/2) --- libs/ardour/delayline.cc | 2 +- libs/ardour/disk_writer.cc | 2 +- libs/ardour/route.cc | 6 +++--- libs/backends/alsa/alsa_audiobackend.cc | 4 ++-- libs/backends/alsa/alsa_slave.cc | 2 +- luasession/luasession.cc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/ardour/delayline.cc b/libs/ardour/delayline.cc index 91f6d56e32..135b3795d4 100644 --- a/libs/ardour/delayline.cc +++ b/libs/ardour/delayline.cc @@ -330,7 +330,7 @@ DelayLine::allocate_pending_buffers (samplecnt_t signal_delay, ChanCount const& #if 1 /* If no buffers are required, don't allocate any. * 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 - * usually sufficies for the lifetime of the delayline instance. diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc index 334f1d1413..3106d5c3aa 100644 --- a/libs/ardour/disk_writer.cc +++ b/libs/ardour/disk_writer.cc @@ -632,7 +632,7 @@ DiskWriter::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp if (_xrun_flag) { /* 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); } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index e018ce157c..987794287e 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -2066,8 +2066,8 @@ Route::apply_processor_order (const ProcessorList& new_order) * (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) * - * either way, I can't proove it, but an x-run due to re-order here is less likley - * than an x-run-less 'ardour-silent cycle' both of which effectively "click". + * either way, I can't proove it, but an xrun due to re-order here is less likley + * than an xrun-less 'ardour-silent cycle' both of which effectively "click". */ ProcessorList as_it_will_be; @@ -4047,7 +4047,7 @@ Route::emit_pending_signals () * OTOH its more efficient (less overhead for summoning the butler and * telling her what do do) and signal emission is called * 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 ()) { Glib::Threads::Mutex::Lock lx (selfdestruct_lock); diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index bcb22b1e95..10e7b05978 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -1870,7 +1870,7 @@ AlsaAudioBackend::main_process_thread () if (no_proc_errors > bailout) { PBD::error << string_compose ( - _("AlsaAudioBackend: Audio Process Terminated after %1 consecutive x-runs."), + _("AlsaAudioBackend: Audio Process Terminated after %1 consecutive xruns."), no_proc_errors) << endmsg; break; @@ -1985,7 +1985,7 @@ AlsaAudioBackend::main_process_thread () engine.Xrun (); reset_dll = true; #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); #endif } diff --git a/libs/backends/alsa/alsa_slave.cc b/libs/backends/alsa/alsa_slave.cc index 4332bcc26e..e439675329 100644 --- a/libs/backends/alsa/alsa_slave.cc +++ b/libs/backends/alsa/alsa_slave.cc @@ -207,7 +207,7 @@ AlsaAudioSlave::process_thread () } 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; } diff --git a/luasession/luasession.cc b/luasession/luasession.cc index 45a90e6678..3bea43c49e 100644 --- a/luasession/luasession.cc +++ b/luasession/luasession.cc @@ -544,7 +544,7 @@ usage () -i, --interactive enter interactive mode after executing 'script',\n\ force the interpreter to run interactively\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\ \n"); printf ("\n\