Skip to content

V
vlc-1.1
Commit 14f37b21 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Merge branch '1.0-bugfix'

parents c65eebb3 46a33c34
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 24 deletions
modules/control/gestures.c
View file @ 14f37b21
...@@ -306,8 +306,8 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -306,8 +306,8 @@ static void RunIntf( intf_thread_t *p_intf )
case GESTURE(UP,RIGHT,NONE,NONE): case GESTURE(UP,RIGHT,NONE,NONE):
{ {
vlc_value_t val, list, list2; vlc_value_t val, list, list2;
int i_count, i; int i_count, i;
p_playlist = pl_Hold( p_intf ); p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist ); p_input = playlist_CurrentInput( p_playlist );
...@@ -316,20 +316,21 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -316,20 +316,21 @@ static void RunIntf( intf_thread_t *p_intf )
if( !p_input ) 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,
&list, &list2 ); &list, &list2 );
i_count = list.p_list->i_count; i_count = list.p_list->i_count;
if( i_count <= 1 ) if( i_count <= 1 )
{ {
vlc_object_release( p_input ); var_FreeList( &list, &list2 );
break; vlc_object_release( p_input );
} break;
for( i = 0; i < i_count; i++ ) }
{ for( i = 0; i < i_count; i++ )
if( val.i_int == list.p_list->p_values[i].i_int ) {
break; if( val.i_int == list.p_list->p_values[i].i_int )
} break;
}
/* value of audio-es was not in choices list */ /* value of audio-es was not in choices list */
if( i == i_count ) if( i == i_count )
{ {
...@@ -342,6 +343,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -342,6 +343,7 @@ static void RunIntf( intf_thread_t *p_intf )
else else
i++; i++;
var_Set( p_input, "audio-es", list.p_list->p_values[i] ); var_Set( p_input, "audio-es", list.p_list->p_values[i] );
var_FreeList( &list, &list2 );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
break; break;
...@@ -365,6 +367,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -365,6 +367,7 @@ 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 );
var_FreeList( &list, &list2 );
break; break;
} }
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
...@@ -386,6 +389,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -386,6 +389,7 @@ static void RunIntf( intf_thread_t *p_intf )
else else
i++; i++;
var_Set( p_input, "spu-es", list.p_list->p_values[i] ); var_Set( p_input, "spu-es", list.p_list->p_values[i] );
var_FreeList( &list, &list2 );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
break; break;
......
modules/control/hotkeys.c
View file @ 14f37b21
...@@ -207,13 +207,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -207,13 +207,7 @@ static void Run( intf_thread_t *p_intf )
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
if( p_aout ) goto cleanup_and_continue;
vlc_object_release( p_aout );
if( p_vout )
vlc_object_release( p_vout );
if( p_input )
vlc_object_release( p_input );
continue;
} }
/* Volume and audio actions */ /* Volume and audio actions */
else if( i_action == ACTIONID_VOL_UP ) else if( i_action == ACTIONID_VOL_UP )
...@@ -387,6 +381,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -387,6 +381,7 @@ static void Run( intf_thread_t *p_intf )
_("Audio Device: %s"), _("Audio Device: %s"),
list2.p_list->p_values[i].psz_string); list2.p_list->p_values[i].psz_string);
} }
var_FreeList( &list, &list2 );
} }
/* Input options */ /* Input options */
else if( p_input ) else if( p_input )
...@@ -478,6 +473,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -478,6 +473,7 @@ static void Run( intf_thread_t *p_intf )
_("Audio track: %s"), _("Audio track: %s"),
list2.p_list->p_values[i].psz_string ); list2.p_list->p_values[i].psz_string );
} }
var_FreeList( &list, &list2 );
} }
else if( i_action == ACTIONID_SUBTITLE_TRACK ) else if( i_action == ACTIONID_SUBTITLE_TRACK )
{ {
...@@ -492,7 +488,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -492,7 +488,8 @@ static void Run( intf_thread_t *p_intf )
{ {
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Subtitle track: %s"), _("N/A") ); _("Subtitle track: %s"), _("N/A") );
continue; var_FreeList( &list, &list2 );
goto cleanup_and_continue;
} }
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
{ {
...@@ -516,6 +513,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -516,6 +513,7 @@ static void Run( intf_thread_t *p_intf )
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Subtitle track: %s"), _("Subtitle track: %s"),
list2.p_list->p_values[i].psz_string ); list2.p_list->p_values[i].psz_string );
var_FreeList( &list, &list2 );
} }
else if( i_action == ACTIONID_ASPECT_RATIO && p_vout ) else if( i_action == ACTIONID_ASPECT_RATIO && p_vout )
{ {
...@@ -875,6 +873,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -875,6 +873,7 @@ static void Run( intf_thread_t *p_intf )
} }
} }
} }
cleanup_and_continue:
if( p_aout ) if( p_aout )
vlc_object_release( p_aout ); vlc_object_release( p_aout );
if( p_vout ) if( p_vout )
......
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