[vlc-devel] commit: Use var_CountChoices instead of var_Change(VLC_VAR_GETCHOICES) when applicable. ( Rémi Duraffort )
git version control
git at videolan.org
Wed May 20 20:50:59 CEST 2009
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed May 20 20:34:36 2009 +0200| [02e878a1cced5c23b1794a0d98ca86d94d052135] | committer: Rémi Duraffort
Use var_CountChoices instead of var_Change(VLC_VAR_GETCHOICES) when applicable.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02e878a1cced5c23b1794a0d98ca86d94d052135
---
modules/control/rc.c | 20 ++++++--------------
modules/gui/beos/InterfaceWindow.cpp | 16 ++++------------
modules/gui/ncurses.c | 19 ++++++-------------
src/control/audio.c | 5 +----
src/control/video.c | 10 ++--------
5 files changed, 19 insertions(+), 51 deletions(-)
diff --git a/modules/control/rc.c b/modules/control/rc.c
index cb8c237..c1602ea 100644
--- 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 ec92a03..79873d5 100644
--- 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 ece4602..e953f40 100644
--- 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 5ef62c2..ff794a4 100644
--- 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 bece0e4..380decd 100644
--- 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;
More information about the vlc-devel
mailing list