ardour/livetrax
13
0
Fork 0
Code

PulseAudio: use correct casing

Browse Source 
This will also change the internal backend name, so it will miss the
previous 'config' setting '<State backend="Pulseaudio" ...'` and the
session file's '<EngineHints backend="Pulseaudio" ...'. But that is no
big deal after upgrading. Especially after the backend has been broken
for some users for a while.
This commit is contained in:
Mads Kiilerich 2022-11-02 12:27:33 +01:00 committed by Robin Gareus
parent 3fb90523cc
commit 8e7ef0d42c
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source_tree_layout.txt
View File

@ -114,7 +114,7 @@ libs/
- libs/backends/ - libs/backends/
(uses libpdb, ardouralsautil | appleutility, implements libardour interface) (uses libpdb, ardouralsautil | appleutility, implements libardour interface)
Interaction with Operating System's Audio/MIDI API: Interaction with Operating System's Audio/MIDI API:
ALSA, CoreAudio, JACK, PortAudio/ASIO, Pulseaudio ALSA, CoreAudio, JACK, PortAudio/ASIO, PulseAudio
- libs/surfaces/ - libs/surfaces/
(uses libpbd, libevoral, libtimecode, libardour ;; libgtkmm2ext, libcanvas) (uses libpbd, libevoral, libtimecode, libardour ;; libgtkmm2ext, libcanvas)

2
libs/ardour/audioengine.cc
View File

@ -1191,7 +1191,7 @@ AudioEngine::client_real_time_priority ()
if (!_backend->is_realtime ()) { if (!_backend->is_realtime ()) {
/* this is only an issue with the Dummy backend. /* this is only an issue with the Dummy backend.
* - with JACK, we require rt permissions. * - 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. * are n/a. Other attempts to get rt will fail likewise.
* *
* perhaps: * perhaps:

6
libs/backends/pulseaudio/pulseaudio_backend.cc
View File

@ -70,7 +70,7 @@ PulseAudioBackend::~PulseAudioBackend ()
clear_ports (); clear_ports ();
} }
/* Pulseaudio */ /* PulseAudio */
void void
PulseAudioBackend::close_pulse (bool unlock) PulseAudioBackend::close_pulse (bool unlock)
{ {
@ -334,7 +334,7 @@ PulseAudioBackend::init_pulse ()
std::string std::string
PulseAudioBackend::name () const PulseAudioBackend::name () const
{ {
return X_("Pulseaudio"); return X_("PulseAudio");
} }
bool bool
@ -1151,7 +1151,7 @@ static bool already_configured ();
static bool available (); static bool available ();
static ARDOUR::AudioBackendInfo _descriptor = { static ARDOUR::AudioBackendInfo _descriptor = {
_("Pulseaudio"), _("PulseAudio"),
instantiate, instantiate,
deinstantiate, deinstantiate,
backend_factory, backend_factory,

6
wscript
View File

@ -1439,10 +1439,10 @@ int main () { __int128 x = 0; return 0; }
conf.fatal("ALSA Backend is only available on Linux") conf.fatal("ALSA Backend is only available on Linux")
if re.search ("linux", sys.platform) is None and conf.env['BUILD_PULSEAUDIO']: 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'): 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) 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('ALSA Backend', conf.env['BUILD_ALSABACKEND'])
write_config_text('Dummy backend', conf.env['BUILD_DUMMYBACKEND']) write_config_text('Dummy backend', conf.env['BUILD_DUMMYBACKEND'])
write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) 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") config_text.write("\\n\\\n")
write_config_text('Buildstack', conf.env['DEPSTACK_REV']) write_config_text('Buildstack', conf.env['DEPSTACK_REV'])
write_config_text('Mac i386 Architecture', opts.generic) write_config_text('Mac i386 Architecture', opts.generic)