#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
+#include <vlc_url.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libnotify/notify.h>
-/*****************************************************************************
- * 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 Notify( vlc_object_t *, const char *, GdkPixbuf *, intf_thread_t * );
-#define MAX_LENGTH 256
-
-struct intf_sys_t
-{
- NotifyNotification *notification;
- vlc_mutex_t lock;
-};
-
/*****************************************************************************
* Module descriptor
****************************************************************************/
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
#define APPLICATION_NAME "VLC media player"
set_description( N_("LibNotify Notification Plugin") )
add_integer( "notify-timeout", 4000, NULL,
- TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true )
+ TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true )
set_capability( "interface", 0 )
set_callbacks( Open, Close )
vlc_module_end ()
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int ItemChange( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+static int Notify( vlc_object_t *, const char *, GdkPixbuf *, intf_thread_t * );
+#define MAX_LENGTH 256
+
+struct intf_sys_t
+{
+ NotifyNotification *notification;
+ vlc_mutex_t lock;
+ bool b_has_actions;
+};
+
/*****************************************************************************
* 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;
- intf_sys_t *p_sys = malloc( sizeof( intf_sys_t ) );
+ intf_sys_t *p_sys = malloc( sizeof( *p_sys ) );
if( !p_sys )
return VLC_ENOMEM;
msg_Err( p_intf, "can't find notification daemon" );
return VLC_EGENERIC;
}
+ p_intf->p_sys = p_sys;
vlc_mutex_init( &p_sys->lock );
+ p_sys->notification = NULL;
+ p_sys->b_has_actions = false;
- p_intf->p_sys = p_sys;
-
- p_intf->p_sys->notification = NULL;
+ GList *p_caps = notify_get_server_caps ();
+ if( p_caps )
+ {
+ for( GList *c = p_caps; c != NULL; c = c->next )
+ {
+ if( !strcmp( (char*)c->data, "actions" ) )
+ {
+ p_sys->b_has_actions = true;
+ break;
+ }
+ }
+ g_list_foreach( p_caps, (GFunc)g_free, NULL );
+ g_list_free( p_caps );
+ }
- p_playlist = pl_Hold( p_intf );
+ /* */
+ playlist_t *p_playlist = pl_Hold( p_intf );
var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
pl_Release( p_intf );
var_DelCallback( p_playlist, "item-current", ItemChange, p_this );
pl_Release( p_this );
- if( p_intf->p_sys->notification )
- g_object_unref( p_intf->p_sys->notification );
+ if( p_sys->notification )
+ {
+ GError *p_error = NULL;
+ notify_notification_close( p_sys->notification, &p_error );
+ g_object_unref( p_sys->notification );
+ }
vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
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;
- char *psz_arturl = NULL;
- input_thread_t *p_input = playlist_CurrentInput(
- (playlist_t*) p_this );
- intf_thread_t *p_intf = ( intf_thread_t* ) param;
- intf_sys_t *p_sys = p_intf->p_sys;
-
- if( !p_input ) return VLC_SUCCESS;
+ char psz_tmp[MAX_LENGTH];
+ char psz_notify[MAX_LENGTH];
+ char *psz_title;
+ char *psz_artist;
+ char *psz_album;
+ char *psz_arturl;
+ input_thread_t *p_input = playlist_CurrentInput( (playlist_t*)p_this );
+ intf_thread_t *p_intf = param;
+ intf_sys_t *p_sys = p_intf->p_sys;
+
+ if( !p_input )
+ return VLC_SUCCESS;
if( p_input->b_dead )
{
vlc_object_release( p_input );
return VLC_SUCCESS;
}
- /*Wait a tad so the meta has been fetched*/
- msleep( 1000*4 );
+
+ /* Wait a tad so the meta has been fetched
+ * FIXME that's awfully wrong */
+ msleep( 10000 );
/* Playing something ... */
- psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
- psz_album = input_item_GetAlbum( input_GetItem( p_input ) ) ;
- psz_title = input_item_GetTitle( input_GetItem( p_input ) );
- if( ( psz_title == NULL ) || EMPTY_STR( psz_title ) )
+ input_item_t *p_input_item = input_GetItem( p_input );
+ psz_title = input_item_GetTitleFbName( p_input_item );
+
+ /* We need at least a title */
+ if( EMPTY_STR( psz_title ) )
{
free( psz_title );
- psz_title = input_item_GetName( input_GetItem( p_input ) );
- }
- if( ( psz_title == NULL ) || EMPTY_STR( psz_title ) )
- { /* Not enough metadata ... */
- free( psz_title );
- free( psz_artist );
- free( psz_album );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
- if( EMPTY_STR( psz_artist ) )
- {
- free( psz_artist );
- psz_artist = NULL;
- }
- if( EMPTY_STR( psz_album ) )
- {
- free( psz_album );
- psz_album = NULL;
- }
- vlc_object_release( p_input );
+ psz_artist = input_item_GetArtist( p_input_item );
+ psz_album = input_item_GetAlbum( p_input_item );
- if( psz_artist && psz_album )
- snprintf( psz_tmp, MAX_LENGTH, "<b>%s</b>\n%s\n[%s]",
- psz_title, psz_artist, psz_album );
- else if( psz_artist )
- snprintf( psz_tmp, MAX_LENGTH, "<b>%s</b>\n%s",
- psz_title, psz_artist );
+ if( !EMPTY_STR( psz_artist ) )
+ {
+ if( !EMPTY_STR( psz_album ) )
+ snprintf( psz_tmp, MAX_LENGTH, "<b>%s</b>\n%s\n[%s]",
+ psz_title, psz_artist, psz_album );
+ else
+ snprintf( psz_tmp, MAX_LENGTH, "<b>%s</b>\n%s",
+ psz_title, psz_artist );
+ }
else
snprintf( psz_tmp, MAX_LENGTH, "<b>%s</b>", psz_title );
free( psz_album );
GdkPixbuf *pix = NULL;
- GError *p_error = NULL;
+ psz_arturl = input_item_GetArtURL( p_input_item );
+ vlc_object_release( p_input );
- psz_arturl = input_item_GetArtURL( input_GetItem( p_input ) );
if( psz_arturl && !strncmp( psz_arturl, "file://", 7 ) &&
- strlen( psz_arturl ) > 7 )
+ decode_URI( psz_arturl + 7 ) )
{ /* scale the art to show it in notify popup */
- gboolean b = TRUE;
- pix = gdk_pixbuf_new_from_file_at_scale(
- (psz_arturl + 7), 72, 72, b, &p_error );
- free( psz_arturl );
+ GError *p_error = NULL;
+ pix = gdk_pixbuf_new_from_file_at_scale( &psz_arturl[7],
+ 72, 72, TRUE, &p_error );
}
else /* else we show state-of-the art logo */
{
+ GError *p_error = NULL;
char *psz_pixbuf;
- if( asprintf( &psz_pixbuf, "%s/vlc48x48.png", config_GetDataDir() ) >= 0 )
+ char *psz_data = config_GetDataDir( p_this );
+ if( asprintf( &psz_pixbuf, "%s/vlc48x48.png", psz_data ) >= 0 )
{
pix = gdk_pixbuf_new_from_file( psz_pixbuf, &p_error );
free( psz_pixbuf );
}
+ free( psz_data );
}
+ free( psz_arturl );
+
/* 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++ )
+ const int i_len = strlen( psz_tmp );
+ int i_notify = 0;
+ for( int 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, "&" );
+ snprintf( &psz_notify[i_notify], 6, "&" );
i_notify += 4;
}
i_notify++;
return VLC_SUCCESS;
}
+/* libnotify callback, called when the "Next" button is pressed */
static void Next( NotifyNotification *notification, gchar *psz, gpointer p )
-{ /* libnotify callback, called when the "Next" button is pressed */
+{
+ vlc_object_t *p_object = (vlc_object_t*)p;
+
VLC_UNUSED(psz);
- notify_notification_close (notification, NULL);
- playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p) );
+ notify_notification_close( notification, NULL );
+ playlist_t *p_playlist = pl_Hold( p_object );
playlist_Next( p_playlist );
- pl_Release( ((vlc_object_t*) p) );
+ pl_Release( p_object );
}
+/* libnotify callback, called when the "Previous" button is pressed */
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_Hold( ((vlc_object_t*) p) );
- playlist_Prev( p_playlist );
- pl_Release( ((vlc_object_t*) p) );
-}
-
-static gboolean
-can_support_actions ()
{
- static gboolean supports_actions = FALSE;
- static gboolean have_checked = FALSE;
-
- if( !have_checked ) {
- GList *caps = NULL;
- GList *c;
-
- have_checked = TRUE;
-
- caps = notify_get_server_caps ();
- if( caps != NULL ) {
- for( c = caps; c != NULL; c = c->next ) {
- if( strcmp( (char*)c->data, "actions" ) == 0 ) {
- supports_actions = TRUE;
- break;
- }
- }
- }
-
- g_list_foreach( caps, (GFunc)g_free, NULL );
- g_list_free( caps );
- }
+ vlc_object_t *p_object = (vlc_object_t*)p;
- return supports_actions;
+ VLC_UNUSED(psz);
+ notify_notification_close( notification, NULL );
+ playlist_t *p_playlist = pl_Hold( p_object );
+ playlist_Prev( p_playlist );
+ pl_Release( p_object );
}
static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
intf_thread_t *p_intf )
{
+ intf_sys_t *p_sys = p_intf->p_sys;
+
NotifyNotification * notification;
- GError *p_error = NULL;
/* Close previous notification if still active */
- if( p_intf->p_sys->notification )
+ if( p_sys->notification )
{
- notify_notification_close( p_intf->p_sys->notification, &p_error );
- g_object_unref( p_intf->p_sys->notification );
+ GError *p_error = NULL;
+ notify_notification_close( p_sys->notification, &p_error );
+ g_object_unref( p_sys->notification );
}
notification = notify_notification_new( _("Now Playing"),
- psz_temp, NULL, NULL);
+ psz_temp, NULL, NULL );
notify_notification_set_timeout( notification,
config_GetInt(p_this, "notify-timeout") );
notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
}
/* Adds previous and next buttons in the notification if actions are supported. */
- if( can_support_actions() ) {
+ if( p_sys->b_has_actions )
+ {
notify_notification_add_action( notification, "previous", _("Previous"), Prev,
- (gpointer*) p_intf, NULL );
+ (gpointer*)p_intf, NULL );
notify_notification_add_action( notification, "next", _("Next"), Next,
- (gpointer*) p_intf, NULL );
+ (gpointer*)p_intf, NULL );
}
notify_notification_show( notification, NULL);
/* Stores the notification to be able to close it */
- p_intf->p_sys->notification = notification;
+ p_sys->notification = notification;
return VLC_SUCCESS;
}
projects / vlc / blobdiff