Skip to content

V
vlc
Commit a178e862 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

Gestures: no need to retain p_playlist longer than really needed.

parent 6b20068d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 17 deletions
modules/control/gestures.c
View file @ a178e862
...@@ -226,12 +226,10 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -226,12 +226,10 @@ static void RunIntf( intf_thread_t *p_intf )
break; break;
p_input = input_from_playlist( p_playlist ); p_input = input_from_playlist( p_playlist );
vlc_object_release( p_playlist );
if( !p_input ) if( !p_input )
{
vlc_object_release( p_playlist );
break; break;
}
val.i_int = PLAYING_S; val.i_int = PLAYING_S;
if( p_input ) if( p_input )
...@@ -249,7 +247,6 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -249,7 +247,6 @@ static void RunIntf( intf_thread_t *p_intf )
} }
msg_Dbg(p_intf, "Play/Pause"); msg_Dbg(p_intf, "Play/Pause");
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist );
} }
break; break;
case GESTURE(LEFT,DOWN,NONE,NONE): case GESTURE(LEFT,DOWN,NONE,NONE):
...@@ -310,11 +307,10 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -310,11 +307,10 @@ static void RunIntf( intf_thread_t *p_intf )
p_input = input_from_playlist( p_playlist ); p_input = input_from_playlist( p_playlist );
if( !p_input )
{
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
if( !p_input )
break; break;
}
var_Get( p_input, "audio-es", &val ); var_Get( p_input, "audio-es", &val );
var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES, var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
...@@ -323,7 +319,6 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -323,7 +319,6 @@ static void RunIntf( intf_thread_t *p_intf )
if( i_count <= 1 ) if( i_count <= 1 )
{ {
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist );
continue; continue;
} }
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
...@@ -331,7 +326,6 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -331,7 +326,6 @@ static void RunIntf( intf_thread_t *p_intf )
if( val.i_int == list.p_list->p_values[i].i_int ) if( val.i_int == list.p_list->p_values[i].i_int )
{ {
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist );
break; break;
} }
} }
...@@ -357,7 +351,6 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -357,7 +351,6 @@ static void RunIntf( intf_thread_t *p_intf )
i++; i++;
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist );
} }
break; break;
case GESTURE(DOWN,RIGHT,NONE,NONE): case GESTURE(DOWN,RIGHT,NONE,NONE):
...@@ -373,12 +366,11 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -373,12 +366,11 @@ static void RunIntf( intf_thread_t *p_intf )
break; break;
p_input = input_from_playlist( p_playlist ); p_input = input_from_playlist( p_playlist );
vlc_object_release( p_playlist );
if( !p_input ) if( !p_input )
{
vlc_object_release( p_playlist );
break; break;
}
var_Get( p_input, "spu-es", &val ); var_Get( p_input, "spu-es", &val );
var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES, var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
...@@ -387,7 +379,6 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -387,7 +379,6 @@ static void RunIntf( intf_thread_t *p_intf )
if( i_count <= 1 ) if( i_count <= 1 )
{ {
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist );
continue; continue;
} }
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
...@@ -395,7 +386,6 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -395,7 +386,6 @@ static void RunIntf( intf_thread_t *p_intf )
if( val.i_int == list.p_list->p_values[i].i_int ) if( val.i_int == list.p_list->p_values[i].i_int )
{ {
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist );
break; break;
} }
} }
...@@ -419,7 +409,6 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -419,7 +409,6 @@ static void RunIntf( intf_thread_t *p_intf )
i = i + 1; i = i + 1;
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist );
} }
break; break;
case GESTURE(UP,LEFT,NONE,NONE): case GESTURE(UP,LEFT,NONE,NONE):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment