The motion compensation routines are now modules as well ; choose your

[vlc] / src / misc / modules.c

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 65bc8631c407e78ccb5770e88f16e317dde71c6f..0b15ff8414d95431c2d0682f3c164bc55a1a4530 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -224,8 +224,8 @@ void module_ManageBank( module_bank_t * p_bank )
             }
             else
             {
-                intf_Msg( "module: hiding unused module `%s'",
-                          p_module->psz_name );
+                intf_DbgMsg( "module: hiding unused module `%s'",
+                             p_module->psz_name );
                 HideModule( p_module );
             }
         }
@@ -271,7 +271,7 @@ module_t * module_Need( module_bank_t *p_bank,
                 if( ( (1 << i_index) & i_capabilities ) )
                 {
                     i_score = ( (function_list_t *)p_module->p_functions)
-                                                  [i_index].p_probe( p_data );
+                                                  [i_index].pf_probe( p_data );
 
                     if( i_score )
                     {
@@ -308,6 +308,8 @@ module_t * module_Need( module_bank_t *p_bank,
     /* We release the global lock */
     vlc_mutex_unlock( &p_bank->lock );
 
+    intf_Msg( "module: locking module `%s'", p_bestmodule->psz_name );
+
     /* Don't forget that the module is still locked if bestmodule != NULL */
     return( p_bestmodule );
 }
@@ -327,6 +329,8 @@ void module_Unneed( module_bank_t * p_bank, module_t * p_module )
      * so there is no need to check the return value. */
     UnlockModule( p_module );
 
+    intf_Msg( "module: unlocking module `%s'", p_module->psz_name );
+
     /* We release the global lock */
     vlc_mutex_unlock( &p_bank->lock );
 
@@ -350,10 +354,10 @@ static int AllocateDynModule( module_bank_t * p_bank, char * psz_filename )
     module_handle_t handle;
 
     /* Try to dynamically load the module. */
-    if( ! module_load( psz_filename, &handle ) )
+    if( module_load( psz_filename, &handle ) )
     {
         /* The dynamic module couldn't be opened */
-        intf_DbgMsg( "module error: cannot open %s (%s)",
+        intf_DbgMsg( "module warning: cannot open %s (%s)",
                      psz_filename, module_error() );
         return( -1 );
     }
@@ -447,8 +451,9 @@ static int AllocateDynModule( module_bank_t * p_bank, char * psz_filename )
     p_module->prev = NULL;
     p_bank->first = p_module;
 
-    intf_Msg( "module: dynamic module `%s', %s",
-              p_module->psz_name, p_module->psz_longname );
+    /* Immediate message so that a slow module doesn't make the user wait */
+    intf_MsgImm( "module: dynamic module `%s', %s",
+                 p_module->psz_name, p_module->psz_longname );
 
     return( 0 );
 }
@@ -603,7 +608,7 @@ static int LockModule( module_t * p_module )
     }
 
     /* i_usage == -1, which means that the module isn't in memory */
-    if( ! module_load( p_module->psz_filename, &p_module->handle ) )
+    if( module_load( p_module->psz_filename, &p_module->handle ) )
     {
         /* The dynamic module couldn't be opened */
         intf_ErrMsg( "module error: cannot open %s (%s)",