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
617c3420
Commit
617c3420
authored
Aug 15, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove module_t.b_builtin
parent
d26bac39
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
17 deletions
+9
-17
src/modules/entry.c
src/modules/entry.c
+0
-2
src/modules/modules.c
src/modules/modules.c
+9
-14
src/modules/modules.h
src/modules/modules.h
+0
-1
No files found.
src/modules/entry.c
View file @
617c3420
...
...
@@ -67,7 +67,6 @@ module_t *vlc_module_create (void)
/*module->handle = garbage */
module
->
psz_filename
=
NULL
;
module
->
domain
=
NULL
;
module
->
b_builtin
=
false
;
module
->
b_loaded
=
false
;
return
module
;
}
...
...
@@ -108,7 +107,6 @@ module_t *vlc_submodule_create (module_t *module)
submodule
->
psz_help
=
NULL
;
submodule
->
psz_capability
=
NULL
;
submodule
->
i_score
=
module
->
i_score
;
submodule
->
b_builtin
=
false
;
submodule
->
b_loaded
=
false
;
submodule
->
b_unloadable
=
false
;
submodule
->
pf_activate
=
NULL
;
...
...
src/modules/modules.c
View file @
617c3420
...
...
@@ -509,8 +509,10 @@ found_shortcut:
/* Make sure the module is loaded in mem */
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_loaded
)
{
assert
(
p_real
->
psz_filename
!=
NULL
);
module_t
*
p_new_module
=
AllocatePlugin
(
p_this
,
p_real
->
psz_filename
,
false
);
if
(
p_new_module
==
NULL
)
...
...
@@ -924,7 +926,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
assert
(
p_module
->
next
==
NULL
);
/* Unload plugin until we really need it */
assert
(
!
p_module
->
b_builtin
);
if
(
p_module
->
b_loaded
&&
p_module
->
b_unloadable
)
{
module_Unload
(
p_module
->
handle
);
...
...
@@ -981,7 +982,9 @@ static module_t *AllocatePlugin( vlc_object_t * p_this, const char *psz_file,
return
NULL
;
}
p_module
->
psz_filename
=
strdup
(
psz_file
);
p_module
->
psz_filename
=
strdup
(
psz_file
);
if
(
unlikely
(
p_module
->
psz_filename
==
NULL
))
goto
error
;
p_module
->
handle
=
handle
;
p_module
->
b_loaded
=
true
;
...
...
@@ -1006,8 +1009,6 @@ static module_t *AllocatePlugin( vlc_object_t * p_this, const char *psz_file,
msg_Err
(
p_this
,
"cannot initialize plugin `%s'"
,
psz_file
);
goto
error
;
}
assert
(
!
p_module
->
b_builtin
);
return
p_module
;
error:
free
(
p_module
->
psz_filename
);
...
...
@@ -1030,7 +1031,6 @@ static module_t *module_InitStatic (vlc_plugin_cb entry)
if
(
entry
(
module
))
assert
(
0
);
module
->
b_builtin
=
true
;
module
->
b_loaded
=
true
;
module
->
b_unloadable
=
false
;
...
...
@@ -1060,14 +1060,9 @@ static void DeleteModule (module_t **head, module_t *p_module)
/* We free the structures that we strdup()ed in Allocate*Module(). */
#ifdef HAVE_DYNAMIC_PLUGINS
if
(
!
p_module
->
b_builtin
)
{
if
(
p_module
->
b_loaded
&&
p_module
->
b_unloadable
)
{
module_Unload
(
p_module
->
handle
);
}
free
(
p_module
->
psz_filename
);
}
if
(
p_module
->
b_loaded
&&
p_module
->
b_unloadable
)
module_Unload
(
p_module
->
handle
);
free
(
p_module
->
psz_filename
);
#endif
/* Free and detach the object's children */
...
...
src/modules/modules.h
View file @
617c3420
...
...
@@ -83,7 +83,6 @@ struct module_t
char
*
psz_capability
;
/**< Capability */
int
i_score
;
/**< Score for the capability */
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_unloadable
;
/**< Can we be dlclosed? */
...
...
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