diff --git a/doc/source_tree_layout.txt b/doc/source_tree_layout.txt index 89f728d64c..8d6b3ece5e 100644 --- a/doc/source_tree_layout.txt +++ b/doc/source_tree_layout.txt @@ -114,7 +114,7 @@ libs/ - libs/backends/ (uses libpdb, ardouralsautil | appleutility, implements libardour interface) Interaction with Operating System's Audio/MIDI API: - ALSA, CoreAudio, JACK, PortAudio/ASIO, Pulseaudio + ALSA, CoreAudio, JACK, PortAudio/ASIO, PulseAudio - libs/surfaces/ (uses libpbd, libevoral, libtimecode, libardour ;; libgtkmm2ext, libcanvas) diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index b158a3c1bf..e98a6232ff 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1191,7 +1191,7 @@ AudioEngine::client_real_time_priority () if (!_backend->is_realtime ()) { /* this is only an issue with the Dummy backend. * - with JACK, we require rt permissions. - * - with ALSA/Pulseaudio this can only happen if rt permissions + * - with ALSA/PulseAudio this can only happen if rt permissions * are n/a. Other attempts to get rt will fail likewise. * * perhaps: diff --git a/libs/backends/pulseaudio/pulseaudio_backend.cc b/libs/backends/pulseaudio/pulseaudio_backend.cc index 27d21c4293..1921da4d68 100644 --- a/libs/backends/pulseaudio/pulseaudio_backend.cc +++ b/libs/backends/pulseaudio/pulseaudio_backend.cc @@ -70,7 +70,7 @@ PulseAudioBackend::~PulseAudioBackend () clear_ports (); } -/* Pulseaudio */ +/* PulseAudio */ void PulseAudioBackend::close_pulse (bool unlock) { @@ -334,7 +334,7 @@ PulseAudioBackend::init_pulse () std::string PulseAudioBackend::name () const { - return X_("Pulseaudio"); + return X_("PulseAudio"); } bool @@ -1151,7 +1151,7 @@ static bool already_configured (); static bool available (); static ARDOUR::AudioBackendInfo _descriptor = { - _("Pulseaudio"), + _("PulseAudio"), instantiate, deinstantiate, backend_factory, diff --git a/wscript b/wscript index 09f15d7d43..60b14f795e 100644 --- a/wscript +++ b/wscript @@ -1439,10 +1439,10 @@ int main () { __int128 x = 0; return 0; } conf.fatal("ALSA Backend is only available on Linux") if re.search ("linux", sys.platform) is None and conf.env['BUILD_PULSEAUDIO']: - conf.fatal("Pulseaudio Backend is only available on Linux") + conf.fatal("PulseAudio Backend is only available on Linux") if conf.env['BUILD_PULSEAUDIO'] and not conf.is_defined('HAVE_PULSEAUDIO'): - conf.fatal("Pulseaudio Backend requires libpulse-dev") + conf.fatal("PulseAudio Backend requires libpulse-dev") set_compiler_flags (conf, Options.options) @@ -1558,7 +1558,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('ALSA Backend', conf.env['BUILD_ALSABACKEND']) write_config_text('Dummy backend', conf.env['BUILD_DUMMYBACKEND']) write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) - write_config_text('Pulseaudio Backend', conf.env['BUILD_PULSEAUDIO']) + write_config_text('PulseAudio Backend', conf.env['BUILD_PULSEAUDIO']) config_text.write("\\n\\\n") write_config_text('Buildstack', conf.env['DEPSTACK_REV']) write_config_text('Mac i386 Architecture', opts.generic)