Removes trailing spaces. Removes tabs.

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 62ca3bb3c4eb834f820b7fdb1dc334f0a57cc674..7ed0822ede3d88a4fbed96fd5ef805bf77d3f267 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -3,7 +3,7 @@
  * This library provides basic functions for threads to interact with user
  * interface, such as command line.
  *****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -32,9 +32,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* free(), strtol() */
-#include <stdio.h>                                                   /* FILE */
-#include <string.h>                                            /* strerror() */
 
 #include <vlc/vlc.h>
 
@@ -42,6 +39,7 @@
 #include <vlc_vout.h>
 
 #include "vlc_interface.h"
+#include "modules/modules.h" // Gruik!
 
 #ifdef __APPLE__
 #    include <Cocoa/Cocoa.h>
@@ -170,7 +168,7 @@ int intf_RunThread( intf_thread_t *p_intf )
             while( !intf_ShouldDie( p_intf ) )
                 msleep( INTF_IDLE_SLEEP * 2);
         }
-        p_intf->b_die = VLC_TRUE;
+        vlc_object_kill( p_intf );
     }
     else
 #endif
@@ -184,7 +182,7 @@ int intf_RunThread( intf_thread_t *p_intf )
                              "README.MacOSX.rtf file.");
             return VLC_EGENERIC;
         }
-        
+ 
         /* If the main interface does not have a run function,
          * implement a waiting loop ourselves
          */
@@ -195,7 +193,7 @@ int intf_RunThread( intf_thread_t *p_intf )
             while( !intf_ShouldDie( p_intf ) )
                 msleep( INTF_IDLE_SLEEP * 2);
         }
-        p_intf->b_die = VLC_TRUE;
+        vlc_object_kill( p_intf );
     }
     else
     {
@@ -236,7 +234,7 @@ void intf_StopThread( intf_thread_t *p_intf )
     /* Tell the interface to die */
     if( !p_intf->b_block )
     {
-        p_intf->b_die = VLC_TRUE;
+        vlc_object_kill( p_intf );
         if( p_intf->pf_run )
         {
             vlc_cond_signal( &p_intf->object_wait );
@@ -384,7 +382,7 @@ static void RunInterface( intf_thread_t *p_intf )
         p_intf->psz_switch_intf = NULL;
 
         vlc_mutex_lock( &p_intf->object_lock );
-        p_intf->b_die = VLC_FALSE;
+        p_intf->b_die = VLC_FALSE; /* FIXME */
         p_intf->b_dead = VLC_FALSE;
         vlc_mutex_unlock( &p_intf->object_lock );
 
@@ -398,11 +396,12 @@ static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
+    (void)psz_cmd; (void)oldval; (void)p_data;
 
     p_intf->psz_switch_intf =
         malloc( strlen(newval.psz_string) + sizeof(",none") );
     sprintf( p_intf->psz_switch_intf, "%s,none", newval.psz_string );
-    p_intf->b_die = VLC_TRUE;
+    vlc_object_kill( p_intf );
 
     return VLC_SUCCESS;
 }
@@ -413,6 +412,8 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
     intf_thread_t *p_intf;
     char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") );
 
+    (void)psz_cmd; (void)oldval; (void)p_data;
+
     /* Try to create the interface */
     sprintf( psz_intf, "%s,none", newval.psz_string );
     p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
@@ -449,7 +450,7 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
 
 - (void)terminate: (id)sender
 {
-    o_libvlc->b_die = VLC_TRUE;
+    vlc_object_kill( o_libvlc );
     [super terminate: sender];
 }