Removes trailing spaces. Removes tabs.

[vlc] / modules / misc / testsuite / test4.c

diff --git a/modules/misc/testsuite/test4.c b/modules/misc/testsuite/test4.c
index 891d27030d2c64190d09c64b0f8d29bf17442bc7..409f1be0292af13224b6049688b624ae3b786ca7 100644 (file)
--- a/modules/misc/testsuite/test4.c
+++ b/modules/misc/testsuite/test4.c
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -26,7 +26,6 @@
  *****************************************************************************/
 #include <vlc/vlc.h>
 
-#include <stdlib.h>
 #include <signal.h>
 
 /*****************************************************************************
@@ -61,18 +60,18 @@ static int    Signal    ( vlc_object_t *, char const *,
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Miscellaneous stress tests") );
-    var_Create( p_module->p_libvlc_global, "foo-test",
+    var_Create( p_module->p_libvlc, "foo-test",
                 VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_module->p_libvlc_global, "foo-test", Foo, NULL );
-    var_Create( p_module->p_libvlc_global, "callback-test",
+    var_AddCallback( p_module->p_libvlc, "foo-test", Foo, NULL );
+    var_Create( p_module->p_libvlc, "callback-test",
                 VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_module->p_libvlc_global, "callback-test", Callback, NULL );
-    var_Create( p_module->p_libvlc_global, "stress-test",
+    var_AddCallback( p_module->p_libvlc, "callback-test", Callback, NULL );
+    var_Create( p_module->p_libvlc, "stress-test",
                 VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_module->p_libvlc_global, "stress-test", Stress, NULL );
-    var_Create( p_module->p_libvlc_global, "signal",
+    var_AddCallback( p_module->p_libvlc, "stress-test", Stress, NULL );
+    var_Create( p_module->p_libvlc, "signal",
                 VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
-    var_AddCallback( p_module->p_libvlc_global, "signal", Signal, NULL );
+    var_AddCallback( p_module->p_libvlc, "signal", Signal, NULL );
 vlc_module_end();
 
 /*****************************************************************************
@@ -175,7 +174,7 @@ static int Callback( vlc_object_t *p_this, char const *psz_cmd,
 
     for( i = 0; i < 10; i++ )
     {
-        pp_objects[i]->b_die = VLC_TRUE;
+        vlc_object_kill( pp_objects[i] );
         vlc_thread_join( pp_objects[i] );
         vlc_object_detach( pp_objects[i] );
         vlc_object_destroy( pp_objects[i] );
@@ -216,7 +215,7 @@ static int MyCallback( vlc_object_t *p_this, char const *psz_var,
     sprintf( psz_newvar, "blork-%i", i_var );
     var_Set( p_this, psz_newvar, newval );
 
-    return VLC_SUCCESS;   
+    return VLC_SUCCESS;
 }
 
 /*****************************************************************************