Commit a558333f authored by Jérome Decoodt's avatar Jérome Decoodt

configure.ac: try to fix beos build

growl.c: add --growl-ttl option
parent 9aaa91d6
...@@ -240,9 +240,9 @@ case "${target_os}" in ...@@ -240,9 +240,9 @@ case "${target_os}" in
dnl Check for BONE dnl Check for BONE
if test -f /boot/beos/system/lib/libbind.so; then if test -f /boot/beos/system/lib/libbind.so; then
VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lbind -lsocket]) VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket])
else else
VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lnet]) VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lnet])
fi fi
dnl Ugly check for Zeta dnl Ugly check for Zeta
......
...@@ -56,14 +56,16 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset ); ...@@ -56,14 +56,16 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset );
* have MSN 7 or newer) to "advertise" what you are playing in VLC. * have MSN 7 or newer) to "advertise" what you are playing in VLC.
* You need to enable the "What I'm Listening To" option in MSN. * You need to enable the "What I'm Listening To" option in MSN.
*****************************************************************************/ *****************************************************************************/
#define PORT_TEXT N_("Growl UDP port")
#define PORT_LONGTEXT N_("Growl UPD port on the server.")
#define SERVER_DEFAULT "127.0.0.1" #define SERVER_DEFAULT "127.0.0.1"
#define SERVER_TEXT N_("Growl server") #define SERVER_TEXT N_("Growl server")
#define SERVER_LONGTEXT N_("Growl server receiving notifications.") #define SERVER_LONGTEXT N_("Growl server receiving notifications.")
#define PASS_DEFAULT "" #define PASS_DEFAULT ""
#define PASS_TEXT N_("Growl password") #define PASS_TEXT N_("Growl password")
#define PASS_LONGTEXT N_("Growl password on the server.") #define PASS_LONGTEXT N_("Growl password on the server.")
#define PORT_TEXT N_("Growl UDP port")
#define PORT_LONGTEXT N_("Growl UPD port on the server.")
#define TTL_TEXT N_("Growl TTL")
#define TTL_LONGTEXT N_("Growl TTL.")
vlc_module_begin(); vlc_module_begin();
set_category( CAT_INTERFACE ); set_category( CAT_INTERFACE );
...@@ -71,12 +73,14 @@ vlc_module_begin(); ...@@ -71,12 +73,14 @@ vlc_module_begin();
set_shortname( N_( "growl" ) ); set_shortname( N_( "growl" ) );
set_description( _("Growl Notification Plugin") ); set_description( _("Growl Notification Plugin") );
add_integer( "growl-port", 9887, NULL,
PORT_TEXT, PORT_LONGTEXT, VLC_TRUE );
add_string( "growl-server", SERVER_DEFAULT, NULL, add_string( "growl-server", SERVER_DEFAULT, NULL,
SERVER_TEXT, SERVER_LONGTEXT, VLC_FALSE ); SERVER_TEXT, SERVER_LONGTEXT, VLC_FALSE );
add_string( "growl-password", PASS_DEFAULT, NULL, add_string( "growl-password", PASS_DEFAULT, NULL,
PASS_TEXT, PASS_LONGTEXT, VLC_FALSE ); PASS_TEXT, PASS_LONGTEXT, VLC_FALSE );
add_integer( "growl-port", 9887, NULL,
PORT_TEXT, PORT_LONGTEXT, VLC_TRUE );
add_integer( "growl-ttl", 12, NULL,
TTL_TEXT, TTL_LONGTEXT, VLC_TRUE );
set_capability( "interface", 0 ); set_capability( "interface", 0 );
set_callbacks( Open, Close ); set_callbacks( Open, Close );
...@@ -260,6 +264,7 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset ) ...@@ -260,6 +264,7 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset )
char *psz_password = config_GetPsz( p_intf, "growl-password" ); char *psz_password = config_GetPsz( p_intf, "growl-password" );
char *psz_server = config_GetPsz( p_intf, "growl-server" ); char *psz_server = config_GetPsz( p_intf, "growl-server" );
int i_port = config_GetInt( p_intf, "growl-port" ); int i_port = config_GetInt( p_intf, "growl-port" );
int i_ttl = config_GetInt( p_intf, "growl-ttl" );
strcpy( (char*)(p_data+i_offset), psz_password ); strcpy( (char*)(p_data+i_offset), psz_password );
i = i_offset + strlen(psz_password); i = i_offset + strlen(psz_password);
...@@ -276,7 +281,7 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset ) ...@@ -276,7 +281,7 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset )
p_data[i_offset++] = (md5.p_digest[i]>>24)&0xFF; p_data[i_offset++] = (md5.p_digest[i]>>24)&0xFF;
} }
i_handle = net_ConnectUDP( p_this, psz_server, i_port, 0 ); i_handle = net_ConnectUDP( p_this, psz_server, i_port, i_ttl );
if( i_handle == -1 ) if( i_handle == -1 )
{ {
msg_Err( p_this, "failed to open a connection (udp)" ); msg_Err( p_this, "failed to open a connection (udp)" );
......
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