[vlc-devel] commit: libvlc_InternalAddIntf: remove useless options ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat May 31 12:27:55 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat May 31 13:25:56 2008 +0300| [40caaae0a39213f906821ba206cfc1fd59ebdf10]
libvlc_InternalAddIntf: remove useless options
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40caaae0a39213f906821ba206cfc1fd59ebdf10
---
src/control/core.c | 2 +-
src/control/libvlc_internal.h | 3 +--
src/libvlc-common.c | 27 ++++++++++++---------------
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/control/core.c b/src/control/core.c
index 6a804ed..9886568 100644
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -169,7 +169,7 @@ void libvlc_release( libvlc_instance_t *p_instance )
void libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
libvlc_exception_t *p_e )
{
- if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name, true, 0, NULL ) )
+ if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name, true ) )
RAISEVOID( "Interface initialization failed" );
}
diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index 68f7b1c..4573f88 100644
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -47,8 +47,7 @@ VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, const char *ppsz_ar
VLC_EXPORT (int, libvlc_InternalCleanup, ( libvlc_int_t * ) );
VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, bool ) );
-VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *,
- bool, int, const char *const * ) );
+VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, bool ) );
/***************************************************************************
* Opaque structures for libvlc API
diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 66a5c29..47b0302 100644
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -806,7 +806,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if( psz_temp )
{
sprintf( psz_temp, "%s,none", psz_module );
- libvlc_InternalAddIntf( p_libvlc, psz_temp, false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, psz_temp, false );
free( psz_temp );
}
}
@@ -816,18 +816,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/*
* Always load the hotkeys interface if it exists
*/
- libvlc_InternalAddIntf( p_libvlc, "hotkeys,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "hotkeys,none", false );
#ifdef HAVE_DBUS_3
/* loads dbus control interface if in one-instance mode
* we do it only when playlist exists, because dbus module needs it */
if( config_GetInt( p_libvlc, "one-instance" ) > 0 )
- libvlc_InternalAddIntf( p_libvlc, "dbus,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "dbus,none", false );
/* Prevents the power management daemon from suspending the system
* when VLC is active */
if( config_GetInt( p_libvlc, "inhibit" ) > 0 )
- libvlc_InternalAddIntf( p_libvlc, "inhibit,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "inhibit,none", false );
#endif
/*
@@ -837,20 +837,20 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
#ifdef HAVE_X11_XLIB_H
if( config_GetInt( p_libvlc, "disable-screensaver" ) )
{
- libvlc_InternalAddIntf( p_libvlc, "screensaver,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "screensaver,none", false );
}
#endif
if( config_GetInt( p_libvlc, "file-logging" ) > 0 )
{
- libvlc_InternalAddIntf( p_libvlc, "logger,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "logger,none", false );
}
#ifdef HAVE_SYSLOG_H
if( config_GetInt( p_libvlc, "syslog" ) > 0 )
{
char *logmode = var_CreateGetString( p_libvlc, "logmode" );
var_SetString( p_libvlc, "logmode", "syslog" );
- libvlc_InternalAddIntf( p_libvlc, "logger,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "logger,none", false );
if( logmode )
{
@@ -864,12 +864,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if( config_GetInt( p_libvlc, "show-intf" ) > 0 )
{
- libvlc_InternalAddIntf( p_libvlc, "showintf,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "showintf,none", false );
}
if( config_GetInt( p_libvlc, "network-synchronisation") > 0 )
{
- libvlc_InternalAddIntf( p_libvlc, "netsync,none", false, 0, NULL );
+ libvlc_InternalAddIntf( p_libvlc, "netsync,none", false );
}
#ifdef WIN32
@@ -1104,10 +1104,8 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release )
/**
* Add an interface plugin and run it
*/
-int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
- char const *psz_module,
- bool b_play,
- int i_options, const char *const *ppsz_options )
+int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module,
+ bool b_play )
{
int i_err;
intf_thread_t *p_intf = NULL;
@@ -1133,8 +1131,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
}
/* Try to create the interface */
- p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf",
- i_options, ppsz_options );
+ p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf", 0, NULL );
if( p_intf == NULL )
{
msg_Err( p_libvlc, "interface \"%s\" initialization failed",
More information about the vlc-devel
mailing list