Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
c975d8b9
Commit
c975d8b9
authored
May 23, 2022
by
Dave Hocker
Committed by
Max Kellermann
May 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix deprecation warnings caused by name changes in OSX audio inerfaces
parent
2730f918
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
OSXOutputPlugin.cxx
src/output/plugins/OSXOutputPlugin.cxx
+13
-13
No files found.
src/output/plugins/OSXOutputPlugin.cxx
View file @
c975d8b9
...
...
@@ -160,13 +160,13 @@ OSXOutput::Create(EventLoop &, const ConfigBlock &block)
static
constexpr
AudioObjectPropertyAddress
default_system_output_device
{
kAudioHardwarePropertyDefaultSystemOutputDevice
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
,
kAudioObjectPropertyElementMa
in
,
};
static
constexpr
AudioObjectPropertyAddress
default_output_device
{
kAudioHardwarePropertyDefaultOutputDevice
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
kAudioObjectPropertyElementMa
in
};
const
auto
&
aopa
=
...
...
@@ -195,9 +195,9 @@ int
OSXOutput
::
GetVolume
()
{
static
constexpr
AudioObjectPropertyAddress
aopa
=
{
kAudioHardwareServiceDeviceProperty_VirtualMa
ster
Volume
,
kAudioHardwareServiceDeviceProperty_VirtualMa
in
Volume
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
,
kAudioObjectPropertyElementMa
in
,
};
const
auto
vol
=
AudioObjectGetPropertyDataT
<
Float32
>
(
dev_id
,
...
...
@@ -211,9 +211,9 @@ OSXOutput::SetVolume(unsigned new_volume)
{
Float32
vol
=
new_volume
/
100.0
;
static
constexpr
AudioObjectPropertyAddress
aopa
=
{
kAudioHardwareServiceDeviceProperty_VirtualMa
ster
Volume
,
kAudioHardwareServiceDeviceProperty_VirtualMa
in
Volume
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
kAudioObjectPropertyElementMa
in
};
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
,
kAudioObjectPropertyElementMa
ster
kAudioObjectPropertyElementMa
in
};
static
constexpr
AudioObjectPropertyAddress
aopa_stream_direction
=
{
kAudioStreamPropertyDirection
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
kAudioObjectPropertyElementMa
in
};
static
constexpr
AudioObjectPropertyAddress
aopa_stream_phys_formats
=
{
kAudioStreamPropertyAvailablePhysicalFormats
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
kAudioObjectPropertyElementMa
in
};
static
constexpr
AudioObjectPropertyAddress
aopa_stream_phys_format
=
{
kAudioStreamPropertyPhysicalFormat
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
kAudioObjectPropertyElementMa
in
};
OSStatus
err
;
...
...
@@ -484,7 +484,7 @@ osx_output_hog_device(AudioDeviceID dev_id, bool hog) noexcept
static
constexpr
AudioObjectPropertyAddress
aopa
=
{
kAudioDevicePropertyHogMode
,
kAudioObjectPropertyScopeOutput
,
kAudioObjectPropertyElementMa
ster
kAudioObjectPropertyElementMa
in
};
pid_t
hog_pid
;
...
...
@@ -538,7 +538,7 @@ IsAudioDeviceName(AudioDeviceID id, const char *expected_name) noexcept
static
constexpr
AudioObjectPropertyAddress
aopa_name
{
kAudioObjectPropertyName
,
kAudioObjectPropertyScopeGlobal
,
kAudioObjectPropertyElementMa
ster
,
kAudioObjectPropertyElementMa
in
,
};
char
actual_name
[
256
];
...
...
@@ -561,7 +561,7 @@ FindAudioDeviceByName(const char *name)
static
constexpr
AudioObjectPropertyAddress
aopa_hw_devices
{
kAudioHardwarePropertyDevices
,
kAudioObjectPropertyScopeGlobal
,
kAudioObjectPropertyElementMa
ster
,
kAudioObjectPropertyElementMa
in
,
};
const
auto
ids
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment