diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md index 91ead5b1e..4ee13f9c8 100644 --- a/.github/ISSUE_TEMPLATE/1-bug-report.md +++ b/.github/ISSUE_TEMPLATE/1-bug-report.md @@ -15,14 +15,14 @@ title: ### Reproduction steps -> Provide a minimal example of how to reproduce the problem. State `bluealsa` +> Provide a minimal example of how to reproduce the problem. State `bluealsad` > command line arguments and the content of .asoundrc file (if PCM alias with > "type bluealsa" was added to that file). ### Setup > - the OS distribution and version -> - the version of BlueALSA (`bluealsa --version`) +> - the version of BlueALSA (`bluealsad --version`) > - the version of BlueZ (`bluetoothd --version`) > - the version of ALSA (`aplay --version`) > - if self-built from source, please state the branch and commit @@ -31,6 +31,6 @@ title: ### Additional context > Add any other context about the problem here, e.g. log messages printed by -> `bluealsa` and/or client application. +> `bluealsad` and/or client application. > > Please delete instructions prefixed with '>' to prove you have read them. diff --git a/.github/spellcheck-wordlist.txt b/.github/spellcheck-wordlist.txt index 1b28de7b9..98783a73c 100644 --- a/.github/spellcheck-wordlist.txt +++ b/.github/spellcheck-wordlist.txt @@ -146,6 +146,7 @@ BCS bdaddr bfr bluealsa +bluealsad BlueALSA's bluetoothctl bluetoothd diff --git a/INSTALL.md b/INSTALL.md index ab3c1b20c..733c150a3 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -75,8 +75,8 @@ See the [systemd integration][] wiki page for more information. [systemd integration]: https://github.com/arkq/bluez-alsa/wiki/Systemd-integration -If intending to run the `bluealsa` daemon as a non-root user then it is -recommended to use the `--with-bluealsauser=USER` option as this will configure +If intending to run the `bluealsad` daemon as a non-root user then it is +recommended to use the `--with-bluealsaduser=USER` option as this will configure the BlueALSA D-Bus policy file with correct permissions for that user account, and also include that user in the systemd service unit file when used in combination with `--enable-systemd`. @@ -135,9 +135,9 @@ the `bluealsa.service` unit at runtime. If not using `systemd`, or if the necessary to manually create the directory used by BlueALSA for persistent state storage. This directory should be called `bluealsa` and be located under the system local state directory, which is normally `/var/lib`. The directory -owner must be the user account that the `bluealsa` daemon is run under, and +owner must be the user account that the `bluealsad` daemon is run under, and to prevent accidental corruption of the state files the permissions should be -`rwx------`. For example, on a standard file hierarchy, with the `bluealsa` +`rwx------`. For example, on a standard file hierarchy, with the `bluealsad` daemon running as user `bluealsa`: ```sh @@ -152,11 +152,11 @@ The BlueALSA installation does not create any user accounts. ### D-Bus policy -A D-Bus policy file is required to enable the `bluealsa` daemon to register +A D-Bus policy file is required to enable the `bluealsad` daemon to register with D-Bus as a service. The default policy file created by the BlueALSA installation enables `root` to register the service `org.bluealsa` and enables members of the group `audio` to use BlueALSA PCMs and the BlueALSA mixer. If -the option `--with-bluealsauser=USER` was used when configuring then the +the option `--with-bluealsaduser=USER` was used when configuring then the policy file enables user USER instead of `root` to register the `org.bluealsa` service. If that option was not used, then it is necessary to edit the policy file to grant permission to a non-root user. The policy file is located at diff --git a/NEWS b/NEWS index da60f6aa9..0633bbc63 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,9 @@ unreleased ========== -- renamed bluealsa-cli to bluealsactl (no backward compatibility) +- renamed bluealsa to bluealsad (no backward compatibility) - renamed bluealsa.conf to org.bluealsa.conf (no backward compatibility) +- renamed bluealsa-cli to bluealsactl (no backward compatibility) bluez-alsa v4.3.0 (2024-08-13) ============================== diff --git a/README.md b/README.md index 2e46ac809..643e106a4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,14 @@ # Bluetooth Audio ALSA Backend +> [!WARNING] +> The latest source uses new names for some core components: +> +> * The `bluealsa` daemon is now called `bluealsad` +> * The `bluealsa-cli` utility is now called `bluealsactl` +> +> See the wiki guide [Migrating from release 4.3.0 or earlier](https://github.com/arkq/bluez-alsa/wiki/Migrating-from-release-4.3.0-or-earlier) +> for more information. + [![Build Status](https://github.com/arkq/bluez-alsa/actions/workflows/build-and-test.yaml/badge.svg)](https://github.com/arkq/bluez-alsa/actions/workflows/build-and-test.yaml) [![Code Coverage](https://codecov.io/gh/arkq/bluez-alsa/branch/master/graph/badge.svg)](https://app.codecov.io/gh/arkq/bluez-alsa) @@ -36,7 +45,7 @@ ALSA sound card support. Note this means that the applications are constrained by the capabilities of the ALSA API, and the higher-level audio processing features of audio servers such as PulseAudio and PipeWire are not available. -BlueALSA consists of the daemon `bluealsa`, ALSA plug-ins, and a number of +BlueALSA consists of the daemon `bluealsad`, ALSA plug-ins, and a number of utilities. The basic context is shown in this diagram: ```mermaid @@ -45,7 +54,7 @@ classDef external fill:#eee,stroke:#333,stroke-width:4px,color:black; classDef bluealsa fill:#bbf,stroke:#333,stroke-width:4px,color:black; A[Bluetooth Adapter] <--> B((bluetoothd\ndaemon)) -A <--> C((bluealsa daemon)) +A <--> C((bluealsad daemon)) B <--> C C <--> D((bluealsa-aplay)) D --> E([ALSA libasound]) @@ -63,7 +72,7 @@ class A,B,E,H,I,J,K,L,M,N external; class C,D,F,G bluealsa; ``` -The heart of BlueALSA is the daemon `bluealsa` which interfaces with the BlueZ +The heart of BlueALSA is the daemon `bluealsad` which interfaces with the BlueZ Bluetooth daemon `bluetoothd` and the local Bluetooth adapter. It handles the profile connection and configuration logic for A2DP, HFP and HSP and presents the resulting audio streams to applications via D-Bus. @@ -99,23 +108,23 @@ Build and install instructions are included in the file ## Usage -### bluealsa daemon +### bluealsad daemon -The main component of BlueALSA is a program called `bluealsa`. By default, this -program shall be run as a root during system startup. It will register +The main component of BlueALSA is a program called `bluealsad`. By default, +this program shall be run as a root during system startup. It will register `org.bluealsa` service in the D-Bus system bus, which can be used for accessing configured audio devices. In general, BlueALSA acts as a proxy between BlueZ and ALSA. -The `bluealsa` daemon must be running in order to pair, connect, and use +The `bluealsad` daemon must be running in order to pair, connect, and use remote Bluetooth audio devices. In order to stream audio to e.g. a Bluetooth headset, firstly one has to connect the device. If you are not familiar with the Bluetooth pairing and connecting procedures on Linux, there is a basic guide in the wiki: [Bluetooth pairing and connecting](https://github.com/arkq/bluez-alsa/wiki/Bluetooth-Pairing-And-Connecting). -For details of command-line options to `bluealsa`, consult the [bluealsa manual -page](doc/bluealsa.8.rst). +For details of command-line options to `bluealsad`, consult the [bluealsad +manual page](doc/bluealsad.8.rst). ### ALSA plug-ins @@ -140,8 +149,8 @@ the [ALSA Kernel proc interface][]. [ALSA software PCM I/O plug-in]: https://www.alsa-project.org/alsa-doc/alsa-lib/pcm_external_plugins.html [ALSA Kernel proc interface]: https://www.kernel.org/doc/html/latest/sound/designs/procfile.html -Setup parameters of the bluealsa PCM device can be set in the local `.asoundrc` -configuration file like this: +Setup parameters of the `bluealsa` PCM device can be set in the local +`.asoundrc` configuration file like this: ```sh cat ~/.asoundrc diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md index df32ba6e7..76013b719 100644 --- a/TROUBLESHOOTING.md +++ b/TROUBLESHOOTING.md @@ -56,8 +56,8 @@ name `bluealsa` in addition to being able to run as `root`: - Another instance of the BlueALSA service is already running.\ To run a second instance of the BlueALSA service, it must use a different well-known service name. This will also require updating the BlueALSA D-Bus -policy file. See the manual page [bluealsa(8)][] for more information and an -example of running multiple `bluealsa` instances. +policy file. See the manual page [bluealsad(8)][] for more information and an +example of running multiple `bluealsad` instances. If the D-Bus policy file is edited, then it is necessary to refresh the D-Bus service for the change to take effect. On most systems this can be achieved @@ -67,13 +67,13 @@ with (as `root`) : systemctl reload dbus.service ``` -[bluealsa(8)]: doc/bluealsa.8.rst +[bluealsad(8)]: doc/bluealsad.8.rst ## 2. Couldn't get BlueALSA PCM: PCM not found In contrast to standard ALSA sound cards, BlueALSA does not expose all PCMs right away. In the first place it is required to connect remote Bluetooth -device with desired Bluetooth profile - run `bluealsa --help` for the list +device with desired Bluetooth profile - run `bluealsad --help` for the list of available profiles. For querying currently connected audio profiles (and connected devices), run `bluealsa-aplay --list-devices`. The common misconception is an attempt to use A2DP playback device as a capture one in @@ -135,9 +135,9 @@ On startup, the BlueALSA service will issue warnings if some other application has already registered the Bluetooth Audio profiles: ```text -bluealsa: W: UUID already registered in BlueZ [hci0]: 0000110a-0000-1000-8000-00805f9b34fb -bluealsa: W: UUID already registered in BlueZ [hci0]: 0000110b-0000-1000-8000-00805f9b34fb -bluealsa: W: UUID already registered in BlueZ: 0000111f-0000-1000-8000-00805f9b34fb +bluealsad: W: UUID already registered in BlueZ [hci0]: 0000110a-0000-1000-8000-00805f9b34fb +bluealsad: W: UUID already registered in BlueZ [hci0]: 0000110b-0000-1000-8000-00805f9b34fb +bluealsad: W: UUID already registered in BlueZ: 0000111f-0000-1000-8000-00805f9b34fb ``` However, as it is normal practice to start BlueALSA at boot and to start diff --git a/configure.ac b/configure.ac index b4510515f..9b1898d03 100644 --- a/configure.ac +++ b/configure.ac @@ -408,12 +408,12 @@ AC_ARG_WITH([systemdsystemunitdir], [systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])]) AC_SUBST([SYSTEMD_SYSTEM_UNIT_DIR], [$systemdsystemunitdir]) -AC_ARG_WITH([systemdbluealsaargs], - AS_HELP_STRING([--with-systemdbluealsaargs=ARGS], [bluealsa arguments to be used in +AC_ARG_WITH([systemdbluealsadargs], + AS_HELP_STRING([--with-systemdbluealsadargs=ARGS], [bluealsad arguments to be used in bluealsa.service, defaults to '-S -p a2dp-source -p a2dp-sink' if not specified]), - [systemdbluealsaargs="${withval}"], - [systemdbluealsaargs="-S -p a2dp-source -p a2dp-sink"]) -AC_SUBST([SYSTEMD_BLUEALSA_ARGS], [$systemdbluealsaargs]) + [systemdbluealsadargs="${withval}"], + [systemdbluealsadargs="-S -p a2dp-source -p a2dp-sink"]) +AC_SUBST([SYSTEMD_BLUEALSAD_ARGS], [$systemdbluealsadargs]) AC_ARG_WITH([systemdbluealsaaplayargs], AS_HELP_STRING([--with-systemdbluealsaaplayargs=ARGS], [bluealsa-aplay arguments to @@ -422,13 +422,13 @@ AC_ARG_WITH([systemdbluealsaaplayargs], [systemdbluealsaaplayargs="-S"]) AC_SUBST([SYSTEMD_BLUEALSA_APLAY_ARGS], [$systemdbluealsaaplayargs]) -AC_ARG_WITH([bluealsauser], - AS_HELP_STRING([--with-bluealsauser=USER], [set up installation to run bluealsa as user +AC_ARG_WITH([bluealsaduser], + AS_HELP_STRING([--with-bluealsaduser=USER], [set up installation to run bluealsad as user USER, defaults to root if not specified. When used with bluez <= 5.50, USER must be a member of the "bluetooth" group.]), - [bluealsauser="${withval}"], - [bluealsauser="root"]) -AC_SUBST([BLUEALSA_USER], [$bluealsauser]) + [bluealsaduser="${withval}"], + [bluealsaduser="root"]) +AC_SUBST([BLUEALSAD_USER], [$bluealsaduser]) AC_ARG_WITH([bluealsaaplayuser], AS_HELP_STRING([--with-bluealsaaplayuser=USER], [set up installation to run bluealsa-aplay diff --git a/doc/Makefile.am b/doc/Makefile.am index e5d1a6051..4937bca7c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,7 +9,7 @@ man7_MANS = \ org.bluealsa.PCM1.7 \ org.bluealsa.RFCOMM1.7 -man8_MANS = bluealsa.8 +man8_MANS = bluealsad.8 if ENABLE_CTL man1_MANS += bluealsactl.1 diff --git a/doc/bluealsa-aplay.1.rst b/doc/bluealsa-aplay.1.rst index ced2bccfc..d91ea39f3 100644 --- a/doc/bluealsa-aplay.1.rst +++ b/doc/bluealsa-aplay.1.rst @@ -3,10 +3,10 @@ bluealsa-aplay ============== ------------------------ -a simple bluealsa player +a simple BlueALSA player ------------------------ -:Date: February 2024 +:Date: August 2024 :Manual section: 1 :Manual group: General Commands Manual :Version: $VERSION$ @@ -19,7 +19,7 @@ SYNOPSIS DESCRIPTION =========== -Capture audio streams from Bluetooth devices (via ``bluealsa(8)``) and play +Capture audio streams from Bluetooth devices (via ``bluealsad(8)``) and play them to an ALSA playback device. By default **bluealsa-aplay** captures audio from all connected Bluetooth @@ -68,7 +68,7 @@ OPTIONS -B NAME, --dbus=NAME BlueALSA service name suffix. - For more information see ``--dbus=NAME`` option of ``bluealsa(8)`` service + For more information see ``--dbus=NAME`` option of ``bluealsad(8)`` service daemon. -D NAME, --pcm=NAME @@ -110,7 +110,7 @@ OPTIONS in the conversion between period time and period size. This can have a significant impact on synchronization "drift", especially with small period sizes, and can also result in stream underruns (if the effective rate is - too fast) or dropped A2DP frames in the **bluealsa(8)** server (if the + too fast) or dropped A2DP frames in the **bluealsad(8)** server (if the effective rate is too slow). This effect is avoided if the selected period time results in an exact integer number of frames for both the source rate (Bluetooth) and sink rate (hardware card). For example, in the case of @@ -200,7 +200,7 @@ Volume control -------------- If the Bluetooth PCM is using BlueALSA soft-volume volume control, then volume -adjustment will have been applied to the PCM stream within the **bluealsa** +adjustment will have been applied to the PCM stream within the **bluealsad** daemon; so **bluealsa-aplay** does not operate the mixer control in this case. When using ``--volume=none`` or ``--volume=software``, then the mixer options @@ -220,7 +220,7 @@ BlueZ, which has not always been reliably implemented. It is recommended to use BlueZ release 5.65 or later to be certain that native A2DP volume control will always be available with those devices which provide it. -See ``bluealsa(8)`` for more information on native and soft-volume volume +See ``bluealsad(8)`` for more information on native and soft-volume volume control. dmix @@ -301,14 +301,14 @@ element will be used as a hardware volume control knob. COPYRIGHT ========= -Copyright (c) 2016-2023 Arkadiusz Bokowy. +Copyright (c) 2016-2024 Arkadiusz Bokowy. The bluez-alsa project is licensed under the terms of the MIT license. SEE ALSO ======== -``amixer(1)``, ``aplay(1)``, ``bluealsa-rfcomm(1)``, ``bluealsa(8)`` +``amixer(1)``, ``aplay(1)``, ``bluealsa-rfcomm(1)``, ``bluealsad(8)`` Project web site https://github.com/arkq/bluez-alsa diff --git a/doc/bluealsa-plugins.7.rst b/doc/bluealsa-plugins.7.rst index 26aa389b1..062dcbc6d 100644 --- a/doc/bluealsa-plugins.7.rst +++ b/doc/bluealsa-plugins.7.rst @@ -5,7 +5,7 @@ bluealsa-plugins Bluetooth Audio ALSA Plugins ---------------------------- -:Date: July 2023 +:Date: August 2024 :Manual section: 7 :Manual group: Miscellaneous :Version: $VERSION$ @@ -22,7 +22,7 @@ one for CTL volume controls. PCM PLUGIN ========== -The BlueALSA ALSA PCM plugin communicates with the ``bluealsa(8)`` service. +The BlueALSA ALSA PCM plugin communicates with the ``bluealsad(8)`` service. It can be used to define ALSA PCMs in your own configuration file (e.g. ~/.asoundrc), or you can use the predefined **bluealsa** PCM. @@ -99,7 +99,7 @@ PCM Parameters SOFTVOL Enables or disables BlueALSA's software volume feature for this PCM. See - the ``bluealsa(8)`` manual page for more information on software volume. + the ``bluealsad(8)`` manual page for more information on software volume. This is a boolean option (values **on** or **off**), but also accepts the special value **unchanged** which causes the PCM to use its existing softvol value. The default value is **unchanged**. @@ -113,7 +113,7 @@ PCM Parameters SRV The D-Bus service name of the BlueALSA daemon. Defaults to - **org.bluealsa**. See ``bluealsa(8)`` for more information. Not normally + **org.bluealsa**. See ``bluealsad(8)`` for more information. Not normally required. Setting Different Defaults @@ -237,8 +237,8 @@ Now using ``aplay -L`` will include the following in its output: My Bluetooth headphones # -If you are using the predefined bluealsa PCM, then you can create a "namehint" -entry in your ~/.asoundrc file like this: +If you are using the predefined **bluealsa** PCM, then you can create a +"namehint" entry in your ~/.asoundrc file like this: :: @@ -449,7 +449,7 @@ CTL Parameters The volume mode controls take values "software" and "pass-through"; the playback control has index 0 and capture control has index 1. - See the `Volume control` section in the ``bluealsa(8)`` for more + See the `Volume control` section in the ``bluealsad(8)`` for more information on the software volume setting. The delay adjustment controls are called "Sync". They can be used to apply @@ -496,7 +496,7 @@ CTL Parameters SRV The D-Bus service name of the BlueALSA daemon. Defaults to - **org.bluealsa**. See ``bluealsa(8)`` for more information. + **org.bluealsa**. See ``bluealsad(8)`` for more information. The default values can be overridden in the ALSA configuration, for example: @@ -564,10 +564,10 @@ connects. The A2DP source device, or HFP/HSP gateway device, must first "acquire" the profile transport. When the BlueALSA PCM plugin is used on a source A2DP or gateway HFP/HSP node, -then **bluealsa(8)** will automatically acquire the transport and begin audio +then **bluealsad(8)** will automatically acquire the transport and begin audio transfer when the plugin starts the PCM. -When used on an A2DP sink or HFP/HSP HF/HS node then **bluealsa(8)** must wait +When used on an A2DP sink or HFP/HSP HF/HS node then **bluealsad(8)** must wait for the remote device to acquire the transport. During this waiting time the PCM plugin behaves as if the device "clock" is stopped, it does not generate any poll() events, and the application will be blocked when writing or reading @@ -602,7 +602,7 @@ FILES COPYRIGHT ========= -Copyright (c) 2016-2023 Arkadiusz Bokowy. +Copyright (c) 2016-2024 Arkadiusz Bokowy. The bluez-alsa project is licensed under the terms of the MIT license. @@ -610,7 +610,7 @@ SEE ALSO ======== ``alsamixer(1)``, ``amixer(1)``, ``aplay(1)``, ``bluetoothctl(1)``, -``bluealsa(8)``, ``bluetoothd(8)`` +``bluealsad(8)``, ``bluetoothd(8)`` Project web site https://github.com/arkq/bluez-alsa diff --git a/doc/bluealsa-rfcomm.1.rst b/doc/bluealsa-rfcomm.1.rst index 1ffdbc3b6..480ff4039 100644 --- a/doc/bluealsa-rfcomm.1.rst +++ b/doc/bluealsa-rfcomm.1.rst @@ -3,10 +3,10 @@ bluealsa-rfcomm =============== ------------------------------------- -a simple RFCOMM terminal for bluealsa +a simple RFCOMM terminal for BlueALSA ------------------------------------- -:Date: March 2023 +:Date: August 2024 :Manual section: 1 :Manual group: General Commands Manual :Version: $VERSION$ @@ -35,7 +35,7 @@ OPTIONS -B NAME, --dbus=NAME BlueALSA service name suffix. For more information see ``--dbus`` - option of ``bluealsa(8)`` service daemon. + option of ``bluealsad(8)`` service daemon. -p, --properties Print the properties of the given *DEVICE-PATH* @@ -54,14 +54,14 @@ EXAMPLES COPYRIGHT ========= -Copyright (c) 2016-2023 Arkadiusz Bokowy. +Copyright (c) 2016-2024 Arkadiusz Bokowy. The bluez-alsa project is licensed under the terms of the MIT license. SEE ALSO ======== -``bluealsa-aplay(1)`` ``bluealsa(8)`` +``bluealsa-aplay(1)`` ``bluealsad(8)`` Project web site https://github.com/arkq/bluez-alsa diff --git a/doc/bluealsactl.1.rst b/doc/bluealsactl.1.rst index a9ef0972e..385f6462e 100644 --- a/doc/bluealsactl.1.rst +++ b/doc/bluealsactl.1.rst @@ -6,7 +6,7 @@ bluealsactl a simple command line interface for the BlueALSA D-Bus API ---------------------------------------------------------- -:Date: July 2024 +:Date: August 2024 :Manual section: 1 :Manual group: General Commands Manual :Version: $VERSION$ @@ -36,7 +36,7 @@ OPTIONS -B NAME, --dbus=NAME BlueALSA service name suffix. For more information see ``--dbus`` - option of ``bluealsa(8)`` service daemon. + option of ``bluealsad(8)`` service daemon. -q, --quiet Do not print any error messages. @@ -233,14 +233,14 @@ open [--hex] *PCM_PATH* COPYRIGHT ========= -Copyright (c) 2016-2023 Arkadiusz Bokowy. +Copyright (c) 2016-2024 Arkadiusz Bokowy. The bluez-alsa project is licensed under the terms of the MIT license. SEE ALSO ======== -``bluealsa(8)``, ``bluealsa-aplay(1)``, ``bluealsa-rfcomm(1)`` +``bluealsad(8)``, ``bluealsa-aplay(1)``, ``bluealsa-rfcomm(1)`` Project web site https://github.com/arkq/bluez-alsa diff --git a/doc/bluealsa.8.rst b/doc/bluealsad.8.rst similarity index 88% rename from doc/bluealsa.8.rst rename to doc/bluealsad.8.rst index fee6e7da0..6b3ab495a 100644 --- a/doc/bluealsa.8.rst +++ b/doc/bluealsad.8.rst @@ -1,12 +1,12 @@ -======== -bluealsa -======== +========= +bluealsad +========= ---------------------------- Bluetooth Audio ALSA Backend ---------------------------- -:Date: May 2024 +:Date: August 2024 :Manual section: 8 :Manual group: System Manager's Manual :Version: $VERSION$ @@ -14,12 +14,12 @@ Bluetooth Audio ALSA Backend SYNOPSIS ======== -**bluealsa** -p *PROFILE* [*OPTION*]... +**bluealsad** -p *PROFILE* [*OPTION*]... DESCRIPTION =========== -**bluealsa** is a Linux daemon to give applications access to Bluetooth audio +**bluealsad** is a Linux daemon to give applications access to Bluetooth audio streams using the Bluetooth A2DP, HFP, HSP and/or BLE-MIDI profiles. It provides a D-Bus API to applications, and can be used by ALSA applications via libasound plugins (see **bluealsa-plugins(7)** for details). @@ -45,7 +45,7 @@ OPTIONS - **warning** - warning conditions - **info** - informational messages - If **bluealsa** was built with debug enabled, then an additional, lowest, + If **bluealsad** was built with debug enabled, then an additional, lowest, level is available: - **debug** - debug messages @@ -55,7 +55,7 @@ OPTIONS -B NAME, --dbus=NAME BlueALSA D-Bus service name suffix. - Without this option, **bluealsa** registers itself as an "org.bluealsa" + Without this option, **bluealsad** registers itself as an "org.bluealsa" D-Bus service. For more information see the EXAMPLES_ below. -i hciX, --device=hciX @@ -88,7 +88,7 @@ OPTIONS mSBC (if mSBC support is compiled-in) and LC3-SWB (if LC3-SWB support is compiled-in). For the list of supported audio codecs see the "Available BT audio codecs" - section of the **bluealsa** command-line help message. + section of the **bluealsad** command-line help message. --initial-volume=NUM Set the initial volume to *NUM* % when a device is first connected. @@ -108,7 +108,7 @@ OPTIONS Keep Bluetooth transport alive for *SEC* number of seconds after streaming was closed. - This option is required when using ``bluealsa`` with applications that + This option is required when using **bluealsad** with applications that close and then immediately re-open the same PCM as part of their initialization; for example applications built with the ``portaudio`` portability library and many other "portable" applications. @@ -134,7 +134,7 @@ OPTIONS ``sched(7)``. --disable-realtek-usb-fix - Since Linux kernel 5.14 Realtek USB adapters have required **bluealsa** to + Since Linux kernel 5.14 Realtek USB adapters have required **bluealsad** to apply a fix for mSBC. This option disables that fix and may be necessary when using an earlier kernel. @@ -145,12 +145,12 @@ OPTIONS Force 44.1 kHz sampling frequency for A2DP profile. Some Bluetooth devices can handle streams sampled at either 48kHz or 44.1kHz, in which case they normally default to using 48kHz. - With this option, **bluealsa** will request such a device uses only 44.1 + With this option, **bluealsad** will request such a device uses only 44.1 kHz sample rate. --a2dp-volume Enable native A2DP volume control. - By default **bluealsa** will use its own internal scaling algorithm to + By default **bluealsad** will use its own internal scaling algorithm to attenuate the volume. This option disables that internal scaling and instead passes the volume change request to the A2DP device. This feature can also be controlled during runtime for individual PCMs via @@ -279,9 +279,9 @@ NOTES Profiles -------- -**bluealsa** provides support for Bluetooth Advanced Audio Distribution Profile -(A2DP), Hands-Free Profile (HFP), Headset Profile (HSP) and Bluetooth Low -Energy MIDI (BLE-MIDI). +**bluealsad** provides support for Bluetooth Advanced Audio Distribution +Profile (A2DP), Hands-Free Profile (HFP), Headset Profile (HSP) and Bluetooth +Low Energy MIDI (BLE-MIDI). A2DP profile is dedicated for streaming music (i.e., stereo, 48 kHz or more sampling frequency), while HFP and HSP for two-way voice transmission (mono, 8 kHz or 16 kHz sampling frequency). BLE-MIDI, on the other hand, is used for @@ -291,18 +291,18 @@ The Bluetooth audio profiles are not peer-to-peer; they each have a source or gateway role (a2dp-source, hfp-ag, or hsp-ag) and a sink or target role (a2dp-sink, hfp-hf, hsp-hs). The source/gateway role is the audio player (e.g., mobile phone), the sink/target role is the audio renderer (e.g., headphones or -speaker). The **bluealsa** daemon can perform any combination of profiles and +speaker). The **bluealsad** daemon can perform any combination of profiles and roles, although it is most common to use it either as a source/gateway: :: - bluealsa -p a2dp-source -p hfp-ag -p hsp-ag + bluealsad -p a2dp-source -p hfp-ag -p hsp-ag or as a sink/target: :: - bluealsa -p a2dp-sink -p hfp-hf -p hsp-hs + bluealsad -p a2dp-sink -p hfp-hf -p hsp-hs or with oFono for HFP support, @@ -310,22 +310,23 @@ source/gateway: :: - bluealsa -p a2dp-source -p hfp-ofono -p hsp-ag + bluealsad -p a2dp-source -p hfp-ofono -p hsp-ag sink/target: :: - bluealsa -p a2dp-sink -p hfp-ofono -p hsp-hs + bluealsad -p a2dp-sink -p hfp-ofono -p hsp-hs -With A2DP, **bluealsa** always includes the mandatory SBC codec and may also +With A2DP, **bluealsad** always includes the mandatory SBC codec and may also include various optional codecs like AAC, aptX, and other. -With HFP, **bluealsa** always includes the mandatory CVSD codec and may also +With HFP, **bluealsad** always includes the mandatory CVSD codec and may also include the optional mSBC and LC3-SWB codecs. The full list of available optional codecs, which depends on selected -compilation options, will be shown with **bluealsa** command-line help message. +compilation options, will be shown with **bluealsad** command-line help +message. The list of profile *NAME*-s accepted by the ``--profile=NAME`` option: @@ -338,7 +339,7 @@ The list of profile *NAME*-s accepted by the ``--profile=NAME`` option: - **hsp-hs** - Headset - **midi** - Bluetooth LE MIDI -The **hfp-ofono** and **midi** profiles are available only when **bluealsa** +The **hfp-ofono** and **midi** profiles are available only when **bluealsad** was compiled respectively with oFono and BLE-MIDI support. Enabling HFP over oFono will automatically disable **hfp-hf** and **hfp-ag**. @@ -348,15 +349,15 @@ device. For the A2DP profile, BlueZ allows each HCI device to be registered to a different service, so it is possible to have multiple instances of -**bluealsa** offering A2DP support, each with a unique service name given with +**bluealsad** offering A2DP support, each with a unique service name given with the ``--dbus=`` option, so long as they are registered to different HCI devices using the ``--device=`` option. See the EXAMPLES_ below. A profile connection does not immediately initiate the audio stream(s); audio can only flow when the profile transport is "acquired". Acquisition can only be performed by the source/gateway role. When acting as source/gateway, -**bluealsa** acquires the profile transport (i.e., initiates the audio -connection) when a client opens a PCM. When **bluealsa** is acting as target, +**bluealsad** acquires the profile transport (i.e., initiates the audio +connection) when a client opens a PCM. When **bluealsad** is acting as target, a client can open a PCM as soon as the profile is connected, but the audio stream(s) will not begin until the remote source/gateway has acquired the transport. @@ -366,29 +367,29 @@ Volume control The Bluetooth specifications for HFP and HSP include optional support for volume control of the target by the gateway device. For A2DP, volume -control is optionally provided by the AVRCP profile. **bluealsa** provides a +control is optionally provided by the AVRCP profile. **bluealsad** provides a single, consistent, abstracted interface for volume control of PCMs. This -interface can use the native Bluetooth features or alternatively **bluealsa** +interface can use the native Bluetooth features or alternatively **bluealsad** also implements its own internal volume control, called "soft-volume". For A2DP the default is to use soft-volume, but this can be overridden to use the Bluetooth native support where available by using the ``--a2dp-volume`` command line option. For HFP/HSP the default is to use Bluetooth native volume control. -When using soft-volume, **bluealsa** scales PCM samples before encoding, and +When using soft-volume, **bluealsad** scales PCM samples before encoding, and after decoding, and does not interact with the Bluetooth AVRCP volume property or HFP/HSP volume control. Volume can only be modified by local clients. (Note that Bluetooth headphones or speakers with their own volume controls will still be able to alter their own volume, but this change will not be notified to -**bluealsa** local clients, they will only see the soft-volume setting). +**bluealsad** local clients, they will only see the soft-volume setting). -When using native volume control, **bluealsa** links the PCM volume setting to +When using native volume control, **bluealsad** links the PCM volume setting to the AVRCP volume property or HFP/HSP volume control. No scaling of PCM samples is applied. Volume can be modified by both local clients and the remote device. Local clients will be notified of volume changes made by controls on the remote device. A2DP native volume control does not permit independent values for left and -right channels, so when a client sets such values **bluealsa** will set the +right channels, so when a client sets such values **bluealsad** will set the Bluetooth volume as the average of the two channels. Volume level, mute status, and soft-volume selection can all be controlled for @@ -418,10 +419,10 @@ and its soft-volume status according to: When native volume control is enabled, then the remote device may also modify the volume level after this initial setting. Mute and soft-volume are -implemented locally by the **bluealsa** daemon and cannot be modified by the +implemented locally by the **bluealsad** daemon and cannot be modified by the remote device. -Note that **bluealsa** relies on support from BlueZ to implement native volume +Note that **bluealsad** relies on support from BlueZ to implement native volume control for A2DP using AVRCP, and BlueZ has not always provided robust support here. It is recommended to use BlueZ release 5.65 or later to be certain that native A2DP volume control will always be available with those devices which @@ -453,7 +454,7 @@ Emulate Bluetooth headset with A2DP and HSP support: :: - bluealsa -p a2dp-sink -p hsp-hs + bluealsad -p a2dp-sink -p hsp-hs On systems with more than one HCI device, it is possible to expose different profiles on different HCI devices. @@ -464,8 +465,8 @@ Such a setup might be created as follows: :: - bluealsa -B sink -i hci0 -p a2dp-sink & - bluealsa -B source -i hci1 -i hci2 -p a2dp-source & + bluealsad -B sink -i hci0 -p a2dp-sink & + bluealsad -B source -i hci1 -i hci2 -p a2dp-source & Setup like this will also require a change to the BlueALSA D-Bus configuration file in order to allow connection with BlueALSA services with suffixed names. diff --git a/doc/org.bluealsa.Manager1.7.rst b/doc/org.bluealsa.Manager1.7.rst index 255f929aa..bea25e0c0 100644 --- a/doc/org.bluealsa.Manager1.7.rst +++ b/doc/org.bluealsa.Manager1.7.rst @@ -6,7 +6,7 @@ org.bluealsa.Manager1 Bluetooth Audio Manager D-Bus API --------------------------------- -:Date: May 2024 +:Date: August 2024 :Manual section: 7 :Manual group: D-Bus Interface :Version: $VERSION$ @@ -21,9 +21,9 @@ SYNOPSIS DESCRIPTION =========== -This page describes the D-Bus Manager interface of the **bluealsa(8)** service. -The Manager interface exposes some of the run-time properties of the service -daemon. +This page describes the D-Bus Manager interface of the **bluealsad(8)** +service. The Manager interface exposes some of the run-time properties of the +service daemon. Properties ---------- @@ -46,14 +46,14 @@ array{string} Codecs [readonly] COPYRIGHT ========= -Copyright (c) 2016-2023 Arkadiusz Bokowy. +Copyright (c) 2016-2024 Arkadiusz Bokowy. The bluez-alsa project is licensed under the terms of the MIT license. SEE ALSO ======== -``bluealsactl(1)``, ``bluealsa(8)`` +``bluealsactl(1)``, ``bluealsad(8)`` Project web site https://github.com/arkq/bluez-alsa diff --git a/doc/org.bluealsa.PCM1.7.rst b/doc/org.bluealsa.PCM1.7.rst index 646689b9f..2e845e229 100644 --- a/doc/org.bluealsa.PCM1.7.rst +++ b/doc/org.bluealsa.PCM1.7.rst @@ -6,7 +6,7 @@ org.bluealsa.PCM1 Bluetooth Audio PCM D-Bus API ----------------------------- -:Date: July 2024 +:Date: August 2024 :Manual section: 7 :Manual group: D-Bus Interface :Version: $VERSION$ @@ -21,7 +21,7 @@ SYNOPSIS DESCRIPTION =========== -This page describes the D-Bus PCM interface of the **bluealsa(8)** service. +This page describes the D-Bus PCM interface of the **bluealsad(8)** service. The PCM interface gives access to individual PCM objects created by this service. @@ -185,14 +185,14 @@ uint16 Volume [readwrite] COPYRIGHT ========= -Copyright (c) 2016-2023 Arkadiusz Bokowy. +Copyright (c) 2016-2024 Arkadiusz Bokowy. The bluez-alsa project is licensed under the terms of the MIT license. SEE ALSO ======== -``bluealsactl(1)``, ``bluealsa-plugins(5)``, ``bluealsa(8)`` +``bluealsactl(1)``, ``bluealsa-plugins(5)``, ``bluealsad(8)`` Project web site https://github.com/arkq/bluez-alsa diff --git a/doc/org.bluealsa.RFCOMM1.7.rst b/doc/org.bluealsa.RFCOMM1.7.rst index c5e1e907b..22afbb0b0 100644 --- a/doc/org.bluealsa.RFCOMM1.7.rst +++ b/doc/org.bluealsa.RFCOMM1.7.rst @@ -6,7 +6,7 @@ org.bluealsa.RFCOMM1 Bluetooth Audio RFCOMM D-Bus API --------------------------------- -:Date: October 2023 +:Date: August 2024 :Manual section: 7 :Manual group: D-Bus Interface :Version: $VERSION$ @@ -21,7 +21,7 @@ SYNOPSIS DESCRIPTION =========== -This page describes the D-Bus RFCOMM interface of the **bluealsa(8)** service. +This page describes the D-Bus RFCOMM interface of the **bluealsad(8)** service. The RFCOMM interface gives access to the RFCOMM terminal objects created by this service. @@ -57,14 +57,14 @@ byte Battery [readonly] COPYRIGHT ========= -Copyright (c) 2016-2023 Arkadiusz Bokowy. +Copyright (c) 2016-2024 Arkadiusz Bokowy. The bluez-alsa project is licensed under the terms of the MIT license. SEE ALSO ======== -``bluealsa-rfcomm(1)``, ``bluealsa(8)`` +``bluealsa-rfcomm(1)``, ``bluealsad(8)`` Project web site https://github.com/arkq/bluez-alsa diff --git a/misc/Makefile.am b/misc/Makefile.am index a916f6690..c3ab9be63 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = if WITH_BASH_COMPLETION bashcompdir = @BASH_COMPLETION_DIR@ -dist_bashcomp_DATA = bash-completion/bluealsa +dist_bashcomp_DATA = bash-completion/bluealsad SYMLINKS = \ a2dpconf \ @@ -18,7 +18,7 @@ SYMLINKS = \ install-data-hook: $(MKDIR_P) $(DESTDIR)$(bashcompdir) && \ cd $(DESTDIR)$(bashcompdir) && \ - for link in $(SYMLINKS); do rm -f $$link; $(LN_S) bluealsa $$link; done + for link in $(SYMLINKS); do rm -f $$link; $(LN_S) bluealsad $$link; done uninstall-hook: cd $(DESTDIR)$(bashcompdir) && rm -f $(SYMLINKS) diff --git a/misc/bash-completion/bluealsa b/misc/bash-completion/bluealsad similarity index 97% rename from misc/bash-completion/bluealsa rename to misc/bash-completion/bluealsad index f0a6e08f9..5be952742 100644 --- a/misc/bash-completion/bluealsa +++ b/misc/bash-completion/bluealsad @@ -2,7 +2,7 @@ # bash completion for bluez-alsa project applications # helper function gets available profiles -# @param $1 the bluealsa executable name +# @param $1 the bluealsad executable name _bluealsa_profiles() { "$1" --help | while read -r line; do [[ "$line" = "Available BT profiles:" ]] && start=yes && continue @@ -14,7 +14,7 @@ _bluealsa_profiles() { } # helper function gets available codecs -# @param $1 the bluealsa executable name +# @param $1 the bluealsad executable name _bluealsa_codecs() { "$1" --help | while read -r line; do [[ "$line" = "Available BT audio codecs:" ]] && start=yes && continue @@ -27,8 +27,8 @@ _bluealsa_codecs() { } # helper function gets available enum values -# @param $1 the bluealsa executable name -# @param $2 the bluealsa option to inspect +# @param $1 the bluealsad executable name +# @param $2 the bluealsad option to inspect _bluealsa_enum_values() { "$1" "${2}=" 2>&1 | while read -r line; do [[ $line =~ \{([^}]*)\} ]] || continue @@ -102,7 +102,7 @@ _bluealsa_aplay_pcms() { } # helper function gets rfcomm dbus paths -# @param $1 the full bluealsa service name ( org.bluealsa* ) +# @param $1 the full BlueALSA service name ( org.bluealsa* ) _bluealsa_rfcomm_paths() { busctl --list tree "$1" 2>/dev/null | while read -r line; do [[ "$line" = /org/bluealsa/hci[0-9]/dev*/rfcomm ]] || continue @@ -180,9 +180,9 @@ _bluealsa_complete_options() { [[ ${COMPREPLY[0]} == *= ]] && compopt -o nospace } -# completion function for bluealsa +# completion function for bluealsad # complete available devices and profiles in addition to options -_bluealsa() { +_bluealsad() { local cur prev words cword split _init_completion -s || return @@ -493,7 +493,7 @@ _bluealsa_others() { _bluealsa_complete_options "$1" } -complete -F _bluealsa bluealsa +complete -F _bluealsad bluealsad complete -F _bluealsactl bluealsactl complete -F _bluealsa_aplay bluealsa-aplay complete -F _bluealsa_rfcomm bluealsa-rfcomm diff --git a/misc/systemd/Makefile.am b/misc/systemd/Makefile.am index 01243d6d3..616f7127a 100644 --- a/misc/systemd/Makefile.am +++ b/misc/systemd/Makefile.am @@ -1,9 +1,9 @@ # BlueALSA - Makefile.am # Copyright (c) 2016-2021 Arkadiusz Bokowy -systemdbluealsaargs = $(SYSTEMD_BLUEALSA_ARGS) +systemdbluealsadargs = $(SYSTEMD_BLUEALSAD_ARGS) systemdbluealsaaplayargs = $(SYSTEMD_BLUEALSA_APLAY_ARGS) -bluealsauser = $(BLUEALSA_USER) +bluealsaduser = $(BLUEALSAD_USER) bluealsaaplayuser = $(BLUEALSA_APLAY_USER) systemdsystemunitdir = $(SYSTEMD_SYSTEM_UNIT_DIR) @@ -17,9 +17,9 @@ MOSTLYCLEANFILES = $(dist_systemdsystemunit_DATA) SYSTEMD_SERVICE_SUBS = \ s,[@]bindir[@],$(bindir),g; \ - s,[@]systemdbluealsaargs[@],$(systemdbluealsaargs),g; \ + s,[@]systemdbluealsadargs[@],$(systemdbluealsadargs),g; \ s,[@]systemdbluealsaaplayargs[@],$(systemdbluealsaaplayargs),g; \ - s,[@]bluealsauser[@],$(bluealsauser),g; \ + s,[@]bluealsaduser[@],$(bluealsaduser),g; \ s,[@]bluealsaaplayuser[@],$(bluealsaaplayuser),g; .in: diff --git a/misc/systemd/bluealsa.service.in b/misc/systemd/bluealsa.service.in index f78477fba..37fb92d53 100644 --- a/misc/systemd/bluealsa.service.in +++ b/misc/systemd/bluealsa.service.in @@ -1,6 +1,6 @@ [Unit] Description=BlueALSA service -Documentation=man:bluealsa(8) +Documentation=man:bluealsad(8) Requisite=dbus.service After=bluetooth.service @@ -12,7 +12,7 @@ After=bluetooth.service # $ sudo systemctl edit bluealsa # [Service] # ExecStart= -# ExecStart=@bindir@/bluealsa -S --keep-alive=5 -p a2dp-sink +# ExecStart=@bindir@/bluealsad -S --keep-alive=5 -p a2dp-sink # When using low latency audio profile like HSP/HFP, it is recommended to set # real-time scheduling priority for IO threads with the --io-rt-priority=NUM @@ -29,8 +29,8 @@ After=bluetooth.service [Service] Type=dbus BusName=org.bluealsa -User=@bluealsauser@ -ExecStart=@bindir@/bluealsa @systemdbluealsaargs@ +User=@bluealsaduser@ +ExecStart=@bindir@/bluealsad @systemdbluealsadargs@ Restart=on-failure # Sandboxing diff --git a/src/Makefile.am b/src/Makefile.am index 12e0050c0..25b36dd8b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,11 @@ # BlueALSA - Makefile.am # Copyright (c) 2016-2024 Arkadiusz Bokowy -bin_PROGRAMS = bluealsa +bin_PROGRAMS = bluealsad SUBDIRS = asound bluealsactl dbusconfdir = @DBUS_CONF_DIR@ -dbusbluealsauser = @BLUEALSA_USER@ +dbusbluealsauser = @BLUEALSAD_USER@ dist_dbusconf_DATA = org.bluealsa.conf BUILT_SOURCES = \ @@ -17,7 +17,7 @@ MOSTLYCLEANFILES = \ $(dist_dbusconf_DATA) \ $(BUILT_SOURCES) -bluealsa_SOURCES = \ +bluealsad_SOURCES = \ shared/a2dp-codecs.c \ shared/ffb.c \ shared/log.c \ @@ -51,77 +51,77 @@ bluealsa_SOURCES = \ main.c if ENABLE_AAC -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-aac.c endif if ENABLE_APTX -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-aptx.c endif if ENABLE_APTX_HD -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-aptx-hd.c endif if ENABLE_APTX_OR_APTX_HD -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ codec-aptx.c endif if ENABLE_FASTSTREAM -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-faststream.c endif if ENABLE_LC3_SWB -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ codec-lc3-swb.c \ sco-lc3-swb.c endif if ENABLE_LC3PLUS -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-lc3plus.c endif if ENABLE_LDAC -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-ldac.c endif if ENABLE_MIDI -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ ble-midi.c \ bluez-midi.c \ midi.c endif if ENABLE_MPEG -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-mpeg.c endif if ENABLE_MSBC -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ codec-msbc.c \ sco-msbc.c endif if ENABLE_OPUS -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ a2dp-opus.c endif if ENABLE_OFONO -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ ofono.c \ ofono-iface.xml endif if ENABLE_UPOWER -bluealsa_SOURCES += \ +bluealsad_SOURCES += \ upower.c endif @@ -168,7 +168,7 @@ LDADD = \ SUFFIXES = .conf.in .conf DBUSCONF_SUBS = \ - s,[@]bluealsauser[@],$(dbusbluealsauser),g; + s,[@]bluealsaduser[@],$(dbusbluealsauser),g; .conf.in.conf: $(SED) -e '$(DBUSCONF_SUBS)' < $< > $@ diff --git a/src/asound/bluealsa-pcm.c b/src/asound/bluealsa-pcm.c index 100806fe8..2ff707e0c 100644 --- a/src/asound/bluealsa-pcm.c +++ b/src/asound/bluealsa-pcm.c @@ -494,7 +494,7 @@ static int bluealsa_close(snd_pcm_ioplug_t *io) { * it has already been reduced to a single configuration, so is effectively * read-only. So in order to fix the problematic buffer size calculated by * the ioplug, we need to completely replace the hw_params container for - * the bluealsa pcm. + * the bluealsa PCM. * */ static int bluealsa_fix_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params) { #if DEBUG diff --git a/src/main.c b/src/main.c index 96a66aee4..82823272a 100644 --- a/src/main.c +++ b/src/main.c @@ -280,7 +280,7 @@ int main(int argc, char **argv) { log_open(basename(argv[0]), syslog); if (ba_config_init() != 0) { - error("Couldn't initialize bluealsa config"); + error("Couldn't initialize configuration"); return EXIT_FAILURE; } diff --git a/src/org.bluealsa.conf.in b/src/org.bluealsa.conf.in index ba425ce6e..6a6408b5e 100644 --- a/src/org.bluealsa.conf.in +++ b/src/org.bluealsa.conf.in @@ -7,7 +7,7 @@ - + diff --git a/test/inc/mock.inc b/test/inc/mock.inc index ee690330f..dc02db8bd 100644 --- a/test/inc/mock.inc +++ b/test/inc/mock.inc @@ -53,7 +53,7 @@ static char *strtrim(char *str) { return str; } -static void *spawn_bluealsa_mock_stderr_proxy(void *userdata) { +static void *spawn_bluealsad_mock_stderr_proxy(void *userdata) { struct spawn_bluealsa_data *data = userdata; char buffer[512]; @@ -104,8 +104,8 @@ static void *spawn_bluealsa_mock_stderr_proxy(void *userdata) { } /** - * Full path to the bluealsa-mock executable. */ -char bluealsa_mock_path[256] = "bluealsa-mock"; + * Full path to the bluealsad-mock executable. */ +char bluealsad_mock_path[256] = "bluealsad-mock"; /** * Spawn BlueALSA mock service. @@ -114,7 +114,7 @@ char bluealsa_mock_path[256] = "bluealsa-mock"; * process information, i.e. PID, stdout and stderr file descriptors. * @param service BlueALSA D-Bus service name. * @param wait_for_ready Block until PCMs are ready. - * @param ... Additional arguments to be passed to the bluealsa-mock. The list + * @param ... Additional arguments to be passed to the bluealsad-mock. The list * shall be terminated by NULL. * @return On success this function returns 0. Otherwise -1 is returned and * errno is set appropriately. */ @@ -134,7 +134,7 @@ int spawn_bluealsa_mock(struct spawn_process *sp, const char *service, size_t n = 2; char * argv[32] = { - bluealsa_mock_path, + bluealsad_mock_path, arg_service, }; @@ -176,7 +176,7 @@ int spawn_bluealsa_mock(struct spawn_process *sp, const char *service, sp->f_stderr = NULL; pthread_t tid; - pthread_create(&tid, NULL, spawn_bluealsa_mock_stderr_proxy, data); + pthread_create(&tid, NULL, spawn_bluealsad_mock_stderr_proxy, data); pthread_detach(tid); pthread_mutex_lock(&data->data_mtx); diff --git a/test/mock/Makefile.am b/test/mock/Makefile.am index bbe073c4a..75fab328d 100644 --- a/test/mock/Makefile.am +++ b/test/mock/Makefile.am @@ -2,7 +2,7 @@ # Copyright (c) 2016-2024 Arkadiusz Bokowy check_PROGRAMS = \ - bluealsa-mock + bluealsad-mock BUILT_SOURCES = \ dbus-ifaces.c \ @@ -11,7 +11,7 @@ BUILT_SOURCES = \ MOSTLYCLEANFILES = \ $(BUILT_SOURCES) -bluealsa_mock_SOURCES = \ +bluealsad_mock_SOURCES = \ ../../src/shared/a2dp-codecs.c \ ../../src/shared/ffb.c \ ../../src/shared/log.c \ @@ -48,7 +48,7 @@ bluealsa_mock_SOURCES = \ mock-upower.c \ mock.c -bluealsa_mock_CFLAGS = \ +bluealsad_mock_CFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/test \ @AAC_CFLAGS@ \ @@ -70,7 +70,7 @@ bluealsa_mock_CFLAGS = \ @SBC_CFLAGS@ \ @SPANDSP_CFLAGS@ -bluealsa_mock_LDADD = \ +bluealsad_mock_LDADD = \ @AAC_LIBS@ \ @ALSA_LIBS@ \ @APTX_LIBS@ \ @@ -91,68 +91,68 @@ bluealsa_mock_LDADD = \ @SPANDSP_LIBS@ if ENABLE_AAC -bluealsa_mock_SOURCES += ../../src/a2dp-aac.c +bluealsad_mock_SOURCES += ../../src/a2dp-aac.c endif if ENABLE_APTX -bluealsa_mock_SOURCES += ../../src/a2dp-aptx.c +bluealsad_mock_SOURCES += ../../src/a2dp-aptx.c endif if ENABLE_APTX_HD -bluealsa_mock_SOURCES += ../../src/a2dp-aptx-hd.c +bluealsad_mock_SOURCES += ../../src/a2dp-aptx-hd.c endif if ENABLE_APTX_OR_APTX_HD -bluealsa_mock_SOURCES += ../../src/codec-aptx.c +bluealsad_mock_SOURCES += ../../src/codec-aptx.c endif if ENABLE_FASTSTREAM -bluealsa_mock_SOURCES += ../../src/a2dp-faststream.c +bluealsad_mock_SOURCES += ../../src/a2dp-faststream.c endif if ENABLE_LC3PLUS -bluealsa_mock_SOURCES += ../../src/a2dp-lc3plus.c +bluealsad_mock_SOURCES += ../../src/a2dp-lc3plus.c endif if ENABLE_LC3_SWB -bluealsa_mock_SOURCES += \ +bluealsad_mock_SOURCES += \ ../../src/codec-lc3-swb.c \ ../../src/sco-lc3-swb.c endif if ENABLE_LDAC -bluealsa_mock_SOURCES += ../../src/a2dp-ldac.c +bluealsad_mock_SOURCES += ../../src/a2dp-ldac.c endif if ENABLE_MIDI -bluealsa_mock_SOURCES += \ +bluealsad_mock_SOURCES += \ ../../src/ble-midi.c \ ../../src/bluez-midi.c \ ../../src/midi.c endif if ENABLE_MPEG -bluealsa_mock_SOURCES += ../../src/a2dp-mpeg.c +bluealsad_mock_SOURCES += ../../src/a2dp-mpeg.c endif if ENABLE_MSBC -bluealsa_mock_SOURCES += \ +bluealsad_mock_SOURCES += \ ../../src/codec-msbc.c \ ../../src/sco-msbc.c endif if ENABLE_OFONO -bluealsa_mock_SOURCES += \ +bluealsad_mock_SOURCES += \ ../../src/ofono.c \ ../../src/ofono-iface.c endif if ENABLE_OPUS -bluealsa_mock_SOURCES += ../../src/a2dp-opus.c +bluealsad_mock_SOURCES += ../../src/a2dp-opus.c endif if ENABLE_UPOWER -bluealsa_mock_SOURCES += ../../src/upower.c +bluealsad_mock_SOURCES += ../../src/upower.c endif .xml.h: diff --git a/test/mock/mock.c b/test/mock/mock.c index 947211a30..bf6b4279b 100644 --- a/test/mock/mock.c +++ b/test/mock/mock.c @@ -111,7 +111,7 @@ static void *mock_bt_dump_thread(void *userdata) { ssize_t len; if (mock_dump_output) - f_output = fopen("bluealsa-mock.dump", "w"); + f_output = fopen("bluealsad-mock.dump", "w"); debug("IO loop: START: %s", __func__); while ((len = read(bt_fd, buffer, sizeof(buffer))) > 0) { diff --git a/test/test-alsa-ctl.c b/test/test-alsa-ctl.c index 560266102..fefdf14ab 100644 --- a/test/test-alsa-ctl.c +++ b/test/test-alsa-ctl.c @@ -580,8 +580,8 @@ int main(int argc, char *argv[]) { preload(argc, argv, ".libs/libaloader.so"); char *argv_0 = strdup(argv[0]); - snprintf(bluealsa_mock_path, sizeof(bluealsa_mock_path), - "%s/mock/bluealsa-mock", dirname(argv_0)); + snprintf(bluealsad_mock_path, sizeof(bluealsad_mock_path), + "%s/mock/bluealsad-mock", dirname(argv_0)); Suite *s = suite_create(__FILE__); TCase *tc = tcase_create(__FILE__); diff --git a/test/test-alsa-midi.c b/test/test-alsa-midi.c index 7ee80f96d..61e8658e2 100644 --- a/test/test-alsa-midi.c +++ b/test/test-alsa-midi.c @@ -167,8 +167,8 @@ int main(int argc, char *argv[]) { } char *argv_0 = strdup(argv[0]); - snprintf(bluealsa_mock_path, sizeof(bluealsa_mock_path), - "%s/mock/bluealsa-mock", dirname(argv_0)); + snprintf(bluealsad_mock_path, sizeof(bluealsad_mock_path), + "%s/mock/bluealsad-mock", dirname(argv_0)); Suite *s = suite_create(__FILE__); TCase *tc = tcase_create(__FILE__); diff --git a/test/test-alsa-pcm.c b/test/test-alsa-pcm.c index 99fe4080f..1f2323bac 100644 --- a/test/test-alsa-pcm.c +++ b/test/test-alsa-pcm.c @@ -443,7 +443,7 @@ CK_START_TEST(ba_test_playback_hw_constraints) { if (pcm_device != NULL) return; - /* hard-coded values used in the bluealsa-mock */ + /* hard-coded values used in the bluealsad-mock */ const unsigned int server_channels_min = 1; const unsigned int server_channels_max = 2; const unsigned int server_rate_min = 16000; @@ -1128,8 +1128,8 @@ int main(int argc, char *argv[]) { } char *argv_0 = strdup(argv[0]); - snprintf(bluealsa_mock_path, sizeof(bluealsa_mock_path), - "%s/mock/bluealsa-mock", dirname(argv_0)); + snprintf(bluealsad_mock_path, sizeof(bluealsad_mock_path), + "%s/mock/bluealsad-mock", dirname(argv_0)); if (argc == optind) { run_capture = true; diff --git a/test/test-utils-aplay.c b/test/test-utils-aplay.c index 7925a2710..12bc1b2bf 100644 --- a/test/test-utils-aplay.c +++ b/test/test-utils-aplay.c @@ -313,8 +313,8 @@ int main(int argc, char *argv[]) { char *argv_0 = strdup(argv[0]); char *argv_0_dir = dirname(argv_0); - snprintf(bluealsa_mock_path, sizeof(bluealsa_mock_path), - "%s/mock/bluealsa-mock", argv_0_dir); + snprintf(bluealsad_mock_path, sizeof(bluealsad_mock_path), + "%s/mock/bluealsad-mock", argv_0_dir); snprintf(bluealsa_aplay_path, sizeof(bluealsa_aplay_path), "%s/../utils/aplay/bluealsa-aplay", argv_0_dir); diff --git a/test/test-utils-ctl.c b/test/test-utils-ctl.c index 56cd63304..eb7de48a2 100644 --- a/test/test-utils-ctl.c +++ b/test/test-utils-ctl.c @@ -477,8 +477,8 @@ int main(int argc, char *argv[]) { char *argv_0 = strdup(argv[0]); char *argv_0_dir = dirname(argv_0); - snprintf(bluealsa_mock_path, sizeof(bluealsa_mock_path), - "%s/mock/bluealsa-mock", argv_0_dir); + snprintf(bluealsad_mock_path, sizeof(bluealsad_mock_path), + "%s/mock/bluealsad-mock", argv_0_dir); snprintf(bluealsactl_path, sizeof(bluealsactl_path), "%s/../src/bluealsactl/bluealsactl", argv_0_dir); diff --git a/utils/aplay/dbus.c b/utils/aplay/dbus.c index 229596584..cf3938c53 100644 --- a/utils/aplay/dbus.c +++ b/utils/aplay/dbus.c @@ -63,7 +63,7 @@ int dbus_bluez_get_device(DBusConnection *conn, const char *path, /* Try to extract BT MAC address from the D-Bus path. We will use it as * a fallback in case where BlueZ service is not available on the bus - - * usage with bluealsa-mock server. */ + * usage with bluealsad-mock server. */ if ((tmp = strstr(path, "/dev_")) != NULL) strncpy(path_addr, tmp + 5, sizeof(path_addr) - 1); for (size_t i = 0; i < sizeof(path_addr); i++)