Use var_CountChoices instead of var_Change(VLC_VAR_GETCHOICES) when applicable.

diff --git a/modules/control/rc.c b/modules/control/rc.c
index cb8c23705ab58f3572c71f2deb56c286f65cf983..c1602eab17c38255dc86ce9f0b17842e0fbba848 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1145,15 +1145,11 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
             }
             else
             {
-                vlc_value_t val_list;
-
                 /* Get. */
                 var_Get( p_input, "chapter", &val );
-                var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
-                            &val_list, NULL );
-                msg_rc( "Currently playing chapter %d/%d.",
-                        val.i_int, val_list.p_list->i_count );
-                var_FreeList( &val_list, NULL );
+                int i_chapter_count = var_CountChoices( p_input, "chapter" );
+                msg_rc( "Currently playing chapter %d/%d.", val.i_int,
+                        i_chapter_count );
             }
         }
         else if( !strcmp( psz_cmd, "chapter_n" ) )
@@ -1177,15 +1173,11 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
             }
             else
             {
-                vlc_value_t val_list;
-
                 /* Get. */
                 var_Get( p_input, "title", &val );
-                var_Change( p_input, "title", VLC_VAR_GETCHOICES,
-                            &val_list, NULL );
-                msg_rc( "Currently playing title %d/%d.",
-                        val.i_int, val_list.p_list->i_count );
-                var_FreeList( &val_list, NULL );
+                int i_title_count = var_CountChoices( p_input, "title" );
+                msg_rc( "Currently playing title %d/%d.", val.i_int,
+                        i_title_count );
             }
         }
         else if( !strcmp( psz_cmd, "title_n" ) )

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index ec92a03fe7b725237f4e0e0bb4dfa8e4bb294898..79873d589765e21f995f9ac42bed5ccf72237500 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -662,34 +662,26 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
         case NAVIGATE_NEXT:
             if( p_input )
             {
-                vlc_value_t val, val_list;
-
                 /* First try to go to next chapter */
                 if( !var_Get( p_input, "chapter", &val ) )
                 {
-                    var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
-                                &val_list, NULL );
-                    if( val_list.p_list->i_count > val.i_int )
+                    int i_chapter_count = var_CountChoices( p_input, "chapter" );
+                    if( i_chapter_count > val.i_int )
                     {
-                        var_FreeList( &val_list, NULL );
                         var_SetVoid( p_input, "next-chapter" );
                         break;
                     }
-                    var_FreeList( &val_list, NULL );
                 }
 
                 /* Try to go to next title */
                 if( !var_Get( p_input, "title", &val ) )
                 {
-                    var_Change( p_input, "title", VLC_VAR_GETCHOICES,
-                                &val_list, NULL );
-                    if( val_list.p_list->i_count > val.i_int )
+                    int i_title_count = var_CountChoices( p_input, "title" );
+                    if( i_title_count > val.i_int )
                     {
-                        var_FreeList( &val_list, NULL );
                         var_SetVoid( p_input, "next-title" );
                         break;
                     }
-                    var_FreeList( &val_list, NULL );
                 }
 
                 /* Try to go to next file */

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index ece460221f4c98407cdc2f29ecd1c4e2bbaf7433..e953f40d5413f780e6d8e3ff19fbf63b0df554e7 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -1512,7 +1512,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
         char buf1[MSTRTIME_MAX_SIZE];
         char buf2[MSTRTIME_MAX_SIZE];
         vlc_value_t val;
-        vlc_value_t val_list;
 
         /* Source */
         char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
@@ -1554,23 +1553,17 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
             /* Title */
             if( !var_Get( p_input, "title", &val ) )
             {
-                var_Change( p_input, "title", VLC_VAR_GETCHOICES, &val_list, NULL );
-                if( val_list.p_list->i_count > 0 )
-                {
-                    mvnprintw( y++, 0, COLS, _(" Title    : %d/%d"), val.i_int, val_list.p_list->i_count );
-                }
-                var_FreeList( &val_list, NULL );
+                int i_title_count = var_CountChoices( p_input, "title" );
+                if( i_title_count > 0 )
+                    mvnprintw( y++, 0, COLS, _(" Title    : %d/%d"), val.i_int, i_title_count );
             }
 
             /* Chapter */
             if( !var_Get( p_input, "chapter", &val ) )
             {
-                var_Change( p_input, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL );
-                if( val_list.p_list->i_count > 0 )
-                {
-                    mvnprintw( y++, 0, COLS, _(" Chapter  : %d/%d"), val.i_int, val_list.p_list->i_count );
-                }
-                var_FreeList( &val_list, NULL );
+                int i_chapter_count = var_CountChoices( p_input, "chapter" );
+                if( i_chapter_count > 0 )
+                    mvnprintw( y++, 0, COLS, _(" Chapter  : %d/%d"), val.i_int, i_chapter_count );
             }
         }
         else

diff --git a/src/control/audio.c b/src/control/audio.c
index 5ef62c27a59aaedda93cdb022128de9f10b81fdd..ff794a42d4e94c53bdb5dc8a7cea6a402ee0c30c 100644 (file)
--- a/src/control/audio.c
+++ b/src/control/audio.c
@@ -372,15 +372,12 @@ int libvlc_audio_get_track_count( libvlc_media_player_t *p_mi,
                                   libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
-    vlc_value_t val_list;
     int i_track_count;
 
     if( !p_input_thread )
         return -1;
 
-    var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES, &val_list, NULL );
-    i_track_count = val_list.p_list->i_count;
-    var_FreeList( &val_list, NULL );
+    i_track_count = var_CountChoices( p_input_thread, "audio-es" );
 
     vlc_object_release( p_input_thread );
     return i_track_count;

diff --git a/src/control/video.c b/src/control/video.c
index bece0e423bbb61af819006fe47d8b472c29bc419..380decdb300437233140c4486023ffb8db1070e1 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -281,15 +281,12 @@ int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi,
                                 libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
-    vlc_value_t val_list;
     int i_spu_count;
 
     if( !p_input_thread )
         return -1;
 
-    var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
-    i_spu_count = val_list.p_list->i_count;
-    var_FreeList( &val_list, NULL );
+    i_spu_count = var_CountChoices( p_input_thread, "spu-es" );
 
     vlc_object_release( p_input_thread );
     return i_spu_count;
@@ -506,15 +503,12 @@ int libvlc_video_get_track_count( libvlc_media_player_t *p_mi,
                                   libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
-    vlc_value_t val_list;
     int i_track_count;
 
     if( !p_input_thread )
         return -1;
 
-    var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
-    i_track_count = val_list.p_list->i_count;
-    var_FreeList( &val_list, NULL );
+    i_track_count = var_CountChoices( p_input_thread, "video-es" );
 
     vlc_object_release( p_input_thread );
     return i_track_count;