Fix seeking with broken file or without index (close #1687)

[vlc] / include / vlc_modules.h

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 0f5abce9ae4fcced69b56c9d233673711564e9a0..7d965bcd11ced7fdc71ac0ca6fa6afaef86a6331 100644 (file)
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -58,28 +58,10 @@ VLC_EXPORT( const char *, module_GetHelp, ( const module_t *m ) );
 #define module_GetMainModule(a) __module_GetMainModule(VLC_OBJECT(a))
 static inline module_t * __module_GetMainModule( vlc_object_t * p_this )
 {
-    module_t * p_module;
-    module_t * p_main_module = NULL;
-    vlc_list_t *p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE,
-                                        FIND_ANYWHERE );
-    if( !p_list ) return NULL;
-
-    /* Find the main module */
-    for( int i = 0; i < p_list->i_count; i++ )
-    {
-        p_module = (module_t *)p_list->p_values[i].p_object;
-        if( strcmp( module_GetObjName( p_module ), "main" ) == 0 )
-        {
-            p_main_module = p_module;
-            vlc_object_yield( (vlc_object_t*)p_main_module );
-            break;
-        }
-    }
-    vlc_list_release( p_list );
-    return p_main_module;
+    return module_Find( p_this, "main" );
 }
 
-static inline bool module_IsMainModule( module_t * p_module )
+static inline bool module_IsMainModule( const module_t * p_module )
 {
     return !strcmp( module_GetObjName( p_module ), "main" );
 }