Commit 5d31da4e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

variables: replace var_FreeList() with free()

...where applicable.
parent afdc71f9
...@@ -402,7 +402,7 @@ int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track ) ...@@ -402,7 +402,7 @@ int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track )
} }
libvlc_printerr( "Track identifier not found" ); libvlc_printerr( "Track identifier not found" );
end: end:
var_FreeList( &val_list, NULL ); free( val_list.p_values );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return i_ret; return i_ret;
} }
......
...@@ -375,7 +375,7 @@ int libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu ) ...@@ -375,7 +375,7 @@ int libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu )
libvlc_printerr( "Track identifier not found" ); libvlc_printerr( "Track identifier not found" );
end: end:
vlc_object_release (p_input_thread); vlc_object_release (p_input_thread);
var_FreeList (&list, NULL); free(list.p_values);
return i_ret; return i_ret;
} }
...@@ -462,7 +462,7 @@ static void teletext_enable( input_thread_t *p_input_thread, bool b_enable ) ...@@ -462,7 +462,7 @@ static void teletext_enable( input_thread_t *p_input_thread, bool b_enable )
var_SetInteger( p_input_thread, "spu-es", var_SetInteger( p_input_thread, "spu-es",
list.p_values[0].i_int ); list.p_values[0].i_int );
var_FreeList( &list, NULL ); free(list.p_values);
} }
} }
else else
...@@ -592,7 +592,7 @@ int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track ) ...@@ -592,7 +592,7 @@ int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track )
} }
libvlc_printerr( "Track identifier not found" ); libvlc_printerr( "Track identifier not found" );
end: end:
var_FreeList( &val_list, NULL ); free(val_list.p_values);
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return i_ret; return i_ret;
} }
......
...@@ -305,7 +305,7 @@ static void ProcessGesture( intf_thread_t *p_intf ) ...@@ -305,7 +305,7 @@ static void ProcessGesture( intf_thread_t *p_intf )
var_SetInteger( p_input, "audio-es", var_SetInteger( p_input, "audio-es",
list.p_values[i].i_int ); list.p_values[i].i_int );
} }
var_FreeList( &list, NULL ); free(list.p_values);
vlc_object_release( p_input ); vlc_object_release( p_input );
break; break;
} }
...@@ -344,7 +344,7 @@ static void ProcessGesture( intf_thread_t *p_intf ) ...@@ -344,7 +344,7 @@ static void ProcessGesture( intf_thread_t *p_intf )
var_SetInteger( p_input, "audio-es", var_SetInteger( p_input, "audio-es",
list.p_values[i].i_int ); list.p_values[i].i_int );
} }
var_FreeList( &list, NULL ); free(list.p_values);
vlc_object_release( p_input ); vlc_object_release( p_input );
break; break;
} }
......
...@@ -638,13 +638,14 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input, ...@@ -638,13 +638,14 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input,
if( count < 1 || val.i_int < 0 ) if( count < 1 || val.i_int < 0 )
{ {
DisplayMessage( p_vout, _("No active subtitle") ); DisplayMessage( p_vout, _("No active subtitle") );
var_FreeList( &list, NULL );
break;
} }
p_sys->subtitle_delaybookmarks.i_time_subtitle = mdate(); else
DisplayMessage( p_vout, {
_("Sub sync: bookmarked subtitle time")); p_sys->subtitle_delaybookmarks.i_time_subtitle = mdate();
var_FreeList( &list, NULL ); DisplayMessage(p_vout,
_("Sub sync: bookmarked subtitle time"));
}
free(list.p_values);
} }
break; break;
case ACTIONID_SUBSYNC_APPLY: case ACTIONID_SUBSYNC_APPLY:
...@@ -708,7 +709,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input, ...@@ -708,7 +709,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input,
if( count < 1 || val.i_int < 0 ) if( count < 1 || val.i_int < 0 )
{ {
DisplayMessage( p_vout, _("No active subtitle") ); DisplayMessage( p_vout, _("No active subtitle") );
var_FreeList( &list, NULL ); free(list.p_values);
break; break;
} }
int64_t i_delay = var_GetInteger( p_input, "spu-delay" ) + diff; int64_t i_delay = var_GetInteger( p_input, "spu-delay" ) + diff;
...@@ -717,7 +718,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input, ...@@ -717,7 +718,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input,
ClearChannels( p_vout, slider_chan ); ClearChannels( p_vout, slider_chan );
DisplayMessage( p_vout, _( "Subtitle delay %i ms" ), DisplayMessage( p_vout, _( "Subtitle delay %i ms" ),
(int)(i_delay/1000) ); (int)(i_delay/1000) );
var_FreeList( &list, NULL ); free(list.p_values);
} }
break; break;
} }
...@@ -1356,7 +1357,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input, ...@@ -1356,7 +1357,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input,
{ {
DisplayMessage( p_vout, DisplayMessage( p_vout,
_("Subtitle position: no active subtitle") ); _("Subtitle position: no active subtitle") );
var_FreeList( &list, NULL ); free(list.p_values);
break; break;
} }
...@@ -1368,7 +1369,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input, ...@@ -1368,7 +1369,7 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input,
ClearChannels( p_vout, slider_chan ); ClearChannels( p_vout, slider_chan );
DisplayMessage( p_vout, _( "Subtitle position %d px" ), i_pos ); DisplayMessage( p_vout, _( "Subtitle position %d px" ), i_pos );
var_FreeList( &list, NULL ); free(list.p_values);
} }
break; break;
} }
......
...@@ -482,7 +482,7 @@ static void aout_PrepareStereoMode (audio_output_t *aout, ...@@ -482,7 +482,7 @@ static void aout_PrepareStereoMode (audio_output_t *aout,
if (vals.p_values[i].i_int == i_output_mode) if (vals.p_values[i].i_int == i_output_mode)
mode_available = true; mode_available = true;
} }
var_FreeList(&vals, NULL); free(vals.p_values);
} }
if (!mode_available) if (!mode_available)
i_output_mode = i_default_mode; i_output_mode = i_default_mode;
......
...@@ -3295,7 +3295,7 @@ static int input_SlaveSourceAdd( input_thread_t *p_input, ...@@ -3295,7 +3295,7 @@ static int input_SlaveSourceAdd( input_thread_t *p_input,
es_out_Control( input_priv(p_input)->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id ); es_out_Control( input_priv(p_input)->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id );
es_out_Control( input_priv(p_input)->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id ); es_out_Control( input_priv(p_input)->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id );
} }
var_FreeList( &list, NULL ); free(list.p_values);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
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