X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Fnotify%2Fnotify.c;h=e4473fbbfd690c5a5c9026a5b9c58ac9c1afb024;hb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;hp=b923795024117d71f2ef0091b59aac45fff3cb4d;hpb=904e57391e25f8ed13ff5cfabda0a087daa4abfb;p=vlc diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c index b923795024..e4473fbbfd 100644 --- a/modules/misc/notify/notify.c +++ b/modules/misc/notify/notify.c @@ -1,7 +1,7 @@ /***************************************************************************** * notify.c : libnotify notification plugin ***************************************************************************** - * Copyright (C) 2006 the VideoLAN team + * Copyright (C) 2006-2007 the VideoLAN team * $Id$ * * Authors: Christophe Mutricy @@ -24,16 +24,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include - -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include #include +#include +#include +#include + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -67,7 +70,7 @@ vlc_module_begin(); set_description( _("LibNotify Notification Plugin") ); add_integer( "notify-timeout", 4000,NULL, - TIMEOUT_TEXT, TIMEOUT_LONGTEXT, VLC_TRUE ); + TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true ); set_capability( "interface", 0 ); set_callbacks( Open, Close ); @@ -81,7 +84,7 @@ static int Open( vlc_object_t *p_this ) intf_thread_t *p_intf = (intf_thread_t *)p_this; playlist_t *p_playlist; intf_sys_t *p_sys = malloc( sizeof( intf_sys_t ) ); - + if( !p_sys ) { msg_Err( p_intf, "Out of memory" ); @@ -119,6 +122,9 @@ static void Close( vlc_object_t *p_this ) var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this ); pl_Release( p_this ); + if( p_intf->p_sys->notification ) + g_object_unref( p_intf->p_sys->notification ); + vlc_mutex_destroy( &p_sys->lock ); free( p_sys ); notify_uninit(); @@ -130,7 +136,9 @@ static void Close( vlc_object_t *p_this ) 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); char psz_tmp[MAX_LENGTH]; + char psz_notify[MAX_LENGTH]; char *psz_title = NULL; char *psz_artist = NULL; char *psz_album = NULL; @@ -152,6 +160,8 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, vlc_object_release( p_input ); return VLC_SUCCESS; } + /*Wait a tad so the meta has been fetched*/ + msleep( 1000*4 ); /* Playing something ... */ psz_artist = input_item_GetArtist( input_GetItem( p_input ) ); @@ -191,7 +201,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, psz_title, psz_artist ); else snprintf( psz_tmp, MAX_LENGTH, "%s", psz_title ); - + free( psz_title ); free( psz_artist ); free( psz_album ); @@ -209,17 +219,61 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, free( psz_arturl ); } else /* else we show state-of-the art logo */ - pix = gdk_pixbuf_new_from_file( DATA_PATH "/vlc48x48.png", &p_error ); + { + const char *data_path = config_GetDataDir (); + char buf[strlen (data_path) + sizeof ("/vlc48x48.png")]; + + snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path); + pix = gdk_pixbuf_new_from_file( buf, &p_error ); + } + + /* we need to replace '&' with '&' because '&' is a keyword of + * notification-daemon parser */ + int i_notify, i_len, i; + i_len = strlen( psz_tmp ); + i_notify = 0; + for( i = 0; ( ( i < i_len ) && ( i_notify < ( MAX_LENGTH - 5 ) ) ); i++ ) + { /* we use MAX_LENGTH - 5 because if the last char of psz_tmp is '&' + * we will need 5 more characters: 'amp;\0' . + * however that's unlikely to happen because the last char is '\0' */ + if( psz_tmp[i] != '&' ) + psz_notify[i_notify] = psz_tmp[i]; + else + { + snprintf( psz_notify + i_notify, 6, "&" ); + i_notify += 4; + } + i_notify++; + } + psz_notify[i_notify] = '\0'; vlc_mutex_lock( &p_sys->lock ); - Notify( p_this, psz_tmp, pix, p_intf ); + Notify( p_this, psz_notify, pix, p_intf ); vlc_mutex_unlock( &p_sys->lock ); return VLC_SUCCESS; } +static void Next( NotifyNotification *notification, gchar *psz, gpointer p ) +{ /* libnotify callback, called when the "Next" button is pressed */ + VLC_UNUSED(psz); + notify_notification_close (notification, NULL); + playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p) ); + playlist_Next( p_playlist ); + pl_Release( ((vlc_object_t*) p) ); +} + +static void Prev( NotifyNotification *notification, gchar *psz, gpointer p ) +{ /* libnotify callback, called when the "Previous" button is pressed */ + VLC_UNUSED(psz); + notify_notification_close (notification, NULL); + playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p) ); + playlist_Prev( p_playlist ); + pl_Release( ((vlc_object_t*) p) ); +} + static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix, intf_thread_t *p_intf ) { @@ -228,7 +282,10 @@ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix, /* Close previous notification if still active */ if( p_intf->p_sys->notification ) + { notify_notification_close( p_intf->p_sys->notification, &p_error ); + g_object_unref( p_intf->p_sys->notification ); + } notification = notify_notification_new( _("Now Playing"), psz_temp, NULL, NULL); @@ -241,6 +298,12 @@ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix, gdk_pixbuf_unref( pix ); } + /* Adds previous and next buttons in the notification */ + notify_notification_add_action( notification, "previous", _("Previous"), Prev, + (gpointer*) p_intf, NULL ); + notify_notification_add_action( notification, "next", _("Next"), Next, + (gpointer*) p_intf, NULL ); + notify_notification_show( notification, NULL); /* Stores the notification to be able to close it */