#endif
#ifdef HAVE_DBUS_3
+/* used for one-instance mode */
# include <dbus/dbus.h>
-
-/* this is also defined in modules/control/dbus.h */
-/* names registered on the session bus */
-#define VLC_DBUS_SERVICE "org.videolan.vlc"
-#define VLC_DBUS_INTERFACE "org.videolan.vlc"
-#define VLC_DBUS_OBJECT_PATH "/org/videolan/vlc"
#endif
#ifdef HAVE_HAL
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
static libvlc_global_data_t libvlc_global;
-static libvlc_global_data_t * p_libvlc_global;
-static libvlc_int_t * p_static_vlc;
+static libvlc_global_data_t * p_libvlc_global = NULL;
+static libvlc_int_t * p_static_vlc = NULL;
static volatile unsigned int i_instances = 0;
/*****************************************************************************
int i_ret;
libvlc_int_t * p_libvlc = NULL;
vlc_value_t lockval;
- char *psz_env;
+ char *psz_env = NULL;
/* &libvlc_global never changes,
* so we can safely call this multiple times. */
/* Allocate a libvlc instance object */
p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC );
- if( p_libvlc == NULL ) { i_instances--; return NULL; }
+ if( p_libvlc == NULL )
+ {
+ i_instances--;
+ return NULL;
+ }
p_libvlc->thread_id = 0;
p_libvlc->p_playlist = NULL;
p_libvlc->psz_object_name = "libvlc";
return p_libvlc;
}
-/*
- * D-Bus callback needed in libvlc_InternalInit()
- */
-#ifdef HAVE_DBUS_3
-/* Handling of messages received on / object */
-static DBusHandlerResult handle_root
- ( DBusConnection *p_conn, DBusMessage *p_from, void *p_data )
-{
- DBusMessage* p_msg = dbus_message_new_method_return( p_from );
- if( !p_msg ) return DBUS_HANDLER_RESULT_NEED_MEMORY;
-
- DBusMessageIter args;
- dbus_message_iter_init_append( p_msg, &args );
-
- char *p_root = malloc( strlen( "<node name='/'></node>" ) );
- if (!p_root ) return DBUS_HANDLER_RESULT_NEED_MEMORY;
- sprintf( p_root, "<node name='/'></node>" );
-
- if( !dbus_message_iter_append_basic( &args, DBUS_TYPE_STRING, &p_root ) )
- return DBUS_HANDLER_RESULT_NEED_MEMORY;
-
- if( !dbus_connection_send( p_conn, p_msg, NULL ) )
- return DBUS_HANDLER_RESULT_NEED_MEMORY;
- dbus_connection_flush( p_conn );
- dbus_message_unref( p_msg );
- return DBUS_HANDLER_RESULT_HANDLED;
-}
-/* vtable passed to dbus_connection_register_object_path() */
-static DBusObjectPathVTable vlc_dbus_root_vtable = {
- NULL, handle_root, NULL, NULL, NULL, NULL
-};
-
-#endif
-
/**
* Initialize a libvlc instance
* This function initializes a previously allocated libvlc instance:
int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
{
char p_capabilities[200];
- char * p_tmp;
- char * psz_modules;
- char * psz_parser;
- char * psz_control;
+ char * p_tmp = NULL;
+ char * psz_modules = NULL;
+ char * psz_parser = NULL;
+ char * psz_control = NULL;
vlc_bool_t b_exit = VLC_FALSE;
int i_ret = VLC_EEXIT;
- module_t *p_help_module;
- playlist_t *p_playlist;
+ module_t *p_help_module = NULL;
+ playlist_t *p_playlist = NULL;
vlc_value_t val;
#if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
if( p_libvlc->psz_userdir == NULL )
p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir);
p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" );
- if( p_libvlc->psz_configfile != NULL && p_libvlc->psz_configfile[0] == '~'
- && p_libvlc->psz_configfile[1] == '/' )
+ if( (p_libvlc->psz_configfile != NULL) && (p_libvlc->psz_configfile[0] == '~')
+ && (p_libvlc->psz_configfile[1] == '/') )
{
char *psz = malloc( strlen(p_libvlc->psz_userdir)
+ strlen(p_libvlc->psz_configfile) );
- /* This is incomplete : we should also support the ~cmassiot/ syntax. */
- sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
- p_libvlc->psz_configfile + 2 );
- free( p_libvlc->psz_configfile );
- p_libvlc->psz_configfile = psz;
+ if( psz )
+ {
+ /* This is incomplete : we should also support the ~cmassiot/ syntax. */
+ sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
+ p_libvlc->psz_configfile + 2 );
+ free( p_libvlc->psz_configfile );
+ p_libvlc->psz_configfile = psz;
+ } /* else keep old config stuff */
}
/* Check for plugins cache options */
if( config_GetInt( p_libvlc, "daemon" ) )
{
#if HAVE_DAEMON
+ char *psz_pidfile = NULL;
+
if( daemon( 1, 0) != 0 )
{
msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
b_exit = VLC_TRUE;
}
-
p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
/* lets check if we need to write the pidfile */
- char * psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
-
+ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
if( psz_pidfile != NULL )
{
FILE *pidfile;
/* FIXME: could be replaced by using Unix sockets */
#ifdef HAVE_DBUS_3
- /* Initialise D-Bus interface, check for other instances */
- DBusConnection *p_conn;
- DBusError dbus_error;
- int i_dbus_service;
-
dbus_threads_init_default();
- dbus_error_init( &dbus_error );
- /* connect to the session bus */
- p_conn = dbus_bus_get( DBUS_BUS_SESSION, &dbus_error );
- if( !p_conn )
+ if( config_GetInt( p_libvlc, "one-instance" ) )
{
- msg_Err( p_libvlc, "Failed to connect to the D-Bus session daemon: %s",
- dbus_error.message );
- dbus_error_free( &dbus_error );
- }
- else
- {
- /* we request the service org.videolan.vlc */
- i_dbus_service = dbus_bus_request_name( p_conn, VLC_DBUS_SERVICE, 0,
- &dbus_error );
- if( dbus_error_is_set( &dbus_error ) )
- {
- msg_Err( p_libvlc, "Error requesting %s service: %s\n",
- VLC_DBUS_SERVICE, dbus_error.message );
+ /* Initialise D-Bus interface, check for other instances */
+ DBusConnection *p_conn = NULL;
+ DBusError dbus_error;
+
+ dbus_error_init( &dbus_error );
+
+ /* connect to the session bus */
+ p_conn = dbus_bus_get( DBUS_BUS_SESSION, &dbus_error );
+ if( !p_conn )
+ {
+ msg_Err( p_libvlc, "Failed to connect to D-Bus session daemon: %s",
+ dbus_error.message );
dbus_error_free( &dbus_error );
}
else
{
- if( i_dbus_service != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER )
- { /* the name is already registered by another instance of vlc */
- if( config_GetInt( p_libvlc, "one-instance" ) )
+ /* check if a Media Player is available
+ * if not: D-Bus control is not enabled on the other
+ * instance and we can't pass MRLs to it */
+ DBusMessage *p_test_msg = NULL;
+ DBusMessage *p_test_reply = NULL;
+ p_test_msg = dbus_message_new_method_call(
+ "org.freedesktop.MediaPlayer", "/",
+ "org.freedesktop.MediaPlayer", "Identity" );
+ /* block until a reply arrives */
+ p_test_reply = dbus_connection_send_with_reply_and_block(
+ p_conn, p_test_msg, -1, &dbus_error );
+ dbus_message_unref( p_test_msg );
+ if( p_test_reply == NULL )
+ {
+ dbus_error_free( &dbus_error );
+ msg_Dbg( p_libvlc, "No Media Player is running. "
+ "Continuing normally." );
+ }
+ else
+ {
+ int i_input;
+ DBusMessage* p_dbus_msg = NULL;
+ DBusMessageIter dbus_args;
+ DBusPendingCall* p_dbus_pending = NULL;
+ dbus_bool_t b_play;
+
+ dbus_message_unref( p_test_reply );
+ msg_Warn( p_libvlc, "Another Media Player is running. Exiting");
+
+ for( i_input = optind;i_input < i_argc;i_input++ )
{
- /* check if /org/videolan/vlc exists
- * if not: D-Bus control is not enabled on the other
- * instance and we can't pass MRLs to it */
- DBusMessage *p_test_msg, *p_test_reply;
- p_test_msg = dbus_message_new_method_call(
- VLC_DBUS_SERVICE, VLC_DBUS_OBJECT_PATH,
- VLC_DBUS_INTERFACE, "Nothing" );
- /* block unti a reply arrives */
- p_test_reply = dbus_connection_send_with_reply_and_block(
- p_conn, p_test_msg, -1, &dbus_error );
- dbus_message_unref( p_test_msg );
- if( p_test_reply == NULL )
+ msg_Dbg( p_libvlc, "Adds %s to the running Media Player",
+ ppsz_argv[i_input] );
+
+ p_dbus_msg = dbus_message_new_method_call(
+ "org.freedesktop.MediaPlayer", "/TrackList",
+ "org.freedesktop.MediaPlayer", "AddTrack" );
+
+ if ( NULL == p_dbus_msg )
{
- dbus_error_free( &dbus_error );
- msg_Err( p_libvlc, "one instance mode has been "
- "set but D-Bus control interface is not "
- "enabled. Enable it and restart vlc, or "
- "disable one instance mode." );
+ msg_Err( p_libvlc, "D-Bus problem" );
+ system_End( p_libvlc );
+ exit( VLC_ETIMEOUT );
}
- else
+
+ /* append MRLs */
+ dbus_message_iter_init_append( p_dbus_msg, &dbus_args );
+ if ( !dbus_message_iter_append_basic( &dbus_args,
+ DBUS_TYPE_STRING, &ppsz_argv[i_input] ) )
{
- dbus_message_unref( p_test_reply );
- msg_Warn( p_libvlc,
- "Another vlc instance exists: will now exit");
-
- int i_input;
- DBusMessage* p_dbus_msg;
- DBusMessageIter dbus_args;
- DBusPendingCall* p_dbus_pending;
- dbus_bool_t b_play;
-
- for( i_input = optind;i_input < i_argc;i_input++ )
- {
- msg_Dbg( p_libvlc, "Give %s to other vlc\n",
- ppsz_argv[i_input] );
-
- p_dbus_msg = dbus_message_new_method_call(
- VLC_DBUS_SERVICE, VLC_DBUS_OBJECT_PATH,
- VLC_DBUS_INTERFACE, "AddMRL" );
-
- if ( NULL == p_dbus_msg )
- {
- msg_Err( p_libvlc, "D-Bus problem" );
- system_End( p_libvlc );
- exit( 0 );
- }
-
- /* append MRLs */
- dbus_message_iter_init_append( p_dbus_msg,
- &dbus_args );
- if ( !dbus_message_iter_append_basic( &dbus_args,
- DBUS_TYPE_STRING,
- &ppsz_argv[i_input] ) )
- {
- msg_Err( p_libvlc, "Out of memory" );
- dbus_message_unref( p_dbus_msg );
- system_End( p_libvlc );
- exit( 0 );
- }
- b_play = TRUE;
- if( config_GetInt( p_libvlc, "playlist-enqueue" ) )
- b_play = FALSE;
- if ( !dbus_message_iter_append_basic( &dbus_args,
- DBUS_TYPE_BOOLEAN, &b_play ) )
- {
- msg_Err( p_libvlc, "Out of memory" );
- dbus_message_unref( p_dbus_msg );
- system_End( p_libvlc );
- exit( 0 );
- }
-
- /* send message and get a handle for a reply */
- if ( !dbus_connection_send_with_reply ( p_conn,
- p_dbus_msg, &p_dbus_pending, -1 ) )
- {
- msg_Err( p_libvlc, "D-Bus problem" );
- dbus_message_unref( p_dbus_msg );
- system_End( p_libvlc );
- exit( 0 );
- }
-
- if ( NULL == p_dbus_pending )
- {
- msg_Err( p_libvlc, "D-Bus problem" );
- dbus_message_unref( p_dbus_msg );
- system_End( p_libvlc );
- exit( 0 );
- }
- dbus_connection_flush( p_conn );
- dbus_message_unref( p_dbus_msg );
- /* block until we receive a reply */
- dbus_pending_call_block( p_dbus_pending );
- dbus_pending_call_unref( p_dbus_pending );
- } /* processes all command line MRLs */
-
- /* bye bye */
+ msg_Err( p_libvlc, "Out of memory" );
+ dbus_message_unref( p_dbus_msg );
system_End( p_libvlc );
- exit( 0 );
+ exit( VLC_ENOMEM );
}
- } /* we're not in one-instance mode */
- else
- {
- msg_Dbg( p_libvlc,
- "%s is already registered on the session bus\n",
- VLC_DBUS_SERVICE );
- }
- } /* the named is owned by something else */
- else
- {
- /* register "/" object */
- if( !dbus_connection_register_object_path( p_conn, "/",
- &vlc_dbus_root_vtable, NULL ) )
- {
- msg_Err( p_libvlc, "Out of memory" );
- }
- msg_Dbg( p_libvlc,
- "We are the primary owner of %s on the session bus",
- VLC_DBUS_SERVICE );
+ b_play = TRUE;
+ if( config_GetInt( p_libvlc, "playlist-enqueue" ) )
+ b_play = FALSE;
+ if ( !dbus_message_iter_append_basic( &dbus_args,
+ DBUS_TYPE_BOOLEAN, &b_play ) )
+ {
+ msg_Err( p_libvlc, "Out of memory" );
+ dbus_message_unref( p_dbus_msg );
+ system_End( p_libvlc );
+ exit( VLC_ENOMEM );
+ }
+
+ /* send message and get a handle for a reply */
+ if ( !dbus_connection_send_with_reply ( p_conn,
+ p_dbus_msg, &p_dbus_pending, -1 ) )
+ {
+ msg_Err( p_libvlc, "D-Bus problem" );
+ dbus_message_unref( p_dbus_msg );
+ system_End( p_libvlc );
+ exit( VLC_ETIMEOUT );
+ }
+
+ if ( NULL == p_dbus_pending )
+ {
+ msg_Err( p_libvlc, "D-Bus problem" );
+ dbus_message_unref( p_dbus_msg );
+ system_End( p_libvlc );
+ exit( VLC_ETIMEOUT );
+ }
+ dbus_connection_flush( p_conn );
+ dbus_message_unref( p_dbus_msg );
+ /* block until we receive a reply */
+ dbus_pending_call_block( p_dbus_pending );
+ dbus_pending_call_unref( p_dbus_pending );
+ } /* processes all command line MRLs */
+
+ /* bye bye */
+ system_End( p_libvlc );
+ exit( VLC_SUCCESS );
}
- } /* no error when requesting the name on the bus */
+ }
/* we unreference the connection when we've finished with it */
dbus_connection_unref( p_conn );
- } /* ( p_conn != NULL ) */
+ }
#endif
/*
*/
msg_Flush( p_libvlc );
- /* p_libvlc initialization. FIXME ? */
-
if( !config_GetInt( p_libvlc, "fpu" ) )
libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU;
if( config_GetInt( p_libvlc, "syslog" ) == 1 )
{
const char *psz_logmode = "logmode=syslog";
- libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE,
+ libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE,
1, &psz_logmode );
}
#endif
*/
int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
{
- intf_thread_t * p_intf;
- vout_thread_t * p_vout;
- aout_instance_t * p_aout;
- announce_handler_t * p_announce;
+ intf_thread_t * p_intf = NULL;
+ vout_thread_t * p_vout = NULL;
+ aout_instance_t * p_aout = NULL;
+ announce_handler_t * p_announce = NULL;
/* Ask the interfaces to stop and destroy them */
msg_Dbg( p_libvlc, "removing all interfaces" );
vlc_object_detach( p_intf );
vlc_object_release( p_intf );
intf_Destroy( p_intf );
+ p_intf = NULL;
}
/* Free playlist */
{
vlc_value_t lockval;
+ if( !p_libvlc )
+ return VLC_EGENERIC;
+
+#ifndef WIN32
+ char* psz_pidfile = NULL;
+
+ if( config_GetInt( p_libvlc, "daemon" ) )
+ {
+ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
+ if( psz_pidfile != NULL )
+ {
+ msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile );
+ if( unlink( psz_pidfile ) == -1 )
+ {
+ msg_Dbg( p_libvlc, "removing pid file %s: failed: %s",
+ psz_pidfile, strerror(errno) );
+ }
+ }
+ free ( psz_pidfile );
+ }
+#endif
+
if( p_libvlc->p_memcpy_module )
{
module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
if( b_release ) vlc_object_release( p_libvlc );
vlc_object_destroy( p_libvlc );
+ p_libvlc = NULL;
/* Stop thread system: last one out please shut the door!
* The number of initializations of the thread system is counted, we
int i_options, const char *const *ppsz_options )
{
int i_err;
- intf_thread_t *p_intf;
+ intf_thread_t *p_intf = NULL;
+
+ if( !p_libvlc )
+ return VLC_EGENERIC;
#ifndef WIN32
if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module )
/* Try to create the interface */
p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf",
i_options, ppsz_options );
-
if( p_intf == NULL )
{
msg_Err( p_libvlc, "interface \"%s\" initialization failed",
{
vlc_object_detach( p_intf );
intf_Destroy( p_intf );
+ p_intf = NULL;
return i_err;
}
return VLC_SUCCESS;
};
-
/*****************************************************************************
* SetLanguage: set the interface language.
*****************************************************************************
#if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
- const char * psz_path;
+ const char * psz_path = NULL;
#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS )
char psz_tmp[1024];
#endif
#else
# define OPTION_VALUE_SEP " "
#endif
- vlc_list_t *p_list;
+ vlc_list_t *p_list = NULL;
char psz_spaces_text[PADDING_SPACES+LINE_START+1];
char psz_spaces_longtext[LINE_START+3];
char psz_format[sizeof(FORMAT_STRING)];
{
vlc_bool_t b_help_module;
module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object;
- module_config_t *p_item,
- *p_end = p_parser->p_config + p_parser->confsize;
+ module_config_t *p_item = NULL;
+ module_config_t *p_end = p_parser->p_config + p_parser->confsize;
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
*****************************************************************************/
static void ListModules( libvlc_int_t *p_this )
{
- vlc_list_t *p_list;
- module_t *p_parser;
+ vlc_list_t *p_list = NULL;
+ module_t *p_parser = NULL;
char psz_spaces[22];
int i_index;
static void ShowConsole( vlc_bool_t b_dofile )
{
# ifndef UNDER_CE
- FILE *f_help;
+ FILE *f_help = NULL;
if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
freopen( "vlc-help.txt", "wt", stdout );
utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") );
}
-
else freopen( "CONOUT$", "w", stdout );
# endif
int i_width = 80;
#ifndef WIN32
- char buf[20], *psz_parser;
- FILE *file;
+ char buf[20];
+ char *psz_parser = NULL;
+ FILE *file = NULL;
int i_ret;
file = popen( "stty size 2>/dev/null", "r" );
static void InitDeviceValues( libvlc_int_t *p_vlc )
{
#ifdef HAVE_HAL
- LibHalContext * ctx;
+ LibHalContext * ctx = NULL;
int i, i_devices;
- char **devices;
- char *block_dev;
+ char **devices = NULL;
+ char *block_dev = NULL;
dbus_bool_t b_dvd;
- DBusConnection *p_connection;
+ DBusConnection *p_connection = NULL;
DBusError error;
#ifdef HAVE_HAL_1
- ctx = libhal_ctx_new();
+ ctx = libhal_ctx_new();
if( !ctx ) return;
dbus_error_init( &error );
p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error );
projects / vlc / blobdiff