Commit 8420dc4e authored by Jean-Philippe Andre's avatar Jean-Philippe Andre

Fix object leak (1 from my previous commit + 2 others)

parent c7b874c5
...@@ -216,6 +216,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -216,6 +216,8 @@ 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 )
vlc_object_release( p_aout );
if( p_vout ) if( p_vout )
vlc_object_release( p_vout ); vlc_object_release( p_vout );
if( p_input ) if( p_input )
...@@ -385,10 +387,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -385,10 +387,8 @@ static void Run( intf_thread_t *p_intf )
&list, &list2 ); &list, &list2 );
i_count = list.p_list->i_count; i_count = list.p_list->i_count;
/* Not enough device to switch between */ if( i_count > 1 )
if( i_count <= 1 ) {
continue;
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 ) if( val.i_int == list.p_list->p_values[i].i_int )
...@@ -420,6 +420,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -420,6 +420,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);
} }
}
/* Input options */ /* Input options */
else if( p_input ) else if( p_input )
{ {
...@@ -487,10 +488,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -487,10 +488,8 @@ static void Run( intf_thread_t *p_intf )
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 )
{ {
continue;
}
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 ) if( val.i_int == list.p_list->p_values[i].i_int )
...@@ -514,6 +513,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -514,6 +513,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 );
} }
}
else if( i_action == ACTIONID_SUBTITLE_TRACK ) else if( i_action == ACTIONID_SUBTITLE_TRACK )
{ {
vlc_value_t val, list, list2; vlc_value_t val, list, list2;
......
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