Skip to content

V
vlc
Commit 379980a6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Telepathy notify: remove plugin 

As discussed in May 2012, this plugin has been deadlocking since
VLC 1.0.0. So I gather it is unused and unmaintained. Also, it does not
seem to be using libdbus safely.
parent cf431c51
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 324 deletions
NEWS
View file @ 379980a6
...@@ -84,6 +84,7 @@ Removed modules: ...@@ -84,6 +84,7 @@ Removed modules:
* RTMP access_output: use libavformat avio instead * RTMP access_output: use libavformat avio instead
* Hildon GUI * Hildon GUI
* MSN messenger "now playing" (broken and unmaintained since VLC 1.0.0) * MSN messenger "now playing" (broken and unmaintained since VLC 1.0.0)
* Telepathy framework "now playing" (broken and unmaintained since VLC 1.0.0)
Changes between 2.0.2 and 2.0.3: Changes between 2.0.2 and 2.0.3:
......
configure.ac
View file @ 379980a6
...@@ -799,14 +799,6 @@ then ...@@ -799,14 +799,6 @@ then
VLC_ADD_LIBS([dbus],[$DBUS_LIBS]) VLC_ADD_LIBS([dbus],[$DBUS_LIBS])
VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS])
fi fi
dnl Check for Telepathy
AC_ARG_ENABLE(telepathy,
AS_HELP_STRING([--enable-telepathy],[Telepathy Presence plugin through DBus(default enabled)]))
if test "${enable_telepathy}" != "no"; then
VLC_ADD_PLUGIN([telepathy])
VLC_ADD_LIBS([telepathy],[$DBUS_LIBS])
VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS])
fi
dnl Power Management Inhibiter dnl Power Management Inhibiter
VLC_ADD_PLUGIN([inhibit]) VLC_ADD_PLUGIN([inhibit])
VLC_ADD_LIBS([inhibit],[$DBUS_LIBS]) VLC_ADD_LIBS([inhibit],[$DBUS_LIBS])
......
modules/LIST
View file @ 379980a6
...@@ -335,7 +335,6 @@ $Id$ ...@@ -335,7 +335,6 @@ $Id$
* t140: T.140 text encoder * t140: T.140 text encoder
* taglib: Taglib tags parser and writer * taglib: Taglib tags parser and writer
* tdummy: dummy text renderer * tdummy: dummy text renderer
* telepathy: Telepathy Presence information using MissionControl notification
* telx: teletext subtitles decoder * telx: teletext subtitles decoder
* theora: a theora video decoder/packetizer/encoder using the libtheora library * theora: a theora video decoder/packetizer/encoder using the libtheora library
* transform: filter for horizontal and vertical image flips and 90° rotations * transform: filter for horizontal and vertical image flips and 90° rotations
......
modules/notify/Modules.am
View file @ 379980a6
...@@ -5,4 +5,3 @@ LIBTOOL=@LIBTOOL@ --tag=CC ...@@ -5,4 +5,3 @@ LIBTOOL=@LIBTOOL@ --tag=CC
SOURCES_growl = growl.m SOURCES_growl = growl.m
SOURCES_notify = notify.c SOURCES_notify = notify.c
SOURCES_telepathy = telepathy.c
modules/notify/telepathy.c deleted 100644 → 0
View file @ cf431c51
/*****************************************************************************
* telepathy.c : changes Telepathy Presence information using MissionControl
*****************************************************************************
* Copyright © 2007-2009 the VideoLAN team
* $Id$
*
* Author: Rafaël Carré <funman@videoanorg>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_strings.h> /* str_format_meta */
#include <dbus/dbus.h>
#define FORMAT_DEFAULT "$a - $t"
/*****************************************************************************
* intf_sys_t: description and status of log interface
*****************************************************************************/
struct intf_sys_t
{
char *psz_format;
DBusConnection *p_conn;
int i_id;
int i_item_changes;
};
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
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 * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
set_category( CAT_INTERFACE )
set_subcategory( SUBCAT_INTERFACE_CONTROL )
set_shortname( "Telepathy" )
set_description( N_("Telepathy \"Now Playing\" (MissionControl)") )
add_obsolete_string( "telepathy-format")
set_capability( "interface", 0 )
set_callbacks( Open, Close )
vlc_module_end ()
/*****************************************************************************
* Open: initialize and create stuff
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
playlist_t *p_playlist;
DBusError error;
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys )
return VLC_ENOMEM;
dbus_error_init( &error );
/* connect privately to the session bus
* the connection will not be shared with other vlc modules which use dbus,
* thus avoiding a whole class of concurrency issues */
p_intf->p_sys->p_conn = dbus_bus_get_private( 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 );
dbus_error_free( &error );
free( p_intf->p_sys );
return VLC_EGENERIC;
}
p_intf->p_sys->psz_format = var_InheritString( p_intf, "input-title-format" );
if( !p_intf->p_sys->psz_format )
{
p_intf->p_sys->psz_format = strdup( FORMAT_DEFAULT );
}
msg_Dbg( p_intf, "using format: %s", p_intf->p_sys->psz_format );
p_intf->p_sys->i_id = -1;
p_playlist = pl_Get( p_intf );
var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
return VLC_SUCCESS;
}
/*****************************************************************************
* Close: destroy interface stuff
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)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, "" );
/* The dbus connection is private,
* so we are responsible for closing it */
dbus_connection_close( p_intf->p_sys->p_conn );
dbus_connection_unref( p_intf->p_sys->p_conn );
/* Destroy structure */
free( p_intf->p_sys->psz_format );
free( p_intf->p_sys );
}
/*****************************************************************************
* ItemChange: Playlist item change callback
*****************************************************************************/
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;
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( b_is_item_current )
{ /* stores the current input item id */
p_intf->p_sys->i_id = p_item->i_id;
p_intf->p_sys->i_item_changes = 0;
}
else
{
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.
* 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_input = playlist_CurrentInput( p_playlist );
if( !p_input ) return VLC_SUCCESS;
if( p_input->b_dead || !input_GetItem(p_input)->psz_name )
{
vlc_object_release( p_input );
/* Not playing anything ... */
switch( SendToTelepathy( p_intf, "" ) )
{
case VLC_ENOMEM:
return VLC_ENOMEM;
default:
return VLC_SUCCESS;
}
}
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( (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 );
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
*****************************************************************************/
static int SendToTelepathy( intf_thread_t *p_intf, const char *psz_msg )
{
DBusConnection *p_conn;
DBusMessage *p_msg;
DBusMessage *p_reply;
DBusMessageIter args;
DBusError error;
dbus_error_init( &error );
dbus_uint32_t i_status;
p_conn = p_intf->p_sys->p_conn;
/* first we need to get the actual status */
p_msg = dbus_message_new_method_call(
"org.freedesktop.Telepathy.MissionControl",
"/org/freedesktop/Telepathy/MissionControl",
"org.freedesktop.Telepathy.MissionControl",
"GetPresence" );
if( !p_msg )
return VLC_ENOMEM;
p_reply = dbus_connection_send_with_reply_and_block( p_conn, p_msg,
50, &error ); /* blocks 50ms maximum */
if( dbus_error_is_set( &error ) )
dbus_error_free( &error );
dbus_message_unref( p_msg );
if( p_reply == NULL )
{ /* MC is not active, or too slow. Better luck next time? */
return VLC_SUCCESS;
}
/* extract the status from the reply */
if( dbus_message_get_args( p_reply, &error,
DBUS_TYPE_UINT32, &i_status,
DBUS_TYPE_INVALID ) == FALSE )
{
return VLC_ENOMEM;
}
p_msg = dbus_message_new_method_call(
"org.freedesktop.Telepathy.MissionControl",
"/org/freedesktop/Telepathy/MissionControl",
"org.freedesktop.Telepathy.MissionControl",
"SetPresence" );
if( !p_msg )
return VLC_ENOMEM;
dbus_message_iter_init_append( p_msg, &args );
/* first argument is the status */
if( !dbus_message_iter_append_basic( &args, DBUS_TYPE_UINT32, &i_status ) )
{
dbus_message_unref( p_msg );
return VLC_ENOMEM;
}
/* second argument is the message */
if( !dbus_message_iter_append_basic( &args, DBUS_TYPE_STRING, &psz_msg ) )
{
dbus_message_unref( p_msg );
return VLC_ENOMEM;
}
if( !dbus_connection_send( p_conn, p_msg, NULL ) )
return VLC_ENOMEM;
dbus_connection_flush( p_conn );
dbus_message_unref( p_msg );
return VLC_SUCCESS;
}
po/POTFILES.in
View file @ 379980a6
...@@ -951,7 +951,6 @@ modules/mux/ogg.c ...@@ -951,7 +951,6 @@ modules/mux/ogg.c
modules/mux/wav.c modules/mux/wav.c
modules/notify/growl.m modules/notify/growl.m
modules/notify/notify.c modules/notify/notify.c
modules/notify/telepathy.c
modules/packetizer/copy.c modules/packetizer/copy.c
modules/packetizer/dirac.c modules/packetizer/dirac.c
modules/packetizer/flac.c modules/packetizer/flac.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment