Removes trailing spaces. Removes tabs.

[vlc] / modules / control / gestures.c

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 678aed2063817c831bd06cc0a3c229519eecdd72..d81b4e9446eb9900dd601412a05d9ad504ea15ef 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -24,8 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
@@ -138,10 +136,10 @@ static input_thread_t * input_from_playlist ( playlist_t *p_playlist )
 {
     input_thread_t * p_input;
 
-    PL_LOCK; 
-    p_input = p_playlist->p_input; 
-    if( p_input ) 
-        vlc_object_yield( p_input ); 
+    PL_LOCK;
+    p_input = p_playlist->p_input;
+    if( p_input )
+        vlc_object_yield( p_input );
     PL_UNLOCK;
 
     return p_input;
@@ -170,7 +168,6 @@ static void RunIntf( intf_thread_t *p_intf )
     p_intf->p_sys->p_vout = NULL;
     vlc_mutex_unlock( &p_intf->change_lock );
 
-
     if( InitThread( p_intf ) < 0 )
     {
         msg_Err( p_intf, "can't initialize interface thread" );
@@ -227,14 +224,15 @@ static void RunIntf( intf_thread_t *p_intf )
                     p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
                                               FIND_ANYWHERE );
 
-                    p_input = input_from_playlist( p_playlist );
+                   if( !p_playlist )
+                        break;
 
+                    p_input = input_from_playlist( p_playlist );
+                    vlc_object_release( p_playlist );
+ 
                     if( !p_input )
-                    {
-                        vlc_object_release( p_playlist );
                         break;
-                    }
-                    
+ 
                     val.i_int = PLAYING_S;
                     if( p_input )
                     {
@@ -251,7 +249,6 @@ static void RunIntf( intf_thread_t *p_intf )
                     }
                     msg_Dbg(p_intf, "Play/Pause");
                     vlc_object_release( p_input );
-                    vlc_object_release( p_playlist );
                 }
                 break;
             case GESTURE(LEFT,DOWN,NONE,NONE):
@@ -312,11 +309,10 @@ static void RunIntf( intf_thread_t *p_intf )
 
                     p_input = input_from_playlist( p_playlist );
 
+                    vlc_object_release( p_playlist );
+
                     if( !p_input )
-                    {
-                        vlc_object_release( p_playlist );
                         break;
-                    }
 
                    var_Get( p_input, "audio-es", &val );
                    var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
@@ -324,7 +320,8 @@ static void RunIntf( intf_thread_t *p_intf )
                    i_count = list.p_list->i_count;
                    if( i_count <= 1 )
                    {
-                       continue;
+                       vlc_object_release( p_input );
+                       break;
                    }
                    for( i = 0; i < i_count; i++ )
                    {
@@ -355,7 +352,6 @@ static void RunIntf( intf_thread_t *p_intf )
                        i++;
                    }
                    vlc_object_release( p_input );
-                   vlc_object_release( p_playlist );
                 }
                 break;
             case GESTURE(DOWN,RIGHT,NONE,NONE):
@@ -371,13 +367,11 @@ static void RunIntf( intf_thread_t *p_intf )
                         break;
 
                     p_input = input_from_playlist( p_playlist );
+                    vlc_object_release( p_playlist );
 
                     if( !p_input )
-                    {
-                        vlc_object_release( p_playlist );
                         break;
-                    }
-                    
+
                     var_Get( p_input, "spu-es", &val );
 
                     var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
@@ -385,7 +379,8 @@ static void RunIntf( intf_thread_t *p_intf )
                     i_count = list.p_list->i_count;
                     if( i_count <= 1 )
                     {
-                        continue;
+                        vlc_object_release( p_input );
+                        break;
                     }
                     for( i = 0; i < i_count; i++ )
                     {
@@ -409,12 +404,11 @@ static void RunIntf( intf_thread_t *p_intf )
                     }
                     else
                     {
-                        var_Set( p_input, "spu-es", 
+                        var_Set( p_input, "spu-es",
                                 list.p_list->p_values[i+1] );
                         i = i + 1;
                     }
                     vlc_object_release( p_input );
-                    vlc_object_release( p_playlist );
                 }
                 break;
             case GESTURE(UP,LEFT,NONE,NONE):
@@ -426,7 +420,7 @@ static void RunIntf( intf_thread_t *p_intf )
                 break;
             case GESTURE(DOWN,LEFT,NONE,NONE):
                 /* FIXME: Should close the vout!"*/
-                p_intf->p_libvlc->b_die = VLC_TRUE;
+                vlc_object_kill( p_intf->p_libvlc );
                 break;
             case GESTURE(DOWN,LEFT,UP,RIGHT):
             case GESTURE(UP,RIGHT,DOWN,LEFT):