Commit 238cc870 authored by Clément Stenac's avatar Clément Stenac

Be consistant in naming

parent be9b749c
......@@ -300,11 +300,11 @@ SOURCES_libvlc_common = \
misc/hashtables.c \
misc/version.c \
extras/libc.c \
control/core.c \
control/control_playlist.c \
control/control_vlm.c \
control/control_input.c \
control/video.c \
control/libvlc_core.c \
control/libvlc_playlist.c \
control/libvlc_vlm.c \
control/libvlc_input.c \
control/libvlc_video.c \
control/mediacontrol_core.c \
control/mediacontrol_util.c \
control/mediacontrol_audio_video.c \
......
......@@ -61,8 +61,7 @@ inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
char *psz_format, ... )
{
va_list args;
char *psz_message;
va_start( args, p_exception->psz_message );
va_start( args, psz_format );
vasprintf( &p_exception->psz_message, psz_format, args );
va_end( args );
......
......@@ -70,14 +70,13 @@ void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen,
/* GetVout will raise the exception for us */
if( !p_vout1 )
{
fprintf( stderr, "No vout\n");
return;
}
if( b_fullscreen ) val.b_bool = VLC_TRUE;
else val.b_bool = VLC_FALSE;
var_Set( p_vout1, "fullscreen", val );
i_ret = var_Set( p_vout1, "fullscreen", val );
if( i_ret )
libvlc_exception_raise( p_e,
"Unexpected error while setting fullscreen value" );
......
......@@ -144,13 +144,13 @@ void libvlc_vlm_set_input( libvlc_instance_t *p_instance, char *psz_name,
vlc_mutex_lock( &p_instance->p_vlm->lock );
GET_MEDIA;
vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
if( i_ret )
{
libvlc_exception_raise( p_exception, "Unable to change input" );
vlc_mutex_unlock( &p_instance->p_vlm->lock );return;
}
vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
if( i_ret )
{
libvlc_exception_raise( p_exception, "Unable to change input" );
......@@ -170,7 +170,7 @@ void libvlc_vlm_add_input( libvlc_instance_t *p_instance, char *psz_name,
vlc_mutex_lock( &p_instance->p_vlm->lock );
GET_MEDIA;
vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
if( i_ret )
{
libvlc_exception_raise( p_exception, "Unable to change input" );
......@@ -212,13 +212,13 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
libvlc_exception_raise( p_exception, "Unable to set output" );
vlc_mutex_unlock( &p_instance->p_vlm->lock ); return;
}
vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
if( i_ret )
{
libvlc_exception_raise( p_exception, "Unable to change input" );
vlc_mutex_unlock( &p_instance->p_vlm->lock ); return;
}
vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
if( i_ret )
{
libvlc_exception_raise( p_exception, "Unable to change input" );
......
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