Add --data-path option. Access the src share directory now works from build tree.

[vlc] / modules / misc / notify / notify.c

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 6fa084af1bfda1805226444c465b636ab616ad3c..99453869273ea5ac82fdaa7afd19d5767e7dc5ce 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -55,7 +55,7 @@ vlc_module_begin ()
     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 )
@@ -154,16 +154,15 @@ 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;
-    char                *psz_arturl     = NULL;
-    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;
+    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;
@@ -177,39 +176,32 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
 
     /* Wait a tad so the meta has been fetched
      * FIXME that's awfully wrong */
-    msleep( 1000*4 );
+    msleep( 10000 );
 
     /* Playing something ... */
     input_item_t *p_input_item = input_GetItem( p_input );
-    psz_artist = input_item_GetArtist( p_input_item );
-    psz_album = input_item_GetAlbum( p_input_item );
     psz_title = input_item_GetTitleFbName( p_input_item );
 
+    /* We need at least a title */
     if( 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 ) )
+
+    psz_artist = input_item_GetArtist( p_input_item );
+    psz_album = input_item_GetAlbum( p_input_item );
+
+    if( !EMPTY_STR( psz_artist ) )
     {
-        free( psz_album );
-        psz_album = NULL;
+        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 );
     }
-
-    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 );
     else
         snprintf( psz_tmp, MAX_LENGTH, "<b>%s</b>", psz_title );
 
@@ -232,11 +224,13 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     {
         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 );
@@ -271,8 +265,9 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     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);
@@ -282,8 +277,9 @@ static void Next( NotifyNotification *notification, gchar *psz, gpointer 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_object_t *p_object = (vlc_object_t*)p;
 
     VLC_UNUSED(psz);
@@ -323,9 +319,9 @@ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
     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);