# include <locale.h>
#endif
+#ifdef HAVE_DBUS_3
+# 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
# include <hal/libhal.h>
#endif
#include "libvlc.h"
+#include "playlist/playlist_internal.h"
+
/*****************************************************************************
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
-
- /* Store our newly allocated structure in the global list */
- vlc_object_attach( p_libvlc, p_libvlc_global );
-
+ /* Fake attachment */
+ p_libvlc->b_attached = VLC_TRUE;
/* Store data for the non-reentrant API */
p_static_vlc = p_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:
*/
system_Configure( p_libvlc, &i_argc, ppsz_argv );
+/* 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 )
+ {
+ 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 );
+ 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 /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 )
+ {
+ 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." );
+ }
+ else
+ {
+ 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 */
+ system_End( p_libvlc );
+ exit( 0 );
+ }
+ } /* 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 );
+ }
+ } /* 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
+
/*
* Message queue options
*/
if( psz_modules && *psz_modules )
{
/* Add service discovery modules */
- playlist_AddSDModules( p_playlist, psz_modules );
+ playlist_ServicesDiscoveryAdd( p_playlist, psz_modules );
}
if( psz_modules ) free( psz_modules );
#ifdef HAVE_SYSLOG_H
if( config_GetInt( p_libvlc, "syslog" ) == 1 )
{
- char *psz_logmode = "logmode=syslog";
+ const char *psz_logmode = "logmode=syslog";
libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE,
1, &psz_logmode );
}
/* Destroy mutexes */
vlc_mutex_destroy( &p_libvlc->config_lock );
- vlc_object_detach( p_libvlc );
if( b_release ) vlc_object_release( p_libvlc );
vlc_object_destroy( p_libvlc );
int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
char const *psz_module,
vlc_bool_t b_block, vlc_bool_t b_play,
- int i_options, char **ppsz_options )
+ int i_options, const char *const *ppsz_options )
{
int i_err;
intf_thread_t *p_intf;
#if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
- char * psz_path;
+ const char * psz_path;
#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS )
char psz_tmp[1024];
#endif
/* TODO: write an internal function of this one, to avoid
* unnecessary lookups. */
/* FIXME: should we convert options to UTF-8 as well ?? */
- psz_target = FromLocale( ppsz_argv[ i_opt ] );
- VLC_AddTarget( p_vlc->i_object_id, psz_target,
+
+#ifdef WIN32
+ if( GetVersion() < 0x80000000 )
+ {
+ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
(char const **)( i_options ? &ppsz_argv[i_opt + 1] :
NULL ), i_options,
PLAYLIST_INSERT, 0 );
- LocaleFree( psz_target );
+ }
+ else
+#endif
+ {
+ psz_target = FromLocale( ppsz_argv[ i_opt ] );
+ VLC_AddTarget( p_vlc->i_object_id, psz_target,
+ (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
+ NULL ), i_options,
+ PLAYLIST_INSERT, 0 );
+ LocaleFree( psz_target );
+ }
}
return VLC_SUCCESS;
*/
#define LINE_START 8
#define PADDING_SPACES 25
+#ifdef WIN32
+# define OPTION_VALUE_SEP "="
+#else
+# define OPTION_VALUE_SEP " "
+#endif
vlc_list_t *p_list;
module_t *p_parser;
module_config_t *p_item;
p_item++ )
{
char *psz_text, *psz_spaces = psz_spaces_text;
- char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
- char *psz_suf = "", *psz_prefix = NULL;
+ const char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
+ const char *psz_suf = "", *psz_prefix = NULL;
signed int i;
/* Skip deprecated options */
case CONFIG_ITEM_MODULE_CAT:
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
- psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
+ psz_bra = OPTION_VALUE_SEP "<";
+ psz_type = _("string");
+ psz_ket = ">";
if( p_item->ppsz_list )
{
- psz_bra = " {";
+ psz_bra = OPTION_VALUE_SEP "{";
psz_type = psz_buffer;
- psz_type[0] = '\0';
+ psz_buffer[0] = '\0';
for( i = 0; p_item->ppsz_list[i]; i++ )
{
- if( i ) strcat( psz_type, "," );
- strcat( psz_type, p_item->ppsz_list[i] );
+ if( i ) strcat( psz_buffer, "," );
+ strcat( psz_buffer, p_item->ppsz_list[i] );
}
psz_ket = "}";
}
break;
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
- psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
+ psz_bra = OPTION_VALUE_SEP "<";
+ psz_type = _("integer");
+ psz_ket = ">";
if( p_item->i_list )
{
- psz_bra = " {";
+ psz_bra = OPTION_VALUE_SEP "{";
psz_type = psz_buffer;
- psz_type[0] = '\0';
+ psz_buffer[0] = '\0';
for( i = 0; p_item->ppsz_list_text[i]; i++ )
{
- if( i ) strcat( psz_type, ", " );
- sprintf( psz_type + strlen(psz_type), "%i (%s)",
+ if( i ) strcat( psz_buffer, ", " );
+ sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)",
p_item->pi_list[i],
p_item->ppsz_list_text[i] );
}
}
break;
case CONFIG_ITEM_FLOAT:
- psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
+ psz_bra = OPTION_VALUE_SEP "<";
+ psz_type = _("float");
+ psz_ket = ">";
break;
case CONFIG_ITEM_BOOL:
psz_bra = ""; psz_type = ""; psz_ket = "";
#ifdef HAVE_HAL_1
libhal_ctx_shutdown( ctx, NULL );
+ dbus_connection_unref( p_connection );
#else
hal_shutdown( ctx );
#endif
projects / vlc / blobdiff