/*****************************************************************************
* telepathy.c : changes Telepathy Presence information using MissionControl
*****************************************************************************
- * Copyright © 2007 the VideoLAN team
+ * Copyright © 2007-2009 the VideoLAN team
* $Id$
*
* Author: Rafaël Carré <funman@videoanorg>
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
-#include <vlc_meta.h>
#include <vlc_playlist.h>
#include <vlc_strings.h>
+
#include <dbus/dbus.h>
/*****************************************************************************
"$I Video Title, $L Time Remaining, $N Name, $O Audio language, $P Position, " \
"$R Rate, $S Sample rate, $T Time elapsed, $U Publisher, $V Volume")
-vlc_module_begin();
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_shortname( "Telepathy" );
- set_description( _("Telepathy \"Now Playing\" using MissionControl") );
+vlc_module_begin ()
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_CONTROL )
+ set_shortname( "Telepathy" )
+ set_description( N_("Telepathy \"Now Playing\" (MissionControl)") )
add_string( "telepathy-format", FORMAT_DEFAULT, NULL,
- FORMAT_TEXT, FORMAT_LONGTEXT, VLC_FALSE );
+ FORMAT_TEXT, FORMAT_LONGTEXT, false )
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+ set_capability( "interface", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Open: initialize and create stuff
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
playlist_t *p_playlist;
- DBusConnection *p_conn;
DBusError error;
- MALLOC_ERR( p_intf->p_sys, intf_sys_t );
+ p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
+ if( !p_intf->p_sys )
+ return VLC_ENOMEM;
/* connect to the session bus */
dbus_error_init( &error );
- p_conn = dbus_bus_get( DBUS_BUS_SESSION, &error );
- if( !p_conn )
+ p_intf->p_sys->p_conn = dbus_bus_get( DBUS_BUS_SESSION, &error );
+ if( !p_intf->p_sys->p_conn )
{
msg_Err( p_this, "Failed to connect to the DBus session daemon: %s",
error.message );
free( p_intf->p_sys );
return VLC_EGENERIC;
}
- p_intf->p_sys->p_conn = p_conn;
- p_intf->p_sys->psz_format = config_GetPsz( p_intf, "telepathy-format" );
+ p_intf->p_sys->psz_format = var_InheritString( p_intf, "telepathy-format" );
if( !p_intf->p_sys->psz_format )
{
msg_Dbg( p_intf, "no format provided" );
p_intf->p_sys->i_id = -1;
- p_playlist = pl_Yield( p_intf );
+ p_playlist = pl_Get( p_intf );
var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
- var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- pl_Release( p_intf );
+ var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- p_this->b_dead = VLC_TRUE;
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- playlist_t *p_playlist = pl_Yield( p_this );
+ playlist_t *p_playlist = pl_Get( p_this );
+ input_thread_t *p_input = NULL;
+
+ var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
+ var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
+ if( (p_input = playlist_CurrentInput( p_playlist )) )
+ {
+ var_DelCallback( p_input, "state", StateChange, p_intf );
+ vlc_object_release( p_input );
+ }
/* Clears the Presence message ... else it looks like we're still playing
* something although VLC (or the Telepathy plugin) is closed */
/* Do not check for VLC_ENOMEM as we're closing */
SendToTelepathy( p_intf, "" );
- PL_LOCK;
- var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- if( p_playlist->p_input )
- var_DelCallback( p_playlist->p_input, "state", StateChange, p_intf );
- PL_UNLOCK;
- pl_Release( p_this );
-
/* we won't use the DBus connection anymore */
dbus_connection_unref( p_intf->p_sys->p_conn );
{
VLC_UNUSED(oldval);
intf_thread_t *p_intf = (intf_thread_t *)param;
+ playlist_t* p_playlist = (playlist_t*) p_this;
char *psz_buf = NULL;
input_thread_t *p_input;
-
- if( p_intf->b_dead )
- return VLC_EGENERIC;
+ input_item_t *p_item = newval.p_address;
+ bool b_is_item_current = !strcmp( "item-current", psz_var );
/* Don't update Telepathy presence each time an item has been preparsed */
- if( !strncmp( "playlist-current", psz_var, 16 ) )
+ if( b_is_item_current )
{ /* stores the current input item id */
- p_intf->p_sys->i_id = newval.i_int;
+ p_intf->p_sys->i_id = p_item->i_id;
p_intf->p_sys->i_item_changes = 0;
}
else
{
- if( newval.i_int != p_intf->p_sys->i_id ) /* "item-change" */
+
+ if( p_item->i_id != p_intf->p_sys->i_id ) /* "item-change" */
return VLC_SUCCESS;
/* Some variable bitrate inputs call "item-change callbacks each time
* their length is updated, that is several times per second.
p_intf->p_sys->i_item_changes++;
}
-
- playlist_t *p_playlist = pl_Yield( p_this );
-
- p_input = p_playlist->p_input;
- pl_Release( p_this );
+ p_input = playlist_CurrentInput( p_playlist );
if( !p_input ) return VLC_SUCCESS;
- vlc_object_yield( p_input );
if( p_input->b_dead || !input_GetItem(p_input)->psz_name )
{
}
}
- if( !strncmp( "playlist-current", psz_var, 16 ) )
+ if( b_is_item_current )
var_AddCallback( p_input, "state", StateChange, p_intf );
/* We format the string to be displayed */
- psz_buf = str_format_meta( p_this, p_intf->p_sys->psz_format );
+ psz_buf = str_format_meta( (vlc_object_t*) p_intf,
+ p_intf->p_sys->psz_format );
/* We don't need the input anymore */
vlc_object_release( p_input );
{
VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval);
intf_thread_t *p_intf = (intf_thread_t *)param;
- if( p_intf->b_dead )
- return VLC_EGENERIC;
if( newval.i_int >= END_S )
return SendToTelepathy( p_intf, "" );
return VLC_SUCCESS;
projects / vlc / blobdiff