Skip to content

V
vlc-2-2
Commit 19b91d1b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Remove old object aliasing code

parent 7d5937b3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 10 deletions
src/modules/modules.c
View file @ 19b91d1b
......@@ -200,7 +200,7 @@ module_t *vlc_module_load(vlc_object_t *p_this, const char *psz_capability,
vlc_activate_t probe, ...)
{
int i_shortcuts = 0;
char *psz_shortcuts = NULL, *psz_var = NULL, *psz_alias = NULL;
char *psz_shortcuts = NULL, *psz_var = NULL;
bool b_force_backup = p_this->b_force;
/* Deal with variables */
......@@ -271,15 +271,9 @@ module_t *vlc_module_load(vlc_object_t *p_this, const char *psz_capability,
{
for( unsigned i = 0; i < p_module->i_shortcuts; i++ )
{
char *c;
if( ( c = strchr( name, '@' ) )
? !strncasecmp( name, p_module->pp_shortcuts[i],
c-name )
: !strcasecmp( name, p_module->pp_shortcuts[i] ) )
if( !strcasecmp( name, p_module->pp_shortcuts[i] ) )
{
/* Found it */
if( c && c[1] )
psz_alias = c+1;
i_shortcut_bonus = i_short * 10000;
goto found_shortcut;
}
......@@ -374,8 +368,7 @@ found_shortcut:
{
msg_Dbg( p_this, "using %s module \"%s\"",
psz_capability, module_get_object(p_module) );
vlc_object_set_name( p_this, psz_alias ? psz_alias
: module_get_object(p_module) );
vlc_object_set_name( p_this, module_get_object(p_module) );
}
else
msg_Dbg( p_this, "no %s module matching \"%s\" could be loaded",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment