From a178e86293a60fa787799adc8b0922722b829f47 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Sun, 25 Mar 2007 12:11:12 +0000 Subject: [PATCH] Gestures: no need to retain p_playlist longer than really needed. --- modules/control/gestures.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/modules/control/gestures.c b/modules/control/gestures.c index fa25d73fe4..9e7ccba9cf 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -226,12 +226,10 @@ 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; - } val.i_int = PLAYING_S; if( p_input ) @@ -249,7 +247,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): @@ -310,11 +307,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, @@ -323,7 +319,6 @@ static void RunIntf( intf_thread_t *p_intf ) if( i_count <= 1 ) { vlc_object_release( p_input ); - vlc_object_release( p_playlist ); continue; } for( i = 0; i < i_count; i++ ) @@ -331,7 +326,6 @@ static void RunIntf( intf_thread_t *p_intf ) if( val.i_int == list.p_list->p_values[i].i_int ) { vlc_object_release( p_input ); - vlc_object_release( p_playlist ); break; } } @@ -357,7 +351,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): @@ -373,12 +366,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, @@ -387,7 +379,6 @@ static void RunIntf( intf_thread_t *p_intf ) if( i_count <= 1 ) { vlc_object_release( p_input ); - vlc_object_release( p_playlist ); continue; } for( i = 0; i < i_count; i++ ) @@ -395,7 +386,6 @@ static void RunIntf( intf_thread_t *p_intf ) if( val.i_int == list.p_list->p_values[i].i_int ) { vlc_object_release( p_input ); - vlc_object_release( p_playlist ); break; } } @@ -419,7 +409,6 @@ static void RunIntf( intf_thread_t *p_intf ) i = i + 1; } vlc_object_release( p_input ); - vlc_object_release( p_playlist ); } break; case GESTURE(UP,LEFT,NONE,NONE): -- 2.39.2