Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
45e43037
Commit
45e43037
authored
Sep 19, 2008
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
variables: Inherit path is now parent->libvlc->saved config
parent
63b05039
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
src/misc/variables.c
src/misc/variables.c
+6
-2
No files found.
src/misc/variables.c
View file @
45e43037
...
@@ -1456,11 +1456,12 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
...
@@ -1456,11 +1456,12 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
{
{
int
i_var
;
int
i_var
;
variable_t
*
p_var
;
variable_t
*
p_var
;
vlc_object_internals_t
*
p_priv
;
/* No need to take the structure lock,
/* No need to take the structure lock,
* we are only looking for our parents */
* we are only looking for our parents */
if
(
!
p_this
->
p_parent
)
if
(
!
p_this
->
p_parent
&&
!
p_this
->
p_libvlc
)
{
{
switch
(
i_type
&
VLC_VAR_TYPE
)
switch
(
i_type
&
VLC_VAR_TYPE
)
{
{
...
@@ -1518,7 +1519,10 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
...
@@ -1518,7 +1519,10 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
vlc_object_internals_t
*
p_priv
=
vlc_internals
(
p_this
->
p_parent
);
if
(
!
p_this
->
p_parent
)
p_priv
=
vlc_internals
(
p_this
->
p_libvlc
);
else
p_priv
=
vlc_internals
(
p_this
->
p_parent
);
/* Look for the variable */
/* Look for the variable */
vlc_mutex_lock
(
&
p_priv
->
var_lock
);
vlc_mutex_lock
(
&
p_priv
->
var_lock
);
...
...
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