Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
a6673708
Commit
a6673708
authored
Aug 15, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always use (get)text domain from primary module
parent
c5b49937
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
src/modules/cache.c
src/modules/cache.c
+0
-2
src/modules/entry.c
src/modules/entry.c
+2
-2
src/modules/modules.c
src/modules/modules.c
+5
-3
No files found.
src/modules/cache.c
View file @
a6673708
...
...
@@ -252,7 +252,6 @@ size_t CacheLoad( vlc_object_t *p_this, const char *dir, module_cache_t **r )
LOAD_STRING
(
submodule
->
psz_capability
);
LOAD_IMMEDIATE
(
submodule
->
i_score
);
LOAD_IMMEDIATE
(
submodule
->
b_unloadable
);
LOAD_STRING
(
submodule
->
domain
);
}
char
*
path
;
...
...
@@ -541,7 +540,6 @@ static int CacheSaveSubmodule( FILE *file, const module_t *p_module )
SAVE_STRING
(
p_module
->
psz_capability
);
SAVE_IMMEDIATE
(
p_module
->
i_score
);
SAVE_IMMEDIATE
(
p_module
->
b_unloadable
);
SAVE_STRING
(
p_module
->
domain
);
return
0
;
error:
...
...
src/modules/entry.c
View file @
a6673708
...
...
@@ -122,8 +122,8 @@ module_t *vlc_submodule_create (module_t *module)
submodule
->
i_config_items
=
0
;
submodule
->
i_bool_items
=
0
;
/*submodule->handle = unused*/
submodule
->
psz_filename
=
NULL
;
submodule
->
domain
=
module
->
domain
;
/*submodule->psz_filename unused */
submodule
->
domain
=
NULL
;
return
submodule
;
}
...
...
src/modules/modules.c
View file @
a6673708
...
...
@@ -267,11 +267,13 @@ int module_get_score( const module_t *m )
*/
const
char
*
module_gettext
(
const
module_t
*
m
,
const
char
*
str
)
{
#ifdef ENABLE_NLS
const
char
*
domain
=
m
->
domain
?
m
->
domain
:
PACKAGE_NAME
;
if
(
m
->
parent
!=
NULL
)
m
=
m
->
parent
;
if
(
unlikely
(
str
==
NULL
||
*
str
==
'\0'
))
return
""
;
return
dgettext
(
domain
,
str
);
#ifdef ENABLE_NLS
const
char
*
domain
=
m
->
domain
;
return
dgettext
((
domain
!=
NULL
)
?
domain
:
PACKAGE_NAME
,
str
);
#else
(
void
)
m
;
return
str
;
...
...
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