diff --git a/doc/user.rst b/doc/user.rst index b9143b6bc..1311503ab 100644 --- a/doc/user.rst +++ b/doc/user.rst @@ -567,7 +567,7 @@ The following table lists the playlist_plugin options valid for all plugins: * - Name - Description - * - **plugin** + * - **name** - The name of the plugin * - **enabled yes|no** - Allows you to disable a playlist plugin without recompiling. By default, all plugins are enabled. diff --git a/meson.build b/meson.build index f391f5789..2164d0970 100644 --- a/meson.build +++ b/meson.build @@ -73,6 +73,9 @@ test_common_flags = [ # clang specific warning options: '-Wunreachable-code-aggressive', '-Wused-but-marked-unused', + + # suppress bogus GCC12 warnings in libfmt headers + '-Wno-stringop-overflow', ] test_global_cxxflags = test_global_common_flags + [ diff --git a/python/build/libs.py b/python/build/libs.py index 7d21dc105..afad33c06 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -177,6 +177,8 @@ ffmpeg = FfmpegProject( '--disable-filters', '--disable-v4l2_m2m', + '--disable-vulkan', + '--disable-parser=bmp', '--disable-parser=cavsvideo', '--disable-parser=dvbsub', @@ -381,13 +383,13 @@ ffmpeg = FfmpegProject( openssl = OpenSSLProject( 'https://www.openssl.org/source/openssl-3.0.3.tar.gz', - '9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f', + 'ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b', 'include/openssl/ossl_typ.h', ) curl = CmakeProject( - 'https://curl.se/download/curl-7.83.0.tar.xz', - 'bbff0e6b5047e773f3c3b084d80546cc1be4e354c09e419c2d0ef6116253511a', + 'https://curl.se/download/curl-7.83.1.tar.xz', + '2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4', 'lib/libcurl.a', [ '-DBUILD_CURL_EXE=OFF', diff --git a/src/output/plugins/OSXOutputPlugin.cxx b/src/output/plugins/OSXOutputPlugin.cxx index 5dafee2cd..29b5e5c91 100644 --- a/src/output/plugins/OSXOutputPlugin.cxx +++ b/src/output/plugins/OSXOutputPlugin.cxx @@ -160,13 +160,13 @@ OSXOutput::Create(EventLoop &, const ConfigBlock &block) static constexpr AudioObjectPropertyAddress default_system_output_device{ kAudioHardwarePropertyDefaultSystemOutputDevice, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster, + kAudioObjectPropertyElementMain, }; static constexpr AudioObjectPropertyAddress default_output_device{ kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; const auto &aopa = @@ -195,9 +195,9 @@ int OSXOutput::GetVolume() { static constexpr AudioObjectPropertyAddress aopa = { - kAudioHardwareServiceDeviceProperty_VirtualMasterVolume, + kAudioHardwareServiceDeviceProperty_VirtualMainVolume, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster, + kAudioObjectPropertyElementMain, }; const auto vol = AudioObjectGetPropertyDataT(dev_id, @@ -211,9 +211,9 @@ OSXOutput::SetVolume(unsigned new_volume) { Float32 vol = new_volume / 100.0; static constexpr AudioObjectPropertyAddress aopa = { - kAudioHardwareServiceDeviceProperty_VirtualMasterVolume, + kAudioHardwareServiceDeviceProperty_VirtualMainVolume, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; UInt32 size = sizeof(vol); OSStatus status = AudioObjectSetPropertyData(dev_id, @@ -366,25 +366,25 @@ osx_output_set_device_format(AudioDeviceID dev_id, static constexpr AudioObjectPropertyAddress aopa_device_streams = { kAudioDevicePropertyStreams, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; static constexpr AudioObjectPropertyAddress aopa_stream_direction = { kAudioStreamPropertyDirection, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; static constexpr AudioObjectPropertyAddress aopa_stream_phys_formats = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; static constexpr AudioObjectPropertyAddress aopa_stream_phys_format = { kAudioStreamPropertyPhysicalFormat, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; OSStatus err; @@ -484,7 +484,7 @@ osx_output_hog_device(AudioDeviceID dev_id, bool hog) noexcept static constexpr AudioObjectPropertyAddress aopa = { kAudioDevicePropertyHogMode, kAudioObjectPropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; pid_t hog_pid; @@ -538,7 +538,7 @@ IsAudioDeviceName(AudioDeviceID id, const char *expected_name) noexcept static constexpr AudioObjectPropertyAddress aopa_name{ kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster, + kAudioObjectPropertyElementMain, }; char actual_name[256]; @@ -561,7 +561,7 @@ FindAudioDeviceByName(const char *name) static constexpr AudioObjectPropertyAddress aopa_hw_devices{ kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster, + kAudioObjectPropertyElementMain, }; const auto ids =