From e712c11f55e881fd91774921e69a2736d8fdad0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 19 Feb 2013 23:37:20 +0200 Subject: [PATCH] lib: rectify SPU track IDs (refs #7645) --- lib/video.c | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/lib/video.c b/lib/video.c index 2736933249..c3b1c68174 100644 --- a/lib/video.c +++ b/lib/video.c @@ -283,11 +283,6 @@ void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, int libvlc_video_get_spu( libvlc_media_player_t *p_mi ) { input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); - vlc_value_t val_list; - vlc_value_t val; - int i_spu = -1; - int i_ret = -1; - int i; if( !p_input_thread ) { @@ -295,24 +290,7 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi ) return -1; } - i_ret = var_Get( p_input_thread, "spu-es", &val ); - if( i_ret < 0 ) - { - vlc_object_release( p_input_thread ); - libvlc_printerr( "Subtitle information not found" ); - return -1; - } - - 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( val.i_int == val_list.p_list->p_values[i].i_int ) - { - i_spu = i; - break; - } - } - var_FreeList( &val_list, NULL ); + int i_spu = var_GetInteger( p_input_thread, "spu-es" ); vlc_object_release( p_input_thread ); return i_spu; } @@ -340,22 +318,23 @@ int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i_spu ) { input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); vlc_value_t list; - int i_ret = 0; + int i_ret = -1; if( !p_input_thread ) return -1; var_Change (p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &list, NULL); - - if (i_spu > (unsigned)list.p_list->i_count) + for (int i = 0; i < list.p_list->i_count; i++) { - libvlc_printerr( "Subtitle number out of range (%u/%u)", - i_spu, list.p_list->i_count ); - i_ret = -1; - goto end; + if( i_spu == list.p_list->p_values[i].i_int ) + { + if( var_SetInteger( p_input_thread, "spu-es", i_spu ) < 0 ) + break; + i_ret = 0; + goto end; + } } - var_SetInteger (p_input_thread, "spu-es", - list.p_list->p_values[i_spu].i_int); + libvlc_printerr( "Track identifier not found" ); end: vlc_object_release (p_input_thread); var_FreeList (&list, NULL); -- 2.39.5