Commit 7957fe56 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix regression in libvlc_video_set_spu() and libvlc_audio_set_track().

(cherry picked from commit 36088cd5e25bfeb49704c194fb194d1d569b34a5)
parent 84efb6a0
...@@ -172,7 +172,6 @@ int libvlc_audio_get_track( libvlc_media_player_t *p_mi, ...@@ -172,7 +172,6 @@ int libvlc_audio_get_track( libvlc_media_player_t *p_mi,
return i_track; return i_track;
} }
/***************************************************************************** /*****************************************************************************
* libvlc_audio_set_track : Set the current audio track * libvlc_audio_set_track : Set the current audio track
*****************************************************************************/ *****************************************************************************/
...@@ -181,28 +180,26 @@ void libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track, ...@@ -181,28 +180,26 @@ void libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track,
{ {
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e ); input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_value_t val_list; vlc_value_t val_list;
vlc_value_t newval;
int i_ret = -1; int i_ret = -1;
int i;
if( !p_input_thread ) if( !p_input_thread )
return; return;
var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL ); var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
for( i = 0; i < val_list.p_list->i_count; i++ ) if( (i_track < 0) && (i_track > val_list.p_list->i_count) )
{ {
vlc_value_t val = val_list.p_list->p_values[i]; libvlc_exception_raise( p_e, "Audio track out of range" );
if( i_track == val.i_int ) vlc_object_release( p_input_thread );
{ return;
i_ret = var_Set( p_input_thread, "audio-es", val ); }
if( i_ret < 0 )
{ newval = val_list.p_list->p_values[i_track];
libvlc_exception_raise( p_e, "Setting audio track failed" ); i_ret = var_Set( p_input_thread, "audio-es", newval );
} if( i_ret < 0 )
vlc_object_release( p_input_thread ); {
return; libvlc_exception_raise( p_e, "Setting audio track failed" );
}
} }
libvlc_exception_raise( p_e, "Audio track out of range" );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
} }
......
...@@ -252,9 +252,9 @@ libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc ...@@ -252,9 +252,9 @@ libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc
VLC_UNUSED(p_e); VLC_UNUSED(p_e);
libvlc_drawable_t result; libvlc_drawable_t result;
result = var_GetInteger( p_instance->p_libvlc_int, "drawable" ); result = var_GetInteger( p_instance->p_libvlc_int, "drawable" );
return result; return result;
} }
...@@ -388,30 +388,25 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu, ...@@ -388,30 +388,25 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
{ {
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e ); input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_value_t val_list; vlc_value_t val_list;
vlc_value_t newval;
int i_ret = -1; int i_ret = -1;
int i;
if( !p_input_thread ) return; if( !p_input_thread ) return;
var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
for( i = 0; i < val_list.p_list->i_count; i++ ) if( (i_spu < 0) && (i_spu > val_list.p_list->i_count) )
{ {
vlc_value_t val = val_list.p_list->p_values[i]; libvlc_exception_raise( p_e, "Subtitle value out of range" );
if( i_spu == val.i_int ) vlc_object_release( p_input_thread );
{ return;
vlc_value_t new_val; }
new_val.i_int = val.i_int; newval = val_list.p_list->p_values[i_spu];
i_ret = var_Set( p_input_thread, "spu-es", new_val ); i_ret = var_Set( p_input_thread, "spu-es", newval );
if( i_ret < 0 ) if( i_ret < 0 )
{ {
libvlc_exception_raise( p_e, "Setting subtitle value failed" ); libvlc_exception_raise( p_e, "Setting subtitle value failed" );
}
vlc_object_release( p_input_thread );
return;
}
} }
libvlc_exception_raise( p_e, "Subtitle value out of range" );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
} }
......
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