* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_meta.h>
#include <vlc_playlist.h>
char *psz_format;
DBusConnection *p_conn;
int i_id;
- int i_item-changes;
+ int i_item_changes;
};
/*****************************************************************************
static int ItemChange( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
+static int StateChange( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
static int SendToTelepathy( intf_thread_t *, const char * );
/*****************************************************************************
"$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
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 )
+ {
+ msg_Err( p_this, "Failed to connect to the DBus session daemon: %s",
+ error.message );
+ dbus_error_free( &error );
+ 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" );
if( !p_intf->p_sys->psz_format )
p_intf->p_sys->i_id = -1;
- p_playlist = pl_Yield( p_intf );
+ p_playlist = pl_Hold( p_intf );
var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
pl_Release( p_intf );
- dbus_error_init( &error );
-
- /* connect to the session bus */
- p_conn = dbus_bus_get( DBUS_BUS_SESSION, &error );
- if( !p_conn )
- {
- msg_Err( p_this, "Failed to connect to the DBus session daemon: %s",
- error.message );
- dbus_error_free( &error );
- free( p_intf->p_sys );
- return VLC_EGENERIC;
- }
- p_intf->p_sys->p_conn = p_conn;
return VLC_SUCCESS;
}
static void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- playlist_t *p_playlist = pl_Yield( p_this );
+ playlist_t *p_playlist = pl_Hold( p_this );
+ input_thread_t *p_input = NULL;
+
+ var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
+ var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ if( (p_input = playlist_CurrentInput( p_playlist )) )
+ {
+ var_DelCallback( p_input, "state", StateChange, p_intf );
+ vlc_object_release( p_input );
+ }
+ pl_Release( p_this );
/* 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, "" );
- var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- pl_Release( p_this );
-
/* we won't use the DBus connection anymore */
dbus_connection_unref( p_intf->p_sys->p_conn );
static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
+ 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( !strncmp( "playlist-current", psz_var, 16 ) )
{ /* stores the current input item id */
p_intf->p_sys->i_id = newval.i_int;
- p_intf->p_sys->i_item-changes = 0;
+ p_intf->p_sys->i_item_changes = 0;
}
else
{
if( newval.i_int != 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. */
- if( p_intf->p_sys->i_item-changes > 5 )
+ /* Some variable bitrate inputs call "item-change callbacks each time
+ * their length is updated, that is several times per second.
+ * We'll limit the number of changes to 10 per input. */
+ if( p_intf->p_sys->i_item_changes > 10 )
return VLC_SUCCESS;
- p_intf->p_sys->i_item-changes++;
+ 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 )
{
switch( SendToTelepathy( p_intf, "" ) )
{
case VLC_ENOMEM:
- Close( p_this );
return VLC_ENOMEM;
default:
return VLC_SUCCESS;
}
}
+ if( !strncmp( "playlist-current", psz_var, 16 ) )
+ 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 );
if( SendToTelepathy( p_intf, psz_buf ) == VLC_ENOMEM )
{
free( psz_buf );
- Close( p_this );
return VLC_ENOMEM;
}
free( psz_buf );
return VLC_SUCCESS;
}
+/*****************************************************************************
+ * StateChange: State change callback
+ *****************************************************************************/
+static int StateChange( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *param )
+{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval);
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+ if( newval.i_int >= END_S )
+ return SendToTelepathy( p_intf, "" );
+ return VLC_SUCCESS;
+}
+
/*****************************************************************************
* SendToTelepathy
*****************************************************************************/
projects / vlc / blobdiff