Commit 4183cd72 authored by Felix Paul Kühne's avatar Felix Paul Kühne

growl_udp: removed module, since it is broken and will no longer be supported...

growl_udp: removed module, since it is broken and will no longer be supported by Growl's next release
parent ea32bd20
......@@ -612,7 +612,7 @@ AC_SEARCH_LIBS(connect, [socket], [
])
LIBS="$LIBS_save"
AS_IF([test -n "$SOCKET_LIBS"], [
VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}])
VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}])
])
AC_SUBST(SOCKET_LIBS)
......@@ -1656,7 +1656,6 @@ AC_ARG_ENABLE(growl,
[ --enable-growl growl notification plugin (default disabled)],,
[enable_growl=no])
AS_IF([test "${enable_growl}" != "no"], [
VLC_ADD_PLUGIN([growl_udp])
AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [
VLC_ADD_PLUGIN([growl])
VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation])
......
......@@ -5,7 +5,6 @@ LIBTOOL=@LIBTOOL@ --tag=CC
SOURCES_msn = msn.c
SOURCES_growl = growl.m
SOURCES_growl_udp = growl_udp.c
SOURCES_notify = notify.c
SOURCES_xosd = xosd.c
SOURCES_telepathy = telepathy.c
......
/*****************************************************************************
* growl_udp.c : growl UDP notification plugin
*****************************************************************************
* Copyright (C) 2006 - 2010 the VideoLAN team
* $Id$
*
* Authors: Jérôme Decoodt <djc -at- videolan -dot- org>
*
* 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_meta.h>
#include <vlc_network.h>
#include <vlc_md5.h>
/*****************************************************************************
* intf_sys_t: description
*****************************************************************************/
struct intf_sys_t
{
char *psz_password;
char *psz_server;
int i_port;
};
/*****************************************************************************
* 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 RegisterToGrowl( vlc_object_t *p_this );
static int NotifyToGrowl( vlc_object_t *p_this, const char *psz_desc );
static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset, size_t is_ze );
#define GROWL_MAX_LENGTH 256
/*****************************************************************************
* Module descriptor
****************************************************************************/
#define SERVER_DEFAULT "127.0.0.1"
#define SERVER_TEXT N_("Server")
#define SERVER_LONGTEXT N_("This is the host to which Growl notifications " \
"will be sent. By default, notifications are sent locally." )
#define PASS_DEFAULT ""
#define PASS_TEXT N_("Password")
#define PASS_LONGTEXT N_("Growl password on the Growl server.")
#define PORT_TEXT N_("UDP port")
#define PORT_LONGTEXT N_("Growl UDP port on the Growl server.")
vlc_module_begin ()
set_category( CAT_INTERFACE )
set_subcategory( SUBCAT_INTERFACE_CONTROL )
set_shortname( "Growl-UDP" )
set_description( N_("Growl UDP Notification Plugin") )
add_string( "growl-server", SERVER_DEFAULT,
SERVER_TEXT, SERVER_LONGTEXT, false )
add_password( "growl-password", PASS_DEFAULT,
PASS_TEXT, PASS_LONGTEXT, false )
add_integer( "growl-port", 9887,
PORT_TEXT, PORT_LONGTEXT, true )
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;
intf_sys_t *p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
p_sys->psz_password = var_InheritString( p_this, "growl-password" );
p_sys->psz_server = var_InheritString( p_this, "growl-server" );
p_sys->i_port = var_InheritInteger( p_this, "growl-port" );
if( !p_sys->psz_password || !p_sys->psz_server )
{
free( p_sys->psz_password );
free( p_sys->psz_server );
free( p_sys );
return VLC_EGENERIC;
}
var_AddCallback( pl_Get( p_this ), "item-current", ItemChange, p_this );
RegisterToGrowl( p_this );
return VLC_SUCCESS;
}
/*****************************************************************************
* Close: destroy interface stuff
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
intf_sys_t *p_sys = ((intf_thread_t*)p_this)->p_sys;
var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this );
free( p_sys->psz_password );
free( p_sys->psz_server );
free( 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(psz_var); VLC_UNUSED(oldval); VLC_UNUSED(newval);
VLC_UNUSED(param);
char psz_tmp[GROWL_MAX_LENGTH];
char *psz_title;
char *psz_artist;
char *psz_album;
input_thread_t *p_input = playlist_CurrentInput( (playlist_t*)p_this );
if( !p_input ) return VLC_SUCCESS;
char *psz_name = input_item_GetName( input_GetItem( p_input ) );
if( p_input->b_dead || !psz_name )
{
/* Not playing anything ... */
free( psz_name );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
free( psz_name );
/* Playing something ... */
input_item_t *p_item = input_GetItem( p_input );
psz_title = input_item_GetTitleFbName( p_item );
if( EMPTY_STR( psz_title ) )
{
free( psz_title );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
psz_artist = input_item_GetArtist( p_item );
if( EMPTY_STR( psz_artist ) ) FREENULL( psz_artist );
psz_album = input_item_GetAlbum( p_item ) ;
if( EMPTY_STR( psz_album ) ) FREENULL( psz_album );
if( psz_artist && psz_album )
snprintf( psz_tmp, GROWL_MAX_LENGTH, "%s\n%s [%s]",
psz_title, psz_artist, psz_album );
else if( psz_artist )
snprintf( psz_tmp, GROWL_MAX_LENGTH, "%s\n%s", psz_title, psz_artist );
else
snprintf( psz_tmp, GROWL_MAX_LENGTH, "%s", psz_title );
free( psz_title );
free( psz_artist );
free( psz_album );
NotifyToGrowl( p_this, psz_tmp );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
/*****************************************************************************
* Growl specific functions
*****************************************************************************/
#define GROWL_PROTOCOL_VERSION (1)
#define GROWL_TYPE_REGISTRATION (0)
#define GROWL_TYPE_NOTIFICATION (1)
#define APPLICATION_NAME "VLC media player"
#define insertstrlen( psz ) \
{ \
uint16_t i_size = strlen( psz ); \
psz_encoded[i++] = (i_size>>8)&0xFF; \
psz_encoded[i++] = i_size&0xFF; \
}
/*****************************************************************************
* RegisterToGrowl
*****************************************************************************/
static int RegisterToGrowl( vlc_object_t *p_this )
{
uint8_t *psz_encoded = calloc( 100, 1 );
uint8_t i_defaults = 0;
static const char *psz_notifications[] = {"Now Playing", NULL};
bool pb_defaults[] = {true, false};
int i = 0, j;
if( psz_encoded == NULL )
return false;
psz_encoded[i++] = GROWL_PROTOCOL_VERSION;
psz_encoded[i++] = GROWL_TYPE_REGISTRATION;
insertstrlen(APPLICATION_NAME);
i+=2;
strcpy( (char*)(psz_encoded+i), APPLICATION_NAME );
i += strlen(APPLICATION_NAME);
for( j = 0 ; psz_notifications[j] != NULL ; j++)
{
insertstrlen(psz_notifications[j]);
strcpy( (char*)(psz_encoded+i), psz_notifications[j] );
i += strlen(psz_notifications[j]);
}
psz_encoded[4] = j;
for( j = 0 ; psz_notifications[j] != NULL ; j++)
{
if(pb_defaults[j])
{
psz_encoded[i++] = (uint8_t)j;
i_defaults++;
}
}
psz_encoded[5] = i_defaults;
CheckAndSend(p_this, psz_encoded, i, 100);
free( psz_encoded );
return VLC_SUCCESS;
}
static int NotifyToGrowl( vlc_object_t *p_this, const char *psz_desc )
{
const char *psz_type = "Now Playing", *psz_title = "Now Playing";
uint8_t *psz_encoded = calloc(GROWL_MAX_LENGTH + 42, 1);
uint16_t flags;
int i = 0;
if( psz_encoded == NULL )
return false;
// Check the size of the data
size_t i_type = strlen( psz_type );
size_t i_title = strlen( psz_title );
size_t i_app = strlen( APPLICATION_NAME );
size_t i_desc = strlen( psz_desc );
if( 12 + i_type + i_title + i_desc + i_app >= GROWL_MAX_LENGTH + 42 )
{
free( psz_encoded );
return false;
}
psz_encoded[i++] = GROWL_PROTOCOL_VERSION;
psz_encoded[i++] = GROWL_TYPE_NOTIFICATION;
flags = 0;
psz_encoded[i++] = (flags>>8)&0xFF;
psz_encoded[i++] = flags&0xFF;
insertstrlen(psz_type);
insertstrlen(psz_title);
insertstrlen(psz_desc);
insertstrlen(APPLICATION_NAME);
strcpy( (char*)(psz_encoded+i), psz_type );
i += i_type;
strcpy( (char*)(psz_encoded+i), psz_title );
i += i_title;
strcpy( (char*)(psz_encoded+i), psz_desc );
i += i_desc;
strcpy( (char*)(psz_encoded+i), APPLICATION_NAME );
i += i_app;
CheckAndSend(p_this, psz_encoded, i, GROWL_MAX_LENGTH + 42);
free( psz_encoded );
return VLC_SUCCESS;
}
static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset, size_t i_size )
{
intf_sys_t *p_sys = ((intf_thread_t*)p_this)->p_sys;
int i_handle;
struct md5_s md5;
int i_password_length = strlen( p_sys->psz_password );
// Check that the buffer is larger enought for the string and the md5
if( i_offset + i_password_length + 4*4 >= i_size )
return VLC_EGENERIC;
strcpy( (char*)(p_data+i_offset), p_sys->psz_password );
InitMD5( &md5 );
AddMD5( &md5, p_data, i_offset + i_password_length );
EndMD5( &md5 );
for( int i = 0 ; i < 4 ; i++ )
{
p_data[i_offset++] = md5.p_digest[i] &0xFF;
p_data[i_offset++] = (md5.p_digest[i]>> 8)&0xFF;
p_data[i_offset++] = (md5.p_digest[i]>>16)&0xFF;
p_data[i_offset++] = (md5.p_digest[i]>>24)&0xFF;
}
i_handle = net_ConnectUDP( p_this, p_sys->psz_server, p_sys->i_port, -1 );
if( i_handle == -1 )
{
msg_Err( p_this, "failed to open a connection (udp)" );
return VLC_EGENERIC;
}
shutdown( i_handle, SHUT_RD );
if( send( i_handle, p_data, i_offset, 0 ) == -1 )
{
msg_Warn( p_this, "send error: %m" );
}
net_Close( i_handle );
return VLC_SUCCESS;
}
#undef GROWL_PROTOCOL_VERSION
#undef GROWL_TYPE_REGISTRATION
#undef GROWL_TYPE_NOTIFICATION
#undef APPLICATION_NAME
#undef insertstrlen
......@@ -952,7 +952,6 @@ modules/mux/mpjpeg.c
modules/mux/ogg.c
modules/mux/wav.c
modules/notify/growl.m
modules/notify/growl_udp.c
modules/notify/msn.c
modules/notify/notify.c
modules/notify/telepathy.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