Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
cb37cbe2
Commit
cb37cbe2
authored
Feb 16, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "auhal: workaround bug (in core audio?) which leads to shortend device names"
This reverts commit
a446ef28
.
parent
ec151444
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+2
-9
No files found.
modules/audio_output/auhal.c
View file @
cb37cbe2
...
@@ -990,7 +990,6 @@ static void RebuildDeviceList(audio_output_t * p_aout)
...
@@ -990,7 +990,6 @@ static void RebuildDeviceList(audio_output_t * p_aout)
bool
b_digital
=
false
;
bool
b_digital
=
false
;
UInt32
i_id
=
deviceIDs
[
i
];
UInt32
i_id
=
deviceIDs
[
i
];
propertySize
=
0
;
/* Retrieve the length of the device name */
/* Retrieve the length of the device name */
err
=
AudioObjectGetPropertyDataSize
(
deviceIDs
[
i
],
&
deviceNameAddress
,
0
,
NULL
,
&
propertySize
);
err
=
AudioObjectGetPropertyDataSize
(
deviceIDs
[
i
],
&
deviceNameAddress
,
0
,
NULL
,
&
propertySize
);
if
(
err
!=
noErr
)
{
if
(
err
!=
noErr
)
{
...
@@ -998,10 +997,6 @@ static void RebuildDeviceList(audio_output_t * p_aout)
...
@@ -998,10 +997,6 @@ static void RebuildDeviceList(audio_output_t * p_aout)
continue
;
continue
;
}
}
// previous function returns to small buffer len, bug in core audio!?
if
(
propertySize
<
100
)
propertySize
=
100
;
/* Retrieve the name of the device */
/* Retrieve the name of the device */
psz_name
=
(
char
*
)
malloc
(
propertySize
);
psz_name
=
(
char
*
)
malloc
(
propertySize
);
err
=
AudioObjectGetPropertyData
(
deviceIDs
[
i
],
&
deviceNameAddress
,
0
,
NULL
,
&
propertySize
,
psz_name
);
err
=
AudioObjectGetPropertyData
(
deviceIDs
[
i
],
&
deviceNameAddress
,
0
,
NULL
,
&
propertySize
,
psz_name
);
...
@@ -1023,11 +1018,9 @@ static void RebuildDeviceList(audio_output_t * p_aout)
...
@@ -1023,11 +1018,9 @@ static void RebuildDeviceList(audio_output_t * p_aout)
if
(
AudioDeviceSupportsDigital
(
p_aout
,
deviceIDs
[
i
]))
{
if
(
AudioDeviceSupportsDigital
(
p_aout
,
deviceIDs
[
i
]))
{
b_digital
=
true
;
b_digital
=
true
;
msg_Dbg
(
p_aout
,
"'%s' supports digital output"
,
psz_name
);
msg_Dbg
(
p_aout
,
"'%s' supports digital output"
,
psz_name
);
char
*
psz_encoded_name
=
nil
;
asprintf
(
&
psz_name
,
_
(
"%s (Encoded Output)"
),
psz_name
);
asprintf
(
&
psz_encoded_name
,
_
(
"%s (Encoded Output)"
),
psz_name
);
i_id
=
i_id
|
AOUT_VAR_SPDIF_FLAG
;
i_id
=
i_id
|
AOUT_VAR_SPDIF_FLAG
;
add_device_to_list
(
p_aout
,
i_id
,
psz_encoded_name
);
add_device_to_list
(
p_aout
,
i_id
,
psz_name
);
free
(
psz_encoded_name
);
}
}
free
(
psz_name
);
free
(
psz_name
);
...
...
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