remove macOS support
There were a few macOS related bug reports on the bug tracker which have been open for years without a volunteer caring for them. The GitHub actions build has also been broken for a long time due to bugs in the ancient LLVM toolchain shipped with macOS, making macOS an unsuitable non-Linux target for testing MPD's portability. All of this makes macOS support an annoying liability for me. To avoid more frustration, I'm hereby dropping macOS support completely from MPD. Maybe this causes enough pain for a new maintainer to spawn, but maybe nobody cares, so... let's see.
This commit is contained in:
Max Kellermann
parent
1c69498c58
commit
518ce0187a
|
|
@ -136,56 +136,6 @@ jobs:
|
||||||
- name: Unit Tests Mini
|
- name: Unit Tests Mini
|
||||||
run: meson test -C output/mini
|
run: meson test -C output/mini
|
||||||
|
|
||||||
build-macos:
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- id: checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: 3.x
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
brew install \
|
|
||||||
meson ninja \
|
|
||||||
ccache \
|
|
||||||
fmt \
|
|
||||||
googletest \
|
|
||||||
icu4c \
|
|
||||||
ffmpeg \
|
|
||||||
libnfs \
|
|
||||||
libupnp \
|
|
||||||
libid3tag \
|
|
||||||
chromaprint \
|
|
||||||
libsamplerate \
|
|
||||||
libsoxr \
|
|
||||||
flac \
|
|
||||||
opus \
|
|
||||||
libvorbis \
|
|
||||||
faad2 \
|
|
||||||
wavpack \
|
|
||||||
libmpdclient
|
|
||||||
|
|
||||||
- id: cache-ccache
|
|
||||||
uses: hendrikmuhs/ccache-action@v1
|
|
||||||
with:
|
|
||||||
key: macos
|
|
||||||
|
|
||||||
- name: Configure
|
|
||||||
run: |
|
|
||||||
meson setup \
|
|
||||||
-Ddocumentation=disabled \
|
|
||||||
-Dtest=true \
|
|
||||||
output
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: meson compile -C output --verbose
|
|
||||||
|
|
||||||
- name: Unit Tests
|
|
||||||
run: meson test -C output
|
|
||||||
|
|
||||||
build-msys2:
|
build-msys2:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
|
|
||||||
1
NEWS
1
NEWS
|
|
@ -55,6 +55,7 @@ ver 0.24 (not yet released)
|
||||||
- build with libsamplerate
|
- build with libsamplerate
|
||||||
- remove JACK DLL support
|
- remove JACK DLL support
|
||||||
* remove Haiku support
|
* remove Haiku support
|
||||||
|
* remove macOS support
|
||||||
* remove Boost dependency
|
* remove Boost dependency
|
||||||
* require libfmt 9 or later
|
* require libfmt 9 or later
|
||||||
* documentation: switch to sphinx-rtd-theme
|
* documentation: switch to sphinx-rtd-theme
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ follow_inside_symlinks <yes or no>
|
||||||
database after changing this option. The default is "yes".
|
database after changing this option. The default is "yes".
|
||||||
|
|
||||||
zeroconf_enabled <yes or no>
|
zeroconf_enabled <yes or no>
|
||||||
If yes, and MPD has been compiled with support for Avahi or Bonjour, service
|
If yes, and MPD has been compiled with support for Avahi, service
|
||||||
information will be published with Zeroconf. The default is yes.
|
information will be published with Zeroconf. The default is yes.
|
||||||
|
|
||||||
zeroconf_name <name>
|
zeroconf_name <name>
|
||||||
|
|
|
||||||
|
|
@ -337,15 +337,6 @@ input {
|
||||||
# mixer_type "hardware"
|
# mixer_type "hardware"
|
||||||
#}
|
#}
|
||||||
#
|
#
|
||||||
# An example of an OS X output:
|
|
||||||
#
|
|
||||||
#audio_output {
|
|
||||||
# type "osx"
|
|
||||||
# name "My OS X Device"
|
|
||||||
## device "Built-in Output" # optional
|
|
||||||
## channel_map "-1,-1,0,1" # optional
|
|
||||||
#}
|
|
||||||
#
|
|
||||||
## Example "pipe" output:
|
## Example "pipe" output:
|
||||||
#
|
#
|
||||||
#audio_output {
|
#audio_output {
|
||||||
|
|
|
||||||
|
|
@ -1095,27 +1095,6 @@ The "OpenAL" plugin uses `libopenal <http://kcat.strangesoft.net/openal.html>`_.
|
||||||
* - **device NAME**
|
* - **device NAME**
|
||||||
- Sets the device which should be used. This can be any valid OpenAL device name. If not specified, then libopenal will choose a default device.
|
- Sets the device which should be used. This can be any valid OpenAL device name. If not specified, then libopenal will choose a default device.
|
||||||
|
|
||||||
osx
|
|
||||||
---
|
|
||||||
The "Mac OS X" plugin uses Apple's CoreAudio API.
|
|
||||||
|
|
||||||
.. list-table::
|
|
||||||
:widths: 20 80
|
|
||||||
:header-rows: 1
|
|
||||||
|
|
||||||
* - Setting
|
|
||||||
- Description
|
|
||||||
* - **device NAME**
|
|
||||||
- Sets the device which should be used. Uses device names as listed in the "Audio Devices" window of "Audio MIDI Setup".
|
|
||||||
* - **hog_device yes|no**
|
|
||||||
- Hog the device. This means that it takes exclusive control of the audio output device it is playing through, and no other program can access it.
|
|
||||||
* - **dop yes|no**
|
|
||||||
- If set to yes, then DSD over PCM according to the `DoP standard <http://dsd-guide.com/dop-open-standard>`_ is enabled. This wraps DSD samples in fake 24 bit PCM, and is understood by some DSD capable products, but may be harmful to other hardware. Therefore, the default is no and you can enable the option at your own risk. Under macOS you must make sure to select a physical mode on the output device which supports at least 24 bits per channel as the Mac OS X plugin only changes the sample rate.
|
|
||||||
* - **channel_map SOURCE,SOURCE,...**
|
|
||||||
- Specifies a channel map. If your audio device has more than two outputs this allows you to route audio to auxillary outputs. For predictable results you should also specify a "format" with a fixed number of channels, e.g. "*:*:2". The number of items in the channel map must match the number of output channels of your output device. Each list entry specifies the source for that output channel; use "-1" to silence an output. For example, if you have a four-channel output device and you wish to send stereo sound (format "*:*:2") to outputs 3 and 4 while leaving outputs 1 and 2 silent then set the channel map to "-1,-1,0,1". In this example '0' and '1' denote the left and right channel respectively.
|
|
||||||
|
|
||||||
The channel map may not refer to outputs that do not exist according to the format. If the format is "*:*:1" (mono) and you have a four-channel sound card then "-1,-1,0,0" (dual mono output on the second pair of sound card outputs) is a valid channel map but "-1,-1,0,1" is not because the second channel ('1') does not exist when the output is mono.
|
|
||||||
|
|
||||||
pipe
|
pipe
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
@ -1267,7 +1246,7 @@ You must set a format.
|
||||||
bind on all addresses on port :samp:`1704`.
|
bind on all addresses on port :samp:`1704`.
|
||||||
* - **zeroconf yes|no**
|
* - **zeroconf yes|no**
|
||||||
- Publish the Snapcast server as service type ``_snapcast._tcp``
|
- Publish the Snapcast server as service type ``_snapcast._tcp``
|
||||||
via Zeroconf (Avahi or Bonjour). Default is :samp:`yes`.
|
via Zeroconf (Avahi). Default is :samp:`yes`.
|
||||||
|
|
||||||
|
|
||||||
solaris
|
solaris
|
||||||
|
|
|
||||||
|
|
@ -491,7 +491,11 @@ More information can be found in the :ref:`encoder_plugins` reference.
|
||||||
Configuring audio outputs
|
Configuring audio outputs
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
||||||
Audio outputs are devices which actually play the audio chunks produced by :program:`MPD`. You can configure any number of audio output devices, but there must be at least one. If none is configured, :program:`MPD` attempts to auto-detect. Usually, this works quite well with ALSA, OSS and on Mac OS X.
|
Audio outputs are devices which actually play the audio chunks
|
||||||
|
produced by :program:`MPD`. You can configure any number of audio
|
||||||
|
output devices, but there must be at least one. If none is configured,
|
||||||
|
:program:`MPD` attempts to auto-detect. Usually, this works quite well
|
||||||
|
with ALSA and OSS.
|
||||||
|
|
||||||
To configure an audio output manually, add one or more
|
To configure an audio output manually, add one or more
|
||||||
:code:`audio_output` blocks to :file:`mpd.conf`:
|
:code:`audio_output` blocks to :file:`mpd.conf`:
|
||||||
|
|
@ -954,7 +958,7 @@ Do not change these unless you know what you are doing.
|
||||||
Zeroconf
|
Zeroconf
|
||||||
^^^^^^^^
|
^^^^^^^^
|
||||||
|
|
||||||
If Zeroconf support (`Avahi <http://avahi.org/>`_ or Apple's Bonjour)
|
If Zeroconf support (`Avahi <http://avahi.org/>`_
|
||||||
was enabled at compile time with :code:`-Dzeroconf=...`,
|
was enabled at compile time with :code:`-Dzeroconf=...`,
|
||||||
:program:`MPD` can announce its presence on the network. The following
|
:program:`MPD` can announce its presence on the network. The following
|
||||||
settings control this feature:
|
settings control this feature:
|
||||||
|
|
|
||||||
|
|
@ -477,8 +477,6 @@ subdir('src/net')
|
||||||
subdir('src/event')
|
subdir('src/event')
|
||||||
subdir('src/win32')
|
subdir('src/win32')
|
||||||
|
|
||||||
subdir('src/apple')
|
|
||||||
|
|
||||||
subdir('src/fs/glue')
|
subdir('src/fs/glue')
|
||||||
|
|
||||||
subdir('src/config')
|
subdir('src/config')
|
||||||
|
|
|
||||||
|
|
@ -201,6 +201,6 @@ option('yajl', type: 'feature', description: 'libyajl for YAML support')
|
||||||
option('zlib', type: 'feature', description: 'zlib support (for database compression)')
|
option('zlib', type: 'feature', description: 'zlib support (for database compression)')
|
||||||
|
|
||||||
option('zeroconf', type: 'combo',
|
option('zeroconf', type: 'combo',
|
||||||
choices: ['auto', 'avahi', 'bonjour', 'disabled'],
|
choices: ['auto', 'avahi', 'disabled'],
|
||||||
value: 'auto',
|
value: 'auto',
|
||||||
description: 'Zeroconf support')
|
description: 'Zeroconf support')
|
||||||
|
|
|
||||||
|
|
@ -35,26 +35,7 @@ set(CMAKE_CXX_FLAGS_INIT "{toolchain.cxxflags} {toolchain.cppflags}")
|
||||||
__write_cmake_compiler(f, 'C', toolchain.cc)
|
__write_cmake_compiler(f, 'C', toolchain.cc)
|
||||||
__write_cmake_compiler(f, 'CXX', toolchain.cxx)
|
__write_cmake_compiler(f, 'CXX', toolchain.cxx)
|
||||||
|
|
||||||
if cmake_system_name == 'Darwin':
|
if cmake_system_name == 'Windows':
|
||||||
# On macOS, cmake forcibly adds an "-isysroot" flag even if
|
|
||||||
# one is already present in the flags variable; this breaks
|
|
||||||
# cross-compiling for iOS, and can be worked around by setting
|
|
||||||
# the CMAKE_OSX_SYSROOT variable
|
|
||||||
# (https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html).
|
|
||||||
m = re.search(r'-isysroot +(\S+)', toolchain.cflags)
|
|
||||||
if m:
|
|
||||||
sysroot = m.group(1)
|
|
||||||
|
|
||||||
print(f'set(CMAKE_OSX_SYSROOT {sysroot})', file=f)
|
|
||||||
|
|
||||||
# search libraries and headers only in the sysroot, not on
|
|
||||||
# the build host
|
|
||||||
f.write(f"""
|
|
||||||
set(CMAKE_FIND_ROOT_PATH "{toolchain.install_prefix};{sysroot}")
|
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
|
||||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
|
||||||
""")
|
|
||||||
elif cmake_system_name == 'Windows':
|
|
||||||
# search libraries and headers only in the sysroot, not on
|
# search libraries and headers only in the sysroot, not on
|
||||||
# the build host
|
# the build host
|
||||||
f.write(f"""
|
f.write(f"""
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
// author: Max Kellermann <max.kellermann@gmail.com>
|
|
||||||
|
|
||||||
#include "AudioObject.hxx"
|
|
||||||
#include "StringRef.hxx"
|
|
||||||
|
|
||||||
Apple::StringRef
|
|
||||||
AudioObjectGetStringProperty(AudioObjectID inObjectID,
|
|
||||||
const AudioObjectPropertyAddress &inAddress)
|
|
||||||
{
|
|
||||||
auto s = AudioObjectGetPropertyDataT<CFStringRef>(inObjectID,
|
|
||||||
inAddress);
|
|
||||||
return Apple::StringRef(s);
|
|
||||||
}
|
|
||||||
|
|
@ -1,79 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
// author: Max Kellermann <max.kellermann@gmail.com>
|
|
||||||
|
|
||||||
#ifndef APPLE_AUDIO_OBJECT_HXX
|
|
||||||
#define APPLE_AUDIO_OBJECT_HXX
|
|
||||||
|
|
||||||
#include "Throw.hxx"
|
|
||||||
#include "util/AllocatedArray.hxx"
|
|
||||||
|
|
||||||
#include <CoreAudio/AudioHardware.h>
|
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
|
|
||||||
namespace Apple {
|
|
||||||
class StringRef;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline std::size_t
|
|
||||||
AudioObjectGetPropertyDataSize(AudioObjectID inObjectID,
|
|
||||||
const AudioObjectPropertyAddress &inAddress)
|
|
||||||
{
|
|
||||||
UInt32 size;
|
|
||||||
OSStatus status = AudioObjectGetPropertyDataSize(inObjectID,
|
|
||||||
&inAddress,
|
|
||||||
0, nullptr, &size);
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status);
|
|
||||||
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename T>
|
|
||||||
T
|
|
||||||
AudioObjectGetPropertyDataT(AudioObjectID inObjectID,
|
|
||||||
const AudioObjectPropertyAddress &inAddress)
|
|
||||||
{
|
|
||||||
OSStatus status;
|
|
||||||
UInt32 size = sizeof(T);
|
|
||||||
T value;
|
|
||||||
|
|
||||||
status = AudioObjectGetPropertyData(inObjectID, &inAddress,
|
|
||||||
0, nullptr,
|
|
||||||
&size, &value);
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status);
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
Apple::StringRef
|
|
||||||
AudioObjectGetStringProperty(AudioObjectID inObjectID,
|
|
||||||
const AudioObjectPropertyAddress &inAddress);
|
|
||||||
|
|
||||||
template<typename T>
|
|
||||||
AllocatedArray<T>
|
|
||||||
AudioObjectGetPropertyDataArray(AudioObjectID inObjectID,
|
|
||||||
const AudioObjectPropertyAddress &inAddress)
|
|
||||||
{
|
|
||||||
OSStatus status;
|
|
||||||
UInt32 size;
|
|
||||||
|
|
||||||
status = AudioObjectGetPropertyDataSize(inObjectID,
|
|
||||||
&inAddress,
|
|
||||||
0, nullptr, &size);
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status);
|
|
||||||
|
|
||||||
AllocatedArray<T> result(size / sizeof(T));
|
|
||||||
|
|
||||||
status = AudioObjectGetPropertyData(inObjectID, &inAddress,
|
|
||||||
0, nullptr,
|
|
||||||
&size, result.data());
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
// author: Max Kellermann <max.kellermann@gmail.com>
|
|
||||||
|
|
||||||
#ifndef APPLE_AUDIO_UNIT_HXX
|
|
||||||
#define APPLE_AUDIO_UNIT_HXX
|
|
||||||
|
|
||||||
#include "Throw.hxx"
|
|
||||||
|
|
||||||
#include <AudioUnit/AudioUnit.h>
|
|
||||||
|
|
||||||
template<typename T>
|
|
||||||
T
|
|
||||||
AudioUnitGetPropertyT(AudioUnit inUnit, AudioUnitPropertyID inID,
|
|
||||||
AudioUnitScope inScope,
|
|
||||||
AudioUnitElement inElement)
|
|
||||||
{
|
|
||||||
UInt32 size = sizeof(T);
|
|
||||||
T value;
|
|
||||||
|
|
||||||
OSStatus status = AudioUnitGetProperty(inUnit, inID, inScope,
|
|
||||||
inElement,
|
|
||||||
&value, &size);
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status);
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename T>
|
|
||||||
void
|
|
||||||
AudioUnitSetPropertyT(AudioUnit inUnit, AudioUnitPropertyID inID,
|
|
||||||
AudioUnitScope inScope,
|
|
||||||
AudioUnitElement inElement,
|
|
||||||
const T &value)
|
|
||||||
{
|
|
||||||
OSStatus status = AudioUnitSetProperty(inUnit, inID, inScope,
|
|
||||||
inElement,
|
|
||||||
&value, sizeof(value));
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void
|
|
||||||
AudioUnitSetCurrentDevice(AudioUnit inUnit, const AudioDeviceID &value)
|
|
||||||
{
|
|
||||||
AudioUnitSetPropertyT(inUnit, kAudioOutputUnitProperty_CurrentDevice,
|
|
||||||
kAudioUnitScope_Global, 0,
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void
|
|
||||||
AudioUnitSetInputStreamFormat(AudioUnit inUnit,
|
|
||||||
const AudioStreamBasicDescription &value)
|
|
||||||
{
|
|
||||||
AudioUnitSetPropertyT(inUnit, kAudioUnitProperty_StreamFormat,
|
|
||||||
kAudioUnitScope_Input, 0,
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void
|
|
||||||
AudioUnitSetInputRenderCallback(AudioUnit inUnit,
|
|
||||||
const AURenderCallbackStruct &value)
|
|
||||||
{
|
|
||||||
AudioUnitSetPropertyT(inUnit, kAudioUnitProperty_SetRenderCallback,
|
|
||||||
kAudioUnitScope_Input, 0,
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline UInt32
|
|
||||||
AudioUnitGetBufferFrameSize(AudioUnit inUnit)
|
|
||||||
{
|
|
||||||
return AudioUnitGetPropertyT<UInt32>(inUnit,
|
|
||||||
kAudioDevicePropertyBufferFrameSize,
|
|
||||||
kAudioUnitScope_Global, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void
|
|
||||||
AudioUnitSetBufferFrameSize(AudioUnit inUnit, const UInt32 &value)
|
|
||||||
{
|
|
||||||
AudioUnitSetPropertyT(inUnit, kAudioDevicePropertyBufferFrameSize,
|
|
||||||
kAudioUnitScope_Global, 0,
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
// author: Max Kellermann <max.kellermann@gmail.com>
|
|
||||||
|
|
||||||
#ifndef APPLE_ERROR_REF_HXX
|
|
||||||
#define APPLE_ERROR_REF_HXX
|
|
||||||
|
|
||||||
#include <CoreFoundation/CFError.h>
|
|
||||||
|
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
namespace Apple {
|
|
||||||
|
|
||||||
class ErrorRef {
|
|
||||||
CFErrorRef ref = nullptr;
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit ErrorRef(CFErrorRef _ref) noexcept
|
|
||||||
:ref(_ref) {}
|
|
||||||
|
|
||||||
ErrorRef(CFAllocatorRef allocator, CFErrorDomain domain,
|
|
||||||
CFIndex code, CFDictionaryRef userInfo) noexcept
|
|
||||||
:ref(CFErrorCreate(allocator, domain, code, userInfo)) {}
|
|
||||||
|
|
||||||
ErrorRef(ErrorRef &&src) noexcept
|
|
||||||
:ref(std::exchange(src.ref, nullptr)) {}
|
|
||||||
|
|
||||||
~ErrorRef() noexcept {
|
|
||||||
if (ref)
|
|
||||||
CFRelease(ref);
|
|
||||||
}
|
|
||||||
|
|
||||||
ErrorRef &operator=(ErrorRef &&src) noexcept {
|
|
||||||
using std::swap;
|
|
||||||
swap(ref, src.ref);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
operator bool() const noexcept {
|
|
||||||
return ref != nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
CFStringRef CopyDescription() const noexcept {
|
|
||||||
return CFErrorCopyDescription(ref);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Apple
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
// author: Max Kellermann <max.kellermann@gmail.com>
|
|
||||||
|
|
||||||
#ifndef APPLE_STRING_REF_HXX
|
|
||||||
#define APPLE_STRING_REF_HXX
|
|
||||||
|
|
||||||
#include <CoreFoundation/CFString.h>
|
|
||||||
|
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
namespace Apple {
|
|
||||||
|
|
||||||
class StringRef {
|
|
||||||
CFStringRef ref = nullptr;
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit StringRef(CFStringRef _ref) noexcept
|
|
||||||
:ref(_ref) {}
|
|
||||||
|
|
||||||
StringRef(StringRef &&src) noexcept
|
|
||||||
:ref(std::exchange(src.ref, nullptr)) {}
|
|
||||||
|
|
||||||
~StringRef() noexcept {
|
|
||||||
if (ref)
|
|
||||||
CFRelease(ref);
|
|
||||||
}
|
|
||||||
|
|
||||||
StringRef &operator=(StringRef &&src) noexcept {
|
|
||||||
using std::swap;
|
|
||||||
swap(ref, src.ref);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
operator bool() const noexcept {
|
|
||||||
return ref != nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GetCString(char *buffer, std::size_t size,
|
|
||||||
CFStringEncoding encoding=kCFStringEncodingUTF8) const noexcept
|
|
||||||
{
|
|
||||||
return CFStringGetCString(ref, buffer, size, encoding);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Apple
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
// author: Max Kellermann <max.kellermann@gmail.com>
|
|
||||||
|
|
||||||
#include "Throw.hxx"
|
|
||||||
#include "ErrorRef.hxx"
|
|
||||||
#include "StringRef.hxx"
|
|
||||||
|
|
||||||
#include <cstring>
|
|
||||||
#include <stdexcept>
|
|
||||||
|
|
||||||
namespace Apple {
|
|
||||||
|
|
||||||
void
|
|
||||||
ThrowOSStatus(OSStatus status)
|
|
||||||
{
|
|
||||||
const Apple::ErrorRef cferr(nullptr, kCFErrorDomainOSStatus,
|
|
||||||
status, nullptr);
|
|
||||||
const Apple::StringRef cfstr(cferr.CopyDescription());
|
|
||||||
|
|
||||||
char msg[1024];
|
|
||||||
if (!cfstr.GetCString(msg, sizeof(msg)))
|
|
||||||
throw std::runtime_error("Unknown OSStatus");
|
|
||||||
|
|
||||||
throw std::runtime_error(msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
ThrowOSStatus(OSStatus status, const char *_msg)
|
|
||||||
{
|
|
||||||
const Apple::ErrorRef cferr(nullptr, kCFErrorDomainOSStatus,
|
|
||||||
status, nullptr);
|
|
||||||
const Apple::StringRef cfstr(cferr.CopyDescription());
|
|
||||||
|
|
||||||
char msg[1024];
|
|
||||||
std::strcpy(msg, _msg);
|
|
||||||
size_t length = std::strlen(msg);
|
|
||||||
|
|
||||||
cfstr.GetCString(msg + length, sizeof(msg) - length);
|
|
||||||
throw std::runtime_error(msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Apple
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
// author: Max Kellermann <max.kellermann@gmail.com>
|
|
||||||
|
|
||||||
#ifndef APPLE_THROW_HXX
|
|
||||||
#define APPLE_THROW_HXX
|
|
||||||
|
|
||||||
#include <CoreFoundation/CFBase.h>
|
|
||||||
|
|
||||||
namespace Apple {
|
|
||||||
|
|
||||||
void
|
|
||||||
ThrowOSStatus(OSStatus status);
|
|
||||||
|
|
||||||
void
|
|
||||||
ThrowOSStatus(OSStatus status, const char *msg);
|
|
||||||
|
|
||||||
} // namespace Apple
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
if not is_darwin
|
|
||||||
apple_dep = dependency('', required: false)
|
|
||||||
subdir_done()
|
|
||||||
endif
|
|
||||||
|
|
||||||
audiounit_dep = declare_dependency(
|
|
||||||
link_args: ['-framework', 'AudioUnit', '-framework', 'CoreAudio', '-framework', 'CoreServices'],
|
|
||||||
)
|
|
||||||
|
|
||||||
apple = static_library(
|
|
||||||
'apple',
|
|
||||||
'AudioObject.cxx',
|
|
||||||
'Throw.cxx',
|
|
||||||
include_directories: inc,
|
|
||||||
dependencies: [
|
|
||||||
audiounit_dep,
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
apple_dep = declare_dependency(
|
|
||||||
link_with: apple,
|
|
||||||
dependencies: [
|
|
||||||
audiounit_dep,
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
// Copyright The Music Player Daemon Project
|
|
||||||
|
|
||||||
#include "OSXMixerPlugin.hxx"
|
|
||||||
#include "mixer/Mixer.hxx"
|
|
||||||
#include "output/plugins/OSXOutputPlugin.hxx"
|
|
||||||
|
|
||||||
class OSXMixer final : public Mixer {
|
|
||||||
OSXOutput &output;
|
|
||||||
|
|
||||||
public:
|
|
||||||
OSXMixer(OSXOutput &_output, MixerListener &_listener)
|
|
||||||
:Mixer(osx_mixer_plugin, _listener),
|
|
||||||
output(_output)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* virtual methods from class Mixer */
|
|
||||||
void Open() noexcept override {
|
|
||||||
}
|
|
||||||
|
|
||||||
void Close() noexcept override {
|
|
||||||
}
|
|
||||||
|
|
||||||
int GetVolume() override;
|
|
||||||
void SetVolume(unsigned volume) override;
|
|
||||||
};
|
|
||||||
|
|
||||||
int
|
|
||||||
OSXMixer::GetVolume()
|
|
||||||
{
|
|
||||||
return osx_output_get_volume(output);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
OSXMixer::SetVolume(unsigned new_volume)
|
|
||||||
{
|
|
||||||
osx_output_set_volume(output, new_volume);
|
|
||||||
}
|
|
||||||
|
|
||||||
static Mixer *
|
|
||||||
osx_mixer_init([[maybe_unused]] EventLoop &event_loop, AudioOutput &ao,
|
|
||||||
MixerListener &listener,
|
|
||||||
[[maybe_unused]] const ConfigBlock &block)
|
|
||||||
{
|
|
||||||
OSXOutput &osxo = (OSXOutput &)ao;
|
|
||||||
return new OSXMixer(osxo, listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
const MixerPlugin osx_mixer_plugin = {
|
|
||||||
osx_mixer_init,
|
|
||||||
true,
|
|
||||||
};
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
// Copyright The Music Player Daemon Project
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
struct MixerPlugin;
|
|
||||||
|
|
||||||
extern const MixerPlugin osx_mixer_plugin;
|
|
||||||
|
|
@ -14,10 +14,6 @@ if enable_oss
|
||||||
mixer_plugins_sources += 'OssMixerPlugin.cxx'
|
mixer_plugins_sources += 'OssMixerPlugin.cxx'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if is_darwin
|
|
||||||
mixer_plugins_sources += 'OSXMixerPlugin.cxx'
|
|
||||||
endif
|
|
||||||
|
|
||||||
if pipewire_dep.found()
|
if pipewire_dep.found()
|
||||||
mixer_plugins_sources += 'PipeWireMixerPlugin.cxx'
|
mixer_plugins_sources += 'PipeWireMixerPlugin.cxx'
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@
|
||||||
#include "plugins/NullOutputPlugin.hxx"
|
#include "plugins/NullOutputPlugin.hxx"
|
||||||
#include "plugins/OpenALOutputPlugin.hxx"
|
#include "plugins/OpenALOutputPlugin.hxx"
|
||||||
#include "plugins/OssOutputPlugin.hxx"
|
#include "plugins/OssOutputPlugin.hxx"
|
||||||
#include "plugins/OSXOutputPlugin.hxx"
|
|
||||||
#include "plugins/PipeOutputPlugin.hxx"
|
#include "plugins/PipeOutputPlugin.hxx"
|
||||||
#include "plugins/PipeWireOutputPlugin.hxx"
|
#include "plugins/PipeWireOutputPlugin.hxx"
|
||||||
#include "plugins/PulseOutputPlugin.hxx"
|
#include "plugins/PulseOutputPlugin.hxx"
|
||||||
|
|
@ -60,9 +59,6 @@ constinit const AudioOutputPlugin *const audio_output_plugins[] = {
|
||||||
#ifdef HAVE_OPENAL
|
#ifdef HAVE_OPENAL
|
||||||
&openal_output_plugin,
|
&openal_output_plugin,
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_OSX
|
|
||||||
&osx_output_plugin,
|
|
||||||
#endif
|
|
||||||
#ifdef ENABLE_SOLARIS_OUTPUT
|
#ifdef ENABLE_SOLARIS_OUTPUT
|
||||||
&solaris_output_plugin,
|
&solaris_output_plugin,
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -1,851 +0,0 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
// Copyright The Music Player Daemon Project
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include "OSXOutputPlugin.hxx"
|
|
||||||
#include "apple/AudioObject.hxx"
|
|
||||||
#include "apple/AudioUnit.hxx"
|
|
||||||
#include "apple/StringRef.hxx"
|
|
||||||
#include "apple/Throw.hxx"
|
|
||||||
#include "../OutputAPI.hxx"
|
|
||||||
#include "mixer/plugins/OSXMixerPlugin.hxx"
|
|
||||||
#include "lib/fmt/RuntimeError.hxx"
|
|
||||||
#include "lib/fmt/ToBuffer.hxx"
|
|
||||||
#include "util/Domain.hxx"
|
|
||||||
#include "util/Manual.hxx"
|
|
||||||
#include "pcm/Export.hxx"
|
|
||||||
#include "thread/Mutex.hxx"
|
|
||||||
#include "thread/Cond.hxx"
|
|
||||||
#include "util/ByteOrder.hxx"
|
|
||||||
#include "util/CharUtil.hxx"
|
|
||||||
#include "util/RingBuffer.hxx"
|
|
||||||
#include "util/StringAPI.hxx"
|
|
||||||
#include "util/StringBuffer.hxx"
|
|
||||||
#include "Log.hxx"
|
|
||||||
|
|
||||||
#include <CoreAudio/CoreAudio.h>
|
|
||||||
#include <AudioUnit/AudioUnit.h>
|
|
||||||
#include <AudioToolbox/AudioToolbox.h>
|
|
||||||
#include <CoreServices/CoreServices.h>
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <span>
|
|
||||||
|
|
||||||
// Backward compatibility from OSX 12.0 API change
|
|
||||||
#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 120000)
|
|
||||||
#define KAUDIO_OBJECT_PROPERTY_ELEMENT_MM kAudioObjectPropertyElementMain
|
|
||||||
#define KAUDIO_HARDWARE_SERVICE_DEVICE_PROPERTY_VV kAudioHardwareServiceDeviceProperty_VirtualMainVolume
|
|
||||||
#else
|
|
||||||
#define KAUDIO_OBJECT_PROPERTY_ELEMENT_MM kAudioObjectPropertyElementMaster
|
|
||||||
#define KAUDIO_HARDWARE_SERVICE_DEVICE_PROPERTY_VV kAudioHardwareServiceDeviceProperty_VirtualMasterVolume
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static constexpr unsigned MPD_OSX_BUFFER_TIME_MS = 100;
|
|
||||||
|
|
||||||
static auto
|
|
||||||
StreamDescriptionToString(const AudioStreamBasicDescription desc) noexcept
|
|
||||||
{
|
|
||||||
// Only convert the lpcm formats (nothing else supported / used by MPD)
|
|
||||||
assert(desc.mFormatID == kAudioFormatLinearPCM);
|
|
||||||
|
|
||||||
return FmtBuffer<256>("{} channel {} {}interleaved {}-bit {} {} ({}Hz)",
|
|
||||||
desc.mChannelsPerFrame,
|
|
||||||
(desc.mFormatFlags & kAudioFormatFlagIsNonMixable) ? "" : "mixable",
|
|
||||||
(desc.mFormatFlags & kAudioFormatFlagIsNonInterleaved) ? "non-" : "",
|
|
||||||
desc.mBitsPerChannel,
|
|
||||||
(desc.mFormatFlags & kAudioFormatFlagIsFloat) ? "Float" : "SInt",
|
|
||||||
(desc.mFormatFlags & kAudioFormatFlagIsBigEndian) ? "BE" : "LE",
|
|
||||||
desc.mSampleRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
struct OSXOutput final : AudioOutput {
|
|
||||||
/* configuration settings */
|
|
||||||
OSType component_subtype;
|
|
||||||
/* only applicable with kAudioUnitSubType_HALOutput */
|
|
||||||
const char *device_name;
|
|
||||||
const char *const channel_map;
|
|
||||||
const bool hog_device;
|
|
||||||
|
|
||||||
bool pause;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Is the audio unit "started", i.e. was AudioOutputUnitStart() called?
|
|
||||||
*/
|
|
||||||
bool started;
|
|
||||||
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
/**
|
|
||||||
* Enable DSD over PCM according to the DoP standard?
|
|
||||||
*
|
|
||||||
* @see http://dsd-guide.com/dop-open-standard
|
|
||||||
*/
|
|
||||||
const bool dop_setting;
|
|
||||||
bool dop_enabled;
|
|
||||||
Manual<PcmExport> pcm_export;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
AudioDeviceID dev_id;
|
|
||||||
AudioComponentInstance au;
|
|
||||||
AudioStreamBasicDescription asbd;
|
|
||||||
|
|
||||||
using RingBuffer = ::RingBuffer<std::byte>;
|
|
||||||
RingBuffer ring_buffer;
|
|
||||||
|
|
||||||
OSXOutput(const ConfigBlock &block);
|
|
||||||
|
|
||||||
static AudioOutput *Create(EventLoop &, const ConfigBlock &block);
|
|
||||||
int GetVolume();
|
|
||||||
void SetVolume(unsigned new_volume);
|
|
||||||
|
|
||||||
private:
|
|
||||||
void Enable() override;
|
|
||||||
void Disable() noexcept override;
|
|
||||||
|
|
||||||
void Open(AudioFormat &audio_format) override;
|
|
||||||
void Close() noexcept override;
|
|
||||||
|
|
||||||
std::chrono::steady_clock::duration Delay() const noexcept override;
|
|
||||||
std::size_t Play(std::span<const std::byte> src) override;
|
|
||||||
bool Pause() override;
|
|
||||||
void Cancel() noexcept override;
|
|
||||||
};
|
|
||||||
|
|
||||||
static constexpr Domain osx_output_domain("osx_output");
|
|
||||||
|
|
||||||
static bool
|
|
||||||
osx_output_test_default_device()
|
|
||||||
{
|
|
||||||
/* on a Mac, this is always the default plugin, if nothing
|
|
||||||
else is configured */
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
OSXOutput::OSXOutput(const ConfigBlock &block)
|
|
||||||
:AudioOutput(FLAG_ENABLE_DISABLE|FLAG_PAUSE),
|
|
||||||
channel_map(block.GetBlockValue("channel_map")),
|
|
||||||
hog_device(block.GetBlockValue("hog_device", false))
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
, dop_setting(block.GetBlockValue("dop", false))
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
const char *device = block.GetBlockValue("device");
|
|
||||||
|
|
||||||
if (device == nullptr || StringIsEqual(device, "default")) {
|
|
||||||
component_subtype = kAudioUnitSubType_DefaultOutput;
|
|
||||||
device_name = nullptr;
|
|
||||||
}
|
|
||||||
else if (StringIsEqual(device, "system")) {
|
|
||||||
component_subtype = kAudioUnitSubType_SystemOutput;
|
|
||||||
device_name = nullptr;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
component_subtype = kAudioUnitSubType_HALOutput;
|
|
||||||
/* XXX am I supposed to strdup() this? */
|
|
||||||
device_name = device;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
AudioOutput *
|
|
||||||
OSXOutput::Create(EventLoop &, const ConfigBlock &block)
|
|
||||||
{
|
|
||||||
OSXOutput *oo = new OSXOutput(block);
|
|
||||||
|
|
||||||
static constexpr AudioObjectPropertyAddress default_system_output_device{
|
|
||||||
kAudioHardwarePropertyDefaultSystemOutputDevice,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM,
|
|
||||||
};
|
|
||||||
|
|
||||||
static constexpr AudioObjectPropertyAddress default_output_device{
|
|
||||||
kAudioHardwarePropertyDefaultOutputDevice,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM
|
|
||||||
};
|
|
||||||
|
|
||||||
const auto &aopa =
|
|
||||||
oo->component_subtype == kAudioUnitSubType_SystemOutput
|
|
||||||
// get system output dev_id if configured
|
|
||||||
? default_system_output_device
|
|
||||||
/* fallback to default device initially (can still be
|
|
||||||
changed by osx_output_set_device) */
|
|
||||||
: default_output_device;
|
|
||||||
|
|
||||||
AudioDeviceID dev_id = kAudioDeviceUnknown;
|
|
||||||
UInt32 dev_id_size = sizeof(dev_id);
|
|
||||||
AudioObjectGetPropertyData(kAudioObjectSystemObject,
|
|
||||||
&aopa,
|
|
||||||
0,
|
|
||||||
NULL,
|
|
||||||
&dev_id_size,
|
|
||||||
&dev_id);
|
|
||||||
oo->dev_id = dev_id;
|
|
||||||
|
|
||||||
return oo;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
OSXOutput::GetVolume()
|
|
||||||
{
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa = {
|
|
||||||
KAUDIO_HARDWARE_SERVICE_DEVICE_PROPERTY_VV,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM,
|
|
||||||
};
|
|
||||||
|
|
||||||
const auto vol = AudioObjectGetPropertyDataT<Float32>(dev_id,
|
|
||||||
aopa);
|
|
||||||
|
|
||||||
return static_cast<int>(vol * 100.0f);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
OSXOutput::SetVolume(unsigned new_volume)
|
|
||||||
{
|
|
||||||
Float32 vol = new_volume / 100.0;
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa = {
|
|
||||||
KAUDIO_HARDWARE_SERVICE_DEVICE_PROPERTY_VV,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM
|
|
||||||
};
|
|
||||||
UInt32 size = sizeof(vol);
|
|
||||||
OSStatus status = AudioObjectSetPropertyData(dev_id,
|
|
||||||
&aopa,
|
|
||||||
0,
|
|
||||||
NULL,
|
|
||||||
size,
|
|
||||||
&vol);
|
|
||||||
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
osx_output_parse_channel_map(const char *device_name,
|
|
||||||
const char *channel_map_str,
|
|
||||||
SInt32 channel_map[],
|
|
||||||
UInt32 num_channels)
|
|
||||||
{
|
|
||||||
unsigned int inserted_channels = 0;
|
|
||||||
bool want_number = true;
|
|
||||||
|
|
||||||
while (*channel_map_str) {
|
|
||||||
if (inserted_channels >= num_channels)
|
|
||||||
throw FmtRuntimeError("{}: channel map contains more than {} entries or trailing garbage",
|
|
||||||
device_name, num_channels);
|
|
||||||
|
|
||||||
if (!want_number && *channel_map_str == ',') {
|
|
||||||
++channel_map_str;
|
|
||||||
want_number = true;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (want_number &&
|
|
||||||
(IsDigitASCII(*channel_map_str) || *channel_map_str == '-')
|
|
||||||
) {
|
|
||||||
char *endptr;
|
|
||||||
channel_map[inserted_channels] = strtol(channel_map_str, &endptr, 10);
|
|
||||||
if (channel_map[inserted_channels] < -1)
|
|
||||||
throw FmtRuntimeError("{}: channel map value {} not allowed (must be -1 or greater)",
|
|
||||||
device_name, channel_map[inserted_channels]);
|
|
||||||
|
|
||||||
channel_map_str = endptr;
|
|
||||||
want_number = false;
|
|
||||||
FmtDebug(osx_output_domain,
|
|
||||||
"{}: channel_map[{}] = {}",
|
|
||||||
device_name, inserted_channels,
|
|
||||||
channel_map[inserted_channels]);
|
|
||||||
++inserted_channels;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw FmtRuntimeError("{}: invalid character {:?} in channel map",
|
|
||||||
device_name, *channel_map_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inserted_channels < num_channels)
|
|
||||||
throw FmtRuntimeError("{}: channel map contains less than {} entries",
|
|
||||||
device_name, num_channels);
|
|
||||||
}
|
|
||||||
|
|
||||||
static UInt32
|
|
||||||
AudioUnitGetChannelsPerFrame(AudioUnit inUnit)
|
|
||||||
{
|
|
||||||
const auto desc = AudioUnitGetPropertyT<AudioStreamBasicDescription>(inUnit,
|
|
||||||
kAudioUnitProperty_StreamFormat,
|
|
||||||
kAudioUnitScope_Output,
|
|
||||||
0);
|
|
||||||
return desc.mChannelsPerFrame;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
osx_output_set_channel_map(OSXOutput *oo)
|
|
||||||
{
|
|
||||||
OSStatus status;
|
|
||||||
|
|
||||||
const UInt32 num_channels = AudioUnitGetChannelsPerFrame(oo->au);
|
|
||||||
auto channel_map = std::make_unique<SInt32[]>(num_channels);
|
|
||||||
osx_output_parse_channel_map(oo->device_name,
|
|
||||||
oo->channel_map,
|
|
||||||
channel_map.get(),
|
|
||||||
num_channels);
|
|
||||||
|
|
||||||
UInt32 size = num_channels * sizeof(SInt32);
|
|
||||||
status = AudioUnitSetProperty(oo->au,
|
|
||||||
kAudioOutputUnitProperty_ChannelMap,
|
|
||||||
kAudioUnitScope_Input,
|
|
||||||
0,
|
|
||||||
channel_map.get(),
|
|
||||||
size);
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status, "unable to set channel map");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static float
|
|
||||||
osx_output_score_sample_rate(Float64 destination_rate, unsigned source_rate)
|
|
||||||
{
|
|
||||||
float score = 0;
|
|
||||||
double int_portion;
|
|
||||||
double frac_portion = modf(source_rate / destination_rate, &int_portion);
|
|
||||||
// prefer sample rates that are multiples of the source sample rate
|
|
||||||
if (frac_portion < 0.01 || frac_portion >= 0.99)
|
|
||||||
score += 1000;
|
|
||||||
// prefer exact matches over other multiples
|
|
||||||
score += (int_portion == 1.0) ? 500 : 0;
|
|
||||||
if (source_rate == destination_rate)
|
|
||||||
score += 1000;
|
|
||||||
else if (source_rate > destination_rate)
|
|
||||||
score += (int_portion > 1 && int_portion < 100) ? (100 - int_portion) / 100 * 100 : 0;
|
|
||||||
else
|
|
||||||
score += (int_portion > 1 && int_portion < 100) ? (100 + int_portion) / 100 * 100 : 0;
|
|
||||||
|
|
||||||
return score;
|
|
||||||
}
|
|
||||||
|
|
||||||
static float
|
|
||||||
osx_output_score_format(const AudioStreamBasicDescription &format_desc,
|
|
||||||
const AudioStreamBasicDescription &target_format)
|
|
||||||
{
|
|
||||||
float score = 0;
|
|
||||||
// Score only linear PCM formats (everything else MPD cannot use)
|
|
||||||
if (format_desc.mFormatID == kAudioFormatLinearPCM) {
|
|
||||||
score += osx_output_score_sample_rate(format_desc.mSampleRate,
|
|
||||||
target_format.mSampleRate);
|
|
||||||
|
|
||||||
// Just choose the stream / format with the highest number of output channels
|
|
||||||
score += format_desc.mChannelsPerFrame * 5;
|
|
||||||
|
|
||||||
if (target_format.mFormatFlags == kLinearPCMFormatFlagIsFloat) {
|
|
||||||
// for float, prefer the highest bitdepth we have
|
|
||||||
if (format_desc.mBitsPerChannel >= 16)
|
|
||||||
score += (format_desc.mBitsPerChannel / 8);
|
|
||||||
} else {
|
|
||||||
if (format_desc.mBitsPerChannel == target_format.mBitsPerChannel)
|
|
||||||
score += 5;
|
|
||||||
else if (format_desc.mBitsPerChannel > target_format.mBitsPerChannel)
|
|
||||||
score += 1;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return score;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Float64
|
|
||||||
osx_output_set_device_format(AudioDeviceID dev_id,
|
|
||||||
const AudioStreamBasicDescription &target_format)
|
|
||||||
{
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa_device_streams = {
|
|
||||||
kAudioDevicePropertyStreams,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM
|
|
||||||
};
|
|
||||||
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa_stream_direction = {
|
|
||||||
kAudioStreamPropertyDirection,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM
|
|
||||||
};
|
|
||||||
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa_stream_phys_formats = {
|
|
||||||
kAudioStreamPropertyAvailablePhysicalFormats,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM
|
|
||||||
};
|
|
||||||
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa_stream_phys_format = {
|
|
||||||
kAudioStreamPropertyPhysicalFormat,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM
|
|
||||||
};
|
|
||||||
|
|
||||||
OSStatus err;
|
|
||||||
|
|
||||||
const auto streams =
|
|
||||||
AudioObjectGetPropertyDataArray<AudioStreamID>(dev_id,
|
|
||||||
aopa_device_streams);
|
|
||||||
|
|
||||||
bool format_found = false;
|
|
||||||
int output_stream;
|
|
||||||
AudioStreamBasicDescription output_format;
|
|
||||||
|
|
||||||
for (const auto stream : streams) {
|
|
||||||
const auto direction =
|
|
||||||
AudioObjectGetPropertyDataT<UInt32>(stream,
|
|
||||||
aopa_stream_direction);
|
|
||||||
if (direction != 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
const auto format_list =
|
|
||||||
AudioObjectGetPropertyDataArray<AudioStreamRangedDescription>(stream,
|
|
||||||
aopa_stream_phys_formats);
|
|
||||||
|
|
||||||
float output_score = 0;
|
|
||||||
|
|
||||||
for (const auto &format : format_list) {
|
|
||||||
AudioStreamBasicDescription format_desc = format.mFormat;
|
|
||||||
std::string format_string;
|
|
||||||
|
|
||||||
// for devices with kAudioStreamAnyRate
|
|
||||||
// we use the requested samplerate here
|
|
||||||
if (format_desc.mSampleRate == kAudioStreamAnyRate)
|
|
||||||
format_desc.mSampleRate = target_format.mSampleRate;
|
|
||||||
float score = osx_output_score_format(format_desc, target_format);
|
|
||||||
|
|
||||||
// print all (linear pcm) formats and their rating
|
|
||||||
if (score > 0.0f)
|
|
||||||
FmtDebug(osx_output_domain,
|
|
||||||
"Format: {} rated {}",
|
|
||||||
StreamDescriptionToString(format_desc).c_str(),
|
|
||||||
score);
|
|
||||||
|
|
||||||
if (score > output_score) {
|
|
||||||
output_score = score;
|
|
||||||
output_format = format_desc;
|
|
||||||
output_stream = stream; // set the idx of the stream in the device
|
|
||||||
format_found = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (format_found) {
|
|
||||||
err = AudioObjectSetPropertyData(output_stream,
|
|
||||||
&aopa_stream_phys_format,
|
|
||||||
0,
|
|
||||||
NULL,
|
|
||||||
sizeof(output_format),
|
|
||||||
&output_format);
|
|
||||||
if (err != noErr)
|
|
||||||
throw FmtRuntimeError("Failed to change the stream format: {}",
|
|
||||||
err);
|
|
||||||
}
|
|
||||||
|
|
||||||
return output_format.mSampleRate;
|
|
||||||
}
|
|
||||||
|
|
||||||
static UInt32
|
|
||||||
osx_output_set_buffer_size(AudioUnit au, AudioStreamBasicDescription desc)
|
|
||||||
{
|
|
||||||
const auto value_range = AudioUnitGetPropertyT<AudioValueRange>(au,
|
|
||||||
kAudioDevicePropertyBufferFrameSizeRange,
|
|
||||||
kAudioUnitScope_Global,
|
|
||||||
0);
|
|
||||||
|
|
||||||
try {
|
|
||||||
AudioUnitSetBufferFrameSize(au, value_range.mMaximum);
|
|
||||||
} catch (...) {
|
|
||||||
LogError(std::current_exception(),
|
|
||||||
"Failed to set maximum buffer size");
|
|
||||||
}
|
|
||||||
|
|
||||||
auto buffer_frame_size = AudioUnitGetBufferFrameSize(au);
|
|
||||||
buffer_frame_size *= desc.mBytesPerFrame;
|
|
||||||
|
|
||||||
// We set the frame size to a power of two integer that
|
|
||||||
// is larger than buffer_frame_size.
|
|
||||||
UInt32 frame_size = 1;
|
|
||||||
while (frame_size < buffer_frame_size + 1)
|
|
||||||
frame_size <<= 1;
|
|
||||||
|
|
||||||
return frame_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
osx_output_hog_device(AudioDeviceID dev_id, bool hog) noexcept
|
|
||||||
{
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa = {
|
|
||||||
kAudioDevicePropertyHogMode,
|
|
||||||
kAudioObjectPropertyScopeOutput,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM
|
|
||||||
};
|
|
||||||
|
|
||||||
pid_t hog_pid;
|
|
||||||
|
|
||||||
try {
|
|
||||||
hog_pid = AudioObjectGetPropertyDataT<pid_t>(dev_id, aopa);
|
|
||||||
} catch (...) {
|
|
||||||
Log(LogLevel::DEBUG, std::current_exception(),
|
|
||||||
"Failed to query HogMode");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hog) {
|
|
||||||
if (hog_pid != -1) {
|
|
||||||
LogDebug(osx_output_domain,
|
|
||||||
"Device is already hogged");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (hog_pid != getpid()) {
|
|
||||||
FmtDebug(osx_output_domain,
|
|
||||||
"Device is not owned by this process");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hog_pid = hog ? getpid() : -1;
|
|
||||||
UInt32 size = sizeof(hog_pid);
|
|
||||||
OSStatus err;
|
|
||||||
err = AudioObjectSetPropertyData(dev_id,
|
|
||||||
&aopa,
|
|
||||||
0,
|
|
||||||
NULL,
|
|
||||||
size,
|
|
||||||
&hog_pid);
|
|
||||||
if (err != noErr) {
|
|
||||||
FmtDebug(osx_output_domain,
|
|
||||||
"Cannot hog the device: {}", err);
|
|
||||||
} else {
|
|
||||||
LogDebug(osx_output_domain,
|
|
||||||
hog_pid == -1
|
|
||||||
? "Device is unhogged"
|
|
||||||
: "Device is hogged");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[[gnu::pure]]
|
|
||||||
static bool
|
|
||||||
IsAudioDeviceName(AudioDeviceID id, const char *expected_name) noexcept
|
|
||||||
{
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa_name{
|
|
||||||
kAudioObjectPropertyName,
|
|
||||||
kAudioObjectPropertyScopeGlobal,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM,
|
|
||||||
};
|
|
||||||
|
|
||||||
char actual_name[256];
|
|
||||||
|
|
||||||
try {
|
|
||||||
auto cfname = AudioObjectGetStringProperty(id, aopa_name);
|
|
||||||
if (!cfname.GetCString(actual_name, sizeof(actual_name)))
|
|
||||||
return false;
|
|
||||||
} catch (...) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return StringIsEqual(actual_name, expected_name);
|
|
||||||
}
|
|
||||||
|
|
||||||
static AudioDeviceID
|
|
||||||
FindAudioDeviceByName(const char *name)
|
|
||||||
{
|
|
||||||
/* what are the available audio device IDs? */
|
|
||||||
static constexpr AudioObjectPropertyAddress aopa_hw_devices{
|
|
||||||
kAudioHardwarePropertyDevices,
|
|
||||||
kAudioObjectPropertyScopeGlobal,
|
|
||||||
KAUDIO_OBJECT_PROPERTY_ELEMENT_MM,
|
|
||||||
};
|
|
||||||
|
|
||||||
const auto ids =
|
|
||||||
AudioObjectGetPropertyDataArray<AudioDeviceID>(kAudioObjectSystemObject,
|
|
||||||
aopa_hw_devices);
|
|
||||||
|
|
||||||
for (const auto id : ids) {
|
|
||||||
if (IsAudioDeviceName(id, name))
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw FmtRuntimeError("Found no audio device names {:?}", name);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
osx_output_set_device(OSXOutput *oo)
|
|
||||||
{
|
|
||||||
if (oo->component_subtype != kAudioUnitSubType_HALOutput)
|
|
||||||
return;
|
|
||||||
|
|
||||||
const auto id = FindAudioDeviceByName(oo->device_name);
|
|
||||||
|
|
||||||
FmtDebug(osx_output_domain,
|
|
||||||
"found matching device: ID={}, name={}",
|
|
||||||
id, oo->device_name);
|
|
||||||
|
|
||||||
AudioUnitSetCurrentDevice(oo->au, id);
|
|
||||||
|
|
||||||
oo->dev_id = id;
|
|
||||||
FmtDebug(osx_output_domain,
|
|
||||||
"set OS X audio output device ID={}, name={}",
|
|
||||||
id, oo->device_name);
|
|
||||||
|
|
||||||
if (oo->channel_map)
|
|
||||||
osx_output_set_channel_map(oo);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This function (the 'render callback' osx_render) is called by the
|
|
||||||
* OS X audio subsystem (CoreAudio) to request audio data that will be
|
|
||||||
* played by the audio hardware. This function has hard time
|
|
||||||
* constraints so it cannot do IO (debug statements) or memory
|
|
||||||
* allocations.
|
|
||||||
*/
|
|
||||||
static OSStatus
|
|
||||||
osx_render(void *vdata,
|
|
||||||
[[maybe_unused]] AudioUnitRenderActionFlags *io_action_flags,
|
|
||||||
[[maybe_unused]] const AudioTimeStamp *in_timestamp,
|
|
||||||
[[maybe_unused]] UInt32 in_bus_number,
|
|
||||||
UInt32 in_number_frames,
|
|
||||||
AudioBufferList *buffer_list)
|
|
||||||
{
|
|
||||||
OSXOutput *od = (OSXOutput *) vdata;
|
|
||||||
|
|
||||||
std::size_t count = in_number_frames * od->asbd.mBytesPerFrame;
|
|
||||||
buffer_list->mBuffers[0].mDataByteSize =
|
|
||||||
od->ring_buffer.ReadTo({(std::byte *)buffer_list->mBuffers[0].mData, count});
|
|
||||||
return noErr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
OSXOutput::Enable()
|
|
||||||
{
|
|
||||||
AudioComponentDescription desc;
|
|
||||||
desc.componentType = kAudioUnitType_Output;
|
|
||||||
desc.componentSubType = component_subtype;
|
|
||||||
desc.componentManufacturer = kAudioUnitManufacturer_Apple;
|
|
||||||
desc.componentFlags = 0;
|
|
||||||
desc.componentFlagsMask = 0;
|
|
||||||
|
|
||||||
AudioComponent comp = AudioComponentFindNext(nullptr, &desc);
|
|
||||||
if (comp == 0)
|
|
||||||
throw std::runtime_error("Error finding OS X component");
|
|
||||||
|
|
||||||
OSStatus status = AudioComponentInstanceNew(comp, &au);
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status, "Unable to open OS X component");
|
|
||||||
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
pcm_export.Construct();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
try {
|
|
||||||
osx_output_set_device(this);
|
|
||||||
} catch (...) {
|
|
||||||
AudioComponentInstanceDispose(au);
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
pcm_export.Destruct();
|
|
||||||
#endif
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hog_device)
|
|
||||||
osx_output_hog_device(dev_id, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
OSXOutput::Disable() noexcept
|
|
||||||
{
|
|
||||||
AudioComponentInstanceDispose(au);
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
pcm_export.Destruct();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (hog_device)
|
|
||||||
osx_output_hog_device(dev_id, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
OSXOutput::Close() noexcept
|
|
||||||
{
|
|
||||||
if (started)
|
|
||||||
AudioOutputUnitStop(au);
|
|
||||||
AudioUnitUninitialize(au);
|
|
||||||
ring_buffer = {};
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
OSXOutput::Open(AudioFormat &audio_format)
|
|
||||||
{
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
PcmExport::Params params;
|
|
||||||
params.alsa_channel_order = true;
|
|
||||||
bool dop = dop_setting;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
memset(&asbd, 0, sizeof(asbd));
|
|
||||||
asbd.mFormatID = kAudioFormatLinearPCM;
|
|
||||||
if (audio_format.format == SampleFormat::FLOAT) {
|
|
||||||
asbd.mFormatFlags = kLinearPCMFormatFlagIsFloat;
|
|
||||||
} else {
|
|
||||||
asbd.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsBigEndian())
|
|
||||||
asbd.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian;
|
|
||||||
|
|
||||||
if (audio_format.format == SampleFormat::S24_P32) {
|
|
||||||
asbd.mBitsPerChannel = 24;
|
|
||||||
} else {
|
|
||||||
asbd.mBitsPerChannel = audio_format.GetSampleSize() * 8;
|
|
||||||
}
|
|
||||||
asbd.mBytesPerPacket = audio_format.GetFrameSize();
|
|
||||||
asbd.mSampleRate = audio_format.sample_rate;
|
|
||||||
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
if (dop && audio_format.format == SampleFormat::DSD) {
|
|
||||||
asbd.mBitsPerChannel = 24;
|
|
||||||
params.dsd_mode = PcmExport::DsdMode::DOP;
|
|
||||||
asbd.mSampleRate = params.CalcOutputSampleRate(audio_format.sample_rate);
|
|
||||||
asbd.mBytesPerPacket = 4 * audio_format.channels;
|
|
||||||
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
asbd.mFramesPerPacket = 1;
|
|
||||||
asbd.mBytesPerFrame = asbd.mBytesPerPacket;
|
|
||||||
asbd.mChannelsPerFrame = audio_format.channels;
|
|
||||||
|
|
||||||
Float64 sample_rate = osx_output_set_device_format(dev_id, asbd);
|
|
||||||
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
if (audio_format.format == SampleFormat::DSD &&
|
|
||||||
sample_rate != asbd.mSampleRate) {
|
|
||||||
// fall back to PCM in case sample_rate cannot be synchronized
|
|
||||||
params.dsd_mode = PcmExport::DsdMode::NONE;
|
|
||||||
audio_format.format = SampleFormat::S32;
|
|
||||||
asbd.mBitsPerChannel = 32;
|
|
||||||
asbd.mBytesPerPacket = audio_format.GetFrameSize();
|
|
||||||
asbd.mSampleRate = params.CalcOutputSampleRate(audio_format.sample_rate);
|
|
||||||
asbd.mBytesPerFrame = asbd.mBytesPerPacket;
|
|
||||||
}
|
|
||||||
dop_enabled = params.dsd_mode == PcmExport::DsdMode::DOP;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
AudioUnitSetInputStreamFormat(au, asbd);
|
|
||||||
|
|
||||||
AURenderCallbackStruct callback;
|
|
||||||
callback.inputProc = osx_render;
|
|
||||||
callback.inputProcRefCon = this;
|
|
||||||
|
|
||||||
AudioUnitSetInputRenderCallback(au, callback);
|
|
||||||
|
|
||||||
OSStatus status = AudioUnitInitialize(au);
|
|
||||||
if (status != noErr)
|
|
||||||
Apple::ThrowOSStatus(status, "Unable to initialize OS X audio unit");
|
|
||||||
|
|
||||||
UInt32 buffer_frame_size = osx_output_set_buffer_size(au, asbd);
|
|
||||||
|
|
||||||
size_t ring_buffer_size = std::max<size_t>(buffer_frame_size,
|
|
||||||
MPD_OSX_BUFFER_TIME_MS * audio_format.GetFrameSize() * audio_format.sample_rate / 1000);
|
|
||||||
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
if (dop_enabled) {
|
|
||||||
pcm_export->Open(audio_format.format, audio_format.channels, params);
|
|
||||||
ring_buffer_size = std::max<size_t>(buffer_frame_size,
|
|
||||||
MPD_OSX_BUFFER_TIME_MS * pcm_export->GetOutputFrameSize() * asbd.mSampleRate / 1000);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
ring_buffer = RingBuffer{ring_buffer_size};
|
|
||||||
|
|
||||||
pause = false;
|
|
||||||
started = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::size_t
|
|
||||||
OSXOutput::Play(std::span<const std::byte> input)
|
|
||||||
{
|
|
||||||
assert(!input.empty());
|
|
||||||
|
|
||||||
pause = false;
|
|
||||||
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
if (dop_enabled) {
|
|
||||||
input = pcm_export->Export(input);
|
|
||||||
if (input.empty())
|
|
||||||
return input.size();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
size_t bytes_written = ring_buffer.WriteFrom(input);
|
|
||||||
|
|
||||||
if (!started) {
|
|
||||||
OSStatus status = AudioOutputUnitStart(au);
|
|
||||||
if (status != noErr)
|
|
||||||
throw std::runtime_error("Unable to restart audio output after pause");
|
|
||||||
|
|
||||||
started = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
if (dop_enabled)
|
|
||||||
bytes_written = pcm_export->CalcInputSize(bytes_written);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return bytes_written;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::chrono::steady_clock::duration
|
|
||||||
OSXOutput::Delay() const noexcept
|
|
||||||
{
|
|
||||||
return !ring_buffer.IsFull() && !pause
|
|
||||||
? std::chrono::steady_clock::duration::zero()
|
|
||||||
: std::chrono::milliseconds(MPD_OSX_BUFFER_TIME_MS / 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool OSXOutput::Pause()
|
|
||||||
{
|
|
||||||
pause = true;
|
|
||||||
|
|
||||||
if (started) {
|
|
||||||
AudioOutputUnitStop(au);
|
|
||||||
started = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
OSXOutput::Cancel() noexcept
|
|
||||||
{
|
|
||||||
if (started) {
|
|
||||||
AudioOutputUnitStop(au);
|
|
||||||
started = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
ring_buffer.Clear();
|
|
||||||
#ifdef ENABLE_DSD
|
|
||||||
pcm_export->Reset();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* the AudioUnit will be restarted by the next Play() call */
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
osx_output_get_volume(OSXOutput &output)
|
|
||||||
{
|
|
||||||
return output.GetVolume();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
osx_output_set_volume(OSXOutput &output, unsigned new_volume)
|
|
||||||
{
|
|
||||||
return output.SetVolume(new_volume);
|
|
||||||
}
|
|
||||||
|
|
||||||
const struct AudioOutputPlugin osx_output_plugin = {
|
|
||||||
"osx",
|
|
||||||
osx_output_test_default_device,
|
|
||||||
&OSXOutput::Create,
|
|
||||||
&osx_mixer_plugin,
|
|
||||||
};
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
// Copyright The Music Player Daemon Project
|
|
||||||
|
|
||||||
#ifndef MPD_OSX_OUTPUT_PLUGIN_HXX
|
|
||||||
#define MPD_OSX_OUTPUT_PLUGIN_HXX
|
|
||||||
|
|
||||||
struct OSXOutput;
|
|
||||||
|
|
||||||
extern const struct AudioOutputPlugin osx_output_plugin;
|
|
||||||
|
|
||||||
int
|
|
||||||
osx_output_get_volume(OSXOutput &output);
|
|
||||||
|
|
||||||
void
|
|
||||||
osx_output_set_volume(OSXOutput &output, unsigned new_volume);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -7,16 +7,8 @@
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#ifndef __APPLE__
|
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
#include <AL/alc.h>
|
#include <AL/alc.h>
|
||||||
#else
|
|
||||||
#include <OpenAL/al.h>
|
|
||||||
#include <OpenAL/alc.h>
|
|
||||||
/* on macOS, OpenAL is deprecated, but since the user asked to enable
|
|
||||||
this plugin, let's ignore the compiler warnings */
|
|
||||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class OpenALOutput final : AudioOutput {
|
class OpenALOutput final : AudioOutput {
|
||||||
/* should be enough for buffer size = 2048 */
|
/* should be enough for buffer size = 2048 */
|
||||||
|
|
|
||||||
|
|
@ -49,13 +49,7 @@ endif
|
||||||
|
|
||||||
openal_dep = dependency('', required: false)
|
openal_dep = dependency('', required: false)
|
||||||
if not get_option('openal').disabled()
|
if not get_option('openal').disabled()
|
||||||
if is_darwin
|
|
||||||
if compiler.has_header('OpenAL/al.h')
|
|
||||||
openal_dep = declare_dependency(link_args: ['-framework', 'OpenAL'])
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
openal_dep = dependency('openal', required: false)
|
openal_dep = dependency('openal', required: false)
|
||||||
endif
|
|
||||||
|
|
||||||
if openal_dep.found()
|
if openal_dep.found()
|
||||||
output_plugins_sources += 'OpenALOutputPlugin.cxx'
|
output_plugins_sources += 'OpenALOutputPlugin.cxx'
|
||||||
|
|
@ -69,13 +63,6 @@ if enable_oss
|
||||||
output_plugins_sources += 'OssOutputPlugin.cxx'
|
output_plugins_sources += 'OssOutputPlugin.cxx'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if is_darwin
|
|
||||||
output_plugins_sources += [
|
|
||||||
'OSXOutputPlugin.cxx',
|
|
||||||
]
|
|
||||||
endif
|
|
||||||
output_features.set('HAVE_OSX', is_darwin)
|
|
||||||
|
|
||||||
enable_pipe_output = get_option('pipe') and not is_windows
|
enable_pipe_output = get_option('pipe') and not is_windows
|
||||||
output_features.set('ENABLE_PIPE_OUTPUT', enable_pipe_output)
|
output_features.set('ENABLE_PIPE_OUTPUT', enable_pipe_output)
|
||||||
if enable_pipe_output
|
if enable_pipe_output
|
||||||
|
|
@ -166,7 +153,6 @@ output_plugins = static_library(
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
alsa_dep,
|
alsa_dep,
|
||||||
apple_dep,
|
|
||||||
libao_dep,
|
libao_dep,
|
||||||
libjack_dep,
|
libjack_dep,
|
||||||
pipewire_dep,
|
pipewire_dep,
|
||||||
|
|
|
||||||
|
|
@ -28,11 +28,7 @@ SetThreadName(const char *name) noexcept
|
||||||
requires a non-const pointer argument, which we don't have
|
requires a non-const pointer argument, which we don't have
|
||||||
here */
|
here */
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
pthread_setname_np(name);
|
|
||||||
#else
|
|
||||||
pthread_setname_np(pthread_self(), name);
|
pthread_setname_np(pthread_self(), name);
|
||||||
#endif
|
|
||||||
#elif defined(HAVE_PRCTL) && defined(PR_SET_NAME)
|
#elif defined(HAVE_PRCTL) && defined(PR_SET_NAME)
|
||||||
prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);
|
prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -1,76 +0,0 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
// Copyright The Music Player Daemon Project
|
|
||||||
|
|
||||||
#include "Bonjour.hxx"
|
|
||||||
#include "util/Domain.hxx"
|
|
||||||
#include "Log.hxx"
|
|
||||||
|
|
||||||
#include <dns_sd.h>
|
|
||||||
|
|
||||||
#include <stdexcept>
|
|
||||||
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
|
|
||||||
static constexpr Domain bonjour_domain("bonjour");
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A wrapper for DNSServiceRegister() which returns the DNSServiceRef
|
|
||||||
* and throws on error.
|
|
||||||
*/
|
|
||||||
static DNSServiceRef
|
|
||||||
RegisterBonjour(const char *name, const char *type, unsigned port,
|
|
||||||
DNSServiceRegisterReply callback, void *ctx)
|
|
||||||
{
|
|
||||||
DNSServiceRef ref;
|
|
||||||
DNSServiceErrorType error = DNSServiceRegister(&ref,
|
|
||||||
0, 0, name, type,
|
|
||||||
nullptr, nullptr,
|
|
||||||
htons(port), 0,
|
|
||||||
nullptr,
|
|
||||||
callback, ctx);
|
|
||||||
|
|
||||||
if (error != kDNSServiceErr_NoError)
|
|
||||||
throw std::runtime_error("DNSServiceRegister() failed");
|
|
||||||
|
|
||||||
return ref;
|
|
||||||
}
|
|
||||||
|
|
||||||
BonjourHelper::BonjourHelper(EventLoop &_loop, const char *name,
|
|
||||||
const char *service_type, unsigned port)
|
|
||||||
:service_ref(RegisterBonjour(name, service_type, port,
|
|
||||||
Callback, this)),
|
|
||||||
socket_event(_loop,
|
|
||||||
BIND_THIS_METHOD(OnSocketReady),
|
|
||||||
SocketDescriptor(DNSServiceRefSockFD(service_ref)))
|
|
||||||
{
|
|
||||||
socket_event.ScheduleRead();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
BonjourHelper::Callback([[maybe_unused]] DNSServiceRef sdRef,
|
|
||||||
[[maybe_unused]] DNSServiceFlags flags,
|
|
||||||
DNSServiceErrorType errorCode, const char *name,
|
|
||||||
[[maybe_unused]] const char *regtype,
|
|
||||||
[[maybe_unused]] const char *domain,
|
|
||||||
[[maybe_unused]] void *context) noexcept
|
|
||||||
{
|
|
||||||
auto &helper = *(BonjourHelper *)context;
|
|
||||||
|
|
||||||
if (errorCode != kDNSServiceErr_NoError) {
|
|
||||||
LogError(bonjour_domain,
|
|
||||||
"Failed to register zeroconf service");
|
|
||||||
|
|
||||||
helper.Cancel();
|
|
||||||
} else {
|
|
||||||
FmtDebug(bonjour_domain,
|
|
||||||
"Registered zeroconf service with name {:?}",
|
|
||||||
name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::unique_ptr<BonjourHelper>
|
|
||||||
BonjourInit(EventLoop &loop, const char *name,
|
|
||||||
const char *service_type, unsigned port)
|
|
||||||
{
|
|
||||||
return std::make_unique<BonjourHelper>(loop, name, service_type, port);
|
|
||||||
}
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
// Copyright The Music Player Daemon Project
|
|
||||||
|
|
||||||
#ifndef MPD_ZEROCONF_BONJOUR_HXX
|
|
||||||
#define MPD_ZEROCONF_BONJOUR_HXX
|
|
||||||
|
|
||||||
#include "event/SocketEvent.hxx"
|
|
||||||
|
|
||||||
#include <dns_sd.h>
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
class EventLoop;
|
|
||||||
|
|
||||||
class BonjourHelper final {
|
|
||||||
const DNSServiceRef service_ref;
|
|
||||||
|
|
||||||
SocketEvent socket_event;
|
|
||||||
|
|
||||||
public:
|
|
||||||
BonjourHelper(EventLoop &_loop, const char *name,
|
|
||||||
const char *service_name, unsigned port);
|
|
||||||
|
|
||||||
~BonjourHelper() noexcept {
|
|
||||||
DNSServiceRefDeallocate(service_ref);
|
|
||||||
}
|
|
||||||
|
|
||||||
BonjourHelper(const BonjourHelper &) = delete;
|
|
||||||
BonjourHelper &operator=(const BonjourHelper &) = delete;
|
|
||||||
|
|
||||||
private:
|
|
||||||
void Cancel() noexcept {
|
|
||||||
socket_event.Cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Callback(DNSServiceRef sdRef, DNSServiceFlags flags,
|
|
||||||
DNSServiceErrorType errorCode, const char *name,
|
|
||||||
const char *regtype,
|
|
||||||
const char *domain,
|
|
||||||
void *context) noexcept;
|
|
||||||
|
|
||||||
/* virtual methods from class SocketMonitor */
|
|
||||||
void OnSocketReady([[maybe_unused]] unsigned flags) noexcept {
|
|
||||||
DNSServiceProcessResult(service_ref);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Throws on error.
|
|
||||||
*/
|
|
||||||
std::unique_ptr<BonjourHelper>
|
|
||||||
BonjourInit(EventLoop &loop, const char *name,
|
|
||||||
const char *service_type, unsigned port);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -3,20 +3,13 @@
|
||||||
|
|
||||||
#include "Glue.hxx"
|
#include "Glue.hxx"
|
||||||
#include "Helper.hxx"
|
#include "Helper.hxx"
|
||||||
|
#include "avahi/Helper.hxx"
|
||||||
#include "config/Data.hxx"
|
#include "config/Data.hxx"
|
||||||
#include "config/Option.hxx"
|
#include "config/Option.hxx"
|
||||||
#include "Listen.hxx"
|
#include "Listen.hxx"
|
||||||
#include "util/Domain.hxx"
|
#include "util/Domain.hxx"
|
||||||
#include "Log.hxx"
|
#include "Log.hxx"
|
||||||
|
|
||||||
#ifdef HAVE_AVAHI
|
|
||||||
#include "avahi/Helper.hxx"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_BONJOUR
|
|
||||||
#include "Bonjour.hxx"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <climits>
|
#include <climits>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
// Copyright The Music Player Daemon Project
|
// Copyright The Music Player Daemon Project
|
||||||
|
|
||||||
#ifndef MPD_ZEROCONF_GLUE_HXX
|
#pragma once
|
||||||
#define MPD_ZEROCONF_GLUE_HXX
|
|
||||||
|
|
||||||
#include "Helper.hxx"
|
#include "Helper.hxx"
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
|
@ -13,14 +11,8 @@ struct ConfigData;
|
||||||
class EventLoop;
|
class EventLoop;
|
||||||
class ZeroconfHelper;
|
class ZeroconfHelper;
|
||||||
|
|
||||||
#ifdef HAVE_ZEROCONF
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Throws on error.
|
* Throws on error.
|
||||||
*/
|
*/
|
||||||
std::unique_ptr<ZeroconfHelper>
|
std::unique_ptr<ZeroconfHelper>
|
||||||
ZeroconfInit(const ConfigData &config, EventLoop &loop);
|
ZeroconfInit(const ConfigData &config, EventLoop &loop);
|
||||||
|
|
||||||
#endif /* ! HAVE_ZEROCONF */
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -2,19 +2,10 @@
|
||||||
// Copyright The Music Player Daemon Project
|
// Copyright The Music Player Daemon Project
|
||||||
|
|
||||||
#include "Helper.hxx"
|
#include "Helper.hxx"
|
||||||
|
|
||||||
#ifdef HAVE_AVAHI
|
|
||||||
#include "avahi/Helper.hxx"
|
#include "avahi/Helper.hxx"
|
||||||
#define CreateHelper AvahiInit
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_BONJOUR
|
|
||||||
#include "Bonjour.hxx"
|
|
||||||
#define CreateHelper BonjourInit
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ZeroconfHelper::ZeroconfHelper(EventLoop &event_loop, const char *name,
|
ZeroconfHelper::ZeroconfHelper(EventLoop &event_loop, const char *name,
|
||||||
const char *service_type, unsigned port)
|
const char *service_type, unsigned port)
|
||||||
:helper(CreateHelper(event_loop, name, service_type, port)) {}
|
:helper(AvahiInit(event_loop, name, service_type, port)) {}
|
||||||
|
|
||||||
ZeroconfHelper::~ZeroconfHelper() noexcept = default;
|
ZeroconfHelper::~ZeroconfHelper() noexcept = default;
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,15 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
// Copyright The Music Player Daemon Project
|
// Copyright The Music Player Daemon Project
|
||||||
|
|
||||||
#ifndef MPD_ZEROCONF_HELPER_HXX
|
#pragma once
|
||||||
#define MPD_ZEROCONF_HELPER_HXX
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
class EventLoop;
|
class EventLoop;
|
||||||
class AvahiHelper;
|
class AvahiHelper;
|
||||||
class BonjourHelper;
|
|
||||||
|
|
||||||
class ZeroconfHelper final {
|
class ZeroconfHelper final {
|
||||||
#ifdef HAVE_AVAHI
|
|
||||||
std::unique_ptr<AvahiHelper> helper;
|
std::unique_ptr<AvahiHelper> helper;
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_BONJOUR
|
|
||||||
std::unique_ptr<BonjourHelper> helper;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ZeroconfHelper(EventLoop &event_loop, const char *name,
|
ZeroconfHelper(EventLoop &event_loop, const char *name,
|
||||||
|
|
@ -27,5 +17,3 @@ public:
|
||||||
|
|
||||||
~ZeroconfHelper() noexcept;
|
~ZeroconfHelper() noexcept;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,7 @@ zeroconf_option = get_option('zeroconf')
|
||||||
avahi_dep = dependency('', required: false)
|
avahi_dep = dependency('', required: false)
|
||||||
|
|
||||||
if zeroconf_option == 'auto'
|
if zeroconf_option == 'auto'
|
||||||
if is_darwin
|
if is_android or is_windows
|
||||||
zeroconf_option = 'bonjour'
|
|
||||||
elif is_android or is_windows
|
|
||||||
zeroconf_option = 'disabled'
|
zeroconf_option = 'disabled'
|
||||||
elif dbus_dep.found()
|
elif dbus_dep.found()
|
||||||
zeroconf_option = 'avahi'
|
zeroconf_option = 'avahi'
|
||||||
|
|
@ -19,36 +17,6 @@ if zeroconf_option == 'disabled'
|
||||||
subdir_done()
|
subdir_done()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if zeroconf_option == 'bonjour'
|
|
||||||
if not compiler.has_header('dns_sd.h')
|
|
||||||
error('dns_sd.h not found')
|
|
||||||
endif
|
|
||||||
|
|
||||||
bonjour_deps = [
|
|
||||||
]
|
|
||||||
|
|
||||||
if not is_darwin
|
|
||||||
bonjour_deps += declare_dependency(link_args: ['-ldns_sd'])
|
|
||||||
endif
|
|
||||||
conf.set('HAVE_BONJOUR', true)
|
|
||||||
|
|
||||||
zeroconf = static_library(
|
|
||||||
'zeroconf_bonjour',
|
|
||||||
'Glue.cxx',
|
|
||||||
'Helper.cxx',
|
|
||||||
'Bonjour.cxx',
|
|
||||||
include_directories: inc,
|
|
||||||
dependencies: [
|
|
||||||
event_dep,
|
|
||||||
log_dep,
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
zeroconf_dep = declare_dependency(
|
|
||||||
link_with: zeroconf,
|
|
||||||
dependencies: bonjour_deps,
|
|
||||||
)
|
|
||||||
else
|
|
||||||
subdir('avahi')
|
subdir('avahi')
|
||||||
|
|
||||||
if not avahi_dep.found()
|
if not avahi_dep.found()
|
||||||
|
|
@ -59,7 +27,7 @@ else
|
||||||
conf.set('HAVE_AVAHI', true)
|
conf.set('HAVE_AVAHI', true)
|
||||||
|
|
||||||
zeroconf = static_library(
|
zeroconf = static_library(
|
||||||
'zeroconf_bonjour',
|
'zeroconf',
|
||||||
'Glue.cxx',
|
'Glue.cxx',
|
||||||
'Helper.cxx',
|
'Helper.cxx',
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
|
|
@ -74,6 +42,5 @@ else
|
||||||
zeroconf_dep = declare_dependency(
|
zeroconf_dep = declare_dependency(
|
||||||
link_with: zeroconf,
|
link_with: zeroconf,
|
||||||
)
|
)
|
||||||
endif
|
|
||||||
|
|
||||||
conf.set('HAVE_ZEROCONF', true)
|
conf.set('HAVE_ZEROCONF', true)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue