static void InitDeviceValues( libvlc_int_t * );
+libvlc_global_data_t *vlc_global( void )
+{
+ return &libvlc_global;
+}
+
/*****************************************************************************
* vlc_current_object: return the current object.
*****************************************************************************
i_instances--;
return NULL;
}
- p_libvlc->thread_id = 0;
p_libvlc->p_playlist = NULL;
p_libvlc->psz_object_name = "libvlc";
vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
- /* Fake attachment */
- p_libvlc->b_attached = VLC_TRUE;
/* Store data for the non-reentrant API */
p_static_vlc = p_libvlc;
}
else
{
- /* check if a Media Player is available
+ /* check if VLC is available on the bus
* 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.mpris.vlc", "/",
"org.freedesktop.MediaPlayer", "Identity" );
/* block until a reply arrives */
p_test_reply = dbus_connection_send_with_reply_and_block(
ppsz_argv[i_input] );
p_dbus_msg = dbus_message_new_method_call(
- "org.freedesktop.MediaPlayer", "/TrackList",
+ "org.mpris.vlc", "/TrackList",
"org.freedesktop.MediaPlayer", "AddTrack" );
if ( NULL == p_dbus_msg )
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
{
- const char **pp_shortcut = p_parser->pp_shortcuts;
+ const char *const *pp_shortcut = p_parser->pp_shortcuts;
while( *pp_shortcut )
{
if( !strcmp( psz_module_name, *pp_shortcut ) )
if( b_verbose )
{
- const char **pp_shortcut = p_parser->pp_shortcuts;
- while( pp_shortcut && *pp_shortcut )
+ const char *const *pp_shortcut = p_parser->pp_shortcuts;
+ while( *pp_shortcut )
{
if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )
{