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
8444c335
Commit
8444c335
authored
Jun 08, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/osx: don't use variable-length arrays
parent
2b7328b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
OSXOutputPlugin.cxx
src/output/plugins/OSXOutputPlugin.cxx
+12
-4
No files found.
src/output/plugins/OSXOutputPlugin.cxx
View file @
8444c335
...
...
@@ -397,8 +397,12 @@ osx_output_set_device_format(AudioDeviceID dev_id,
if
(
err
!=
noErr
)
throw
FormatRuntimeError
(
"Cannot get number of streams: %d
\n
"
,
err
);
int
n_streams
=
property_size
/
sizeof
(
AudioStreamID
);
AudioStreamID
streams
[
n_streams
];
const
size_t
n_streams
=
property_size
/
sizeof
(
AudioStreamID
);
static
constexpr
size_t
MAX_STREAMS
=
64
;
if
(
n_streams
>
MAX_STREAMS
)
throw
std
::
runtime_error
(
"Too many streams"
);
AudioStreamID
streams
[
MAX_STREAMS
];
err
=
AudioObjectGetPropertyData
(
dev_id
,
&
aopa
,
0
,
NULL
,
&
property_size
,
streams
);
if
(
err
!=
noErr
)
throw
FormatRuntimeError
(
"Cannot get streams: %d
\n
"
,
err
);
...
...
@@ -407,7 +411,7 @@ osx_output_set_device_format(AudioDeviceID dev_id,
int
output_stream
;
AudioStreamBasicDescription
output_format
;
for
(
in
t
i
=
0
;
i
<
n_streams
;
i
++
)
{
for
(
size_
t
i
=
0
;
i
<
n_streams
;
i
++
)
{
UInt32
direction
;
AudioStreamID
stream
=
streams
[
i
];
aopa
.
mSelector
=
kAudioStreamPropertyDirection
;
...
...
@@ -433,7 +437,11 @@ osx_output_set_device_format(AudioDeviceID dev_id,
streams
[
i
],
err
);
const
size_t
format_count
=
property_size
/
sizeof
(
AudioStreamRangedDescription
);
AudioStreamRangedDescription
format_list
[
format_count
];
static
constexpr
size_t
MAX_FORMATS
=
256
;
if
(
format_count
>
MAX_FORMATS
)
throw
std
::
runtime_error
(
"Too many formats"
);
AudioStreamRangedDescription
format_list
[
MAX_FORMATS
];
err
=
AudioObjectGetPropertyData
(
stream
,
&
aopa
,
0
,
NULL
,
&
property_size
,
format_list
);
if
(
err
!=
noErr
)
throw
FormatRuntimeError
(
"Unable to get available formats for stream %d. Error = %s"
,
...
...
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