Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
40a2f546
Commit
40a2f546
authored
Dec 30, 2009
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix module_need parsing. a,b,c,d should first try loading a, then b, then c, then d.
parent
c9d2fec1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
src/modules/modules.c
src/modules/modules.c
+4
-6
No files found.
src/modules/modules.c
View file @
40a2f546
...
...
@@ -475,7 +475,7 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
count
=
0
;
for
(
size_t
i
=
0
;
(
p_module
=
p_all
[
i
])
!=
NULL
;
i
++
)
{
bool
b_shortcut_bonus
=
false
;
int
i_shortcut_bonus
=
0
;
/* Test that this module can do what we need */
if
(
!
module_provides
(
p_module
,
psz_capability
)
)
...
...
@@ -502,7 +502,7 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
/* Found it */
if
(
c
&&
c
[
1
]
)
psz_alias
=
c
+
1
;
b_shortcut_bonus
=
true
;
i_shortcut_bonus
=
i_short
*
10000
;
goto
found_shortcut
;
}
}
...
...
@@ -525,10 +525,8 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
found_shortcut:
/* Store this new module */
p_list
[
count
].
p_module
=
module_hold
(
p_module
);
p_list
[
count
].
i_score
=
p_module
->
i_score
;
if
(
b_shortcut_bonus
)
p_list
[
count
].
i_score
+=
10000
;
p_list
[
count
].
b_force
=
b_shortcut_bonus
&&
b_strict
;
p_list
[
count
].
i_score
=
p_module
->
i_score
+
i_shortcut_bonus
;
p_list
[
count
].
b_force
=
i_shortcut_bonus
&&
b_strict
;
count
++
;
}
...
...
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