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
2040b325
Commit
2040b325
authored
May 09, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove module_t.b_submodule
It is equal to (module_t.parent != NULL) and hence redumdant.
parent
cf7f3bc8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
8 deletions
+1
-8
src/config/core.c
src/config/core.c
+0
-4
src/modules/entry.c
src/modules/entry.c
+0
-2
src/modules/modules.c
src/modules/modules.c
+1
-1
src/modules/modules.h
src/modules/modules.h
+0
-1
No files found.
src/config/core.c
View file @
2040b325
...
@@ -512,9 +512,6 @@ void config_ResetAll( vlc_object_t *p_this )
...
@@ -512,9 +512,6 @@ void config_ResetAll( vlc_object_t *p_this )
vlc_rwlock_wrlock
(
&
config_lock
);
vlc_rwlock_wrlock
(
&
config_lock
);
for
(
size_t
j
=
0
;
(
p_module
=
list
[
j
])
!=
NULL
;
j
++
)
for
(
size_t
j
=
0
;
(
p_module
=
list
[
j
])
!=
NULL
;
j
++
)
{
if
(
p_module
->
b_submodule
)
continue
;
for
(
size_t
i
=
0
;
i
<
p_module
->
confsize
;
i
++
)
for
(
size_t
i
=
0
;
i
<
p_module
->
confsize
;
i
++
)
{
{
module_config_t
*
p_config
=
p_module
->
p_config
+
i
;
module_config_t
*
p_config
=
p_module
->
p_config
+
i
;
...
@@ -532,7 +529,6 @@ void config_ResetAll( vlc_object_t *p_this )
...
@@ -532,7 +529,6 @@ void config_ResetAll( vlc_object_t *p_this )
strdupnull
(
p_config
->
orig
.
psz
);
strdupnull
(
p_config
->
orig
.
psz
);
}
}
}
}
}
vlc_rwlock_unlock
(
&
config_lock
);
vlc_rwlock_unlock
(
&
config_lock
);
module_list_free
(
list
);
module_list_free
(
list
);
...
...
src/modules/entry.c
View file @
2040b325
...
@@ -66,7 +66,6 @@ module_t *vlc_module_create (vlc_object_t *obj)
...
@@ -66,7 +66,6 @@ module_t *vlc_module_create (vlc_object_t *obj)
module
->
psz_capability
=
(
char
*
)
""
;
module
->
psz_capability
=
(
char
*
)
""
;
module
->
i_score
=
1
;
module
->
i_score
=
1
;
module
->
b_unloadable
=
true
;
module
->
b_unloadable
=
true
;
module
->
b_submodule
=
false
;
module
->
pf_activate
=
NULL
;
module
->
pf_activate
=
NULL
;
module
->
pf_deactivate
=
NULL
;
module
->
pf_deactivate
=
NULL
;
module
->
p_config
=
NULL
;
module
->
p_config
=
NULL
;
...
@@ -117,7 +116,6 @@ module_t *vlc_submodule_create (module_t *module)
...
@@ -117,7 +116,6 @@ module_t *vlc_submodule_create (module_t *module)
submodule
->
psz_longname
=
module
->
psz_longname
;
submodule
->
psz_longname
=
module
->
psz_longname
;
submodule
->
psz_capability
=
module
->
psz_capability
;
submodule
->
psz_capability
=
module
->
psz_capability
;
submodule
->
i_score
=
module
->
i_score
;
submodule
->
i_score
=
module
->
i_score
;
submodule
->
b_submodule
=
true
;
submodule
->
domain
=
module
->
domain
;
submodule
->
domain
=
module
->
domain
;
return
submodule
;
return
submodule
;
}
}
...
...
src/modules/modules.c
View file @
2040b325
...
@@ -563,7 +563,7 @@ found_shortcut:
...
@@ -563,7 +563,7 @@ found_shortcut:
module_t
*
p_cand
=
p_list
[
i
].
p_module
;
module_t
*
p_cand
=
p_list
[
i
].
p_module
;
#ifdef HAVE_DYNAMIC_PLUGINS
#ifdef HAVE_DYNAMIC_PLUGINS
/* Make sure the module is loaded in mem */
/* Make sure the module is loaded in mem */
module_t
*
p_real
=
p_cand
->
b_submodule
?
p_cand
->
parent
:
p_cand
;
module_t
*
p_real
=
p_cand
->
parent
?
p_cand
->
parent
:
p_cand
;
if
(
!
p_real
->
b_builtin
&&
!
p_real
->
b_loaded
)
if
(
!
p_real
->
b_builtin
&&
!
p_real
->
b_loaded
)
{
{
...
...
src/modules/modules.h
View file @
2040b325
...
@@ -111,7 +111,6 @@ struct module_t
...
@@ -111,7 +111,6 @@ struct module_t
bool
b_builtin
;
/* Set to true if the module is built in */
bool
b_builtin
;
/* Set to true if the module is built in */
bool
b_loaded
;
/* Set to true if the dll is loaded */
bool
b_loaded
;
/* Set to true if the dll is loaded */
bool
b_unloadable
;
/**< Can we be dlclosed? */
bool
b_unloadable
;
/**< Can we be dlclosed? */
bool
b_submodule
;
/**< Is this a submodule? */
/* Callbacks */
/* Callbacks */
void
*
pf_activate
;
void
*
pf_activate
;
...
...
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