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
4e57bd05
Commit
4e57bd05
authored
Nov 29, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input: create an aout if UI wants to configure audio (fixes #7810)
parent
cd56c2fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
src/input/resource.c
src/input/resource.c
+5
-0
src/playlist/aout.c
src/playlist/aout.c
+0
-4
No files found.
src/input/resource.c
View file @
4e57bd05
...
...
@@ -387,6 +387,11 @@ audio_output_t *input_resource_HoldAout( input_resource_t *p_resource )
vlc_mutex_lock
(
&
p_resource
->
lock_hold
);
p_aout
=
p_resource
->
p_aout
;
if
(
p_aout
==
NULL
)
{
/* No audio outputs exist yet. Create an idle one. */
p_aout
=
aout_New
(
p_resource
->
p_parent
);
p_resource
->
p_aout
=
p_aout
;
}
if
(
p_aout
)
vlc_object_hold
(
p_aout
);
vlc_mutex_unlock
(
&
p_resource
->
lock_hold
);
...
...
src/playlist/aout.c
View file @
4e57bd05
...
...
@@ -33,10 +33,6 @@
audio_output_t
*
playlist_GetAout
(
playlist_t
*
pl
)
{
/* NOTE: it is assumed that the input resource exists. In practice,
* the playlist must have been activated. This is automatic when calling
* pl_Get(). FIXME: input resources are deleted at deactivation, this can
* be too early. */
playlist_private_t
*
sys
=
pl_priv
(
pl
);
return
input_resource_HoldAout
(
sys
->
p_input_resource
);
}
...
...
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