* ./src/misc/variables.c: callbacks are now called after the variable has

    been modified. Maybe we'll need the other type, too, but this change will
    make things simpler in aout3.

  * ./src/playlist/playlist.c: removed two unused variables.
  * ./src/misc/modules.c: removed a debug message I had forgotten.
  * ./src/misc/modules_plugin.h.in: fixed a typo (thanks bozo).

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 816458d531ed17a4f1dd1b6935360c8f89144f13..363d3d43f5ef8a0dfed44b59be2d63102eaa01e9 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.99 2002/10/29 18:57:40 sam Exp $
+ * $Id: modules.c,v 1.100 2002/10/31 11:16:30 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -423,7 +423,6 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
     p_tmp = p_first;
     while( p_tmp != NULL )
     {
-msg_Dbg(p_this,"candidate: %s\n", p_tmp->p_module->psz_object_name);
         vlc_object_yield( p_tmp->p_module );
         p_tmp = p_tmp->p_next;
     }

diff --git a/src/misc/modules_plugin.h.in b/src/misc/modules_plugin.h.in
index 3ec284aec70569307a71e8966c7a2e5aae9251e9..8d16a59934a8a901f3f815a3af98e730a107f2e0 100644 (file)
--- a/src/misc/modules_plugin.h.in
+++ b/src/misc/modules_plugin.h.in
@@ -2,7 +2,7 @@
  * modules_plugin.h : Plugin management functions used by the core application.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules_plugin.h.in,v 1.4 2002/09/30 11:05:42 sam Exp $
+ * $Id: modules_plugin.h.in,v 1.5 2002/10/31 11:16:30 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -46,7 +46,7 @@ static int module_load( const char * psz_filename, module_handle_t * handle )
     /* We should NOT open modules with RTLD_GLOBAL, or we are going to get
      * namespace collisions when two modules have common public symbols,
      * but ALSA is being a pest here. */
-    if( strstr( psz_filename, "alsa" LIBEXT ) )
+    if( strstr( psz_filename, "alsa" ) )
     {
         *handle = dlopen( psz_filename, RTLD_NOW | RTLD_GLOBAL );
         return( *handle == NULL );

diff --git a/src/misc/variables.c b/src/misc/variables.c
index 0e7bdd39c82aafa8f3b4feffbdc02c5898d5c678..7d4914c1682ccee91f30f3f28db1296f1f035d60 100644 (file)
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -2,7 +2,7 @@
  * variables.c: routines for object variables handling
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: variables.c,v 1.12 2002/10/29 13:38:37 sam Exp $
+ * $Id: variables.c,v 1.13 2002/10/31 11:16:30 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -477,6 +477,9 @@ int __var_Set( vlc_object_t *p_this, const char *psz_name, vlc_value_t val )
     /* Check boundaries and list */
     CheckValue( p_var, &val );
 
+    /* Set the variable */
+    p_var->val = val;
+
     /* Deal with callbacks. Tell we're in a callback, release the lock,
      * call stored functions, retake the lock. */
     if( p_var->i_entries )
@@ -509,9 +512,6 @@ int __var_Set( vlc_object_t *p_this, const char *psz_name, vlc_value_t val )
         p_var->b_incallback = VLC_FALSE;
     }
 
-    /* Set the variable */
-    p_var->val = val;
-
     /* Free data if needed */
     p_var->pf_free( &oldval );
 

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 40201d38abd55bdb707f9b83da3923e2b44d80e1..0dd0beddafd7f5967f5cf1a9aeb1b1bd9f6b5ae4 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -2,7 +2,7 @@
  * playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.15 2002/10/29 13:22:48 sam Exp $
+ * $Id: playlist.c,v 1.16 2002/10/31 11:16:29 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -136,8 +136,6 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
     if( !(i_mode & PLAYLIST_REPLACE)
          || i_pos < 0 || i_pos >= p_playlist->i_size )
     {
-        int i_index;
-
         /* Additional boundary checks */
         if( i_mode & PLAYLIST_APPEND )
         {
@@ -194,8 +192,6 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
  *****************************************************************************/
 int playlist_Delete( playlist_t * p_playlist, int i_pos )
 {
-    int i_index;
-
     vlc_mutex_lock( &p_playlist->object_lock );
 
     if( i_pos >= 0 && i_pos < p_playlist->i_size )