msn: simplify (and remove some dummy strdup).

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

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 8b0d0094a6be9a9d0fe8e3f9acd81d6d87b41c55..850d6df6f2e0d6cdfdb7eb5ae7edadefeba8c51c 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 )
@@ -116,9 +116,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* */
-    playlist_t *p_playlist = pl_Hold( p_intf );
-    var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
-    pl_Release( p_intf );
+    var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
 
     return VLC_SUCCESS;
 }
@@ -131,9 +129,7 @@ static void Close( vlc_object_t *p_this )
     intf_thread_t   *p_intf = ( intf_thread_t* ) p_this;
     intf_sys_t      *p_sys  = p_intf->p_sys;
 
-    playlist_t *p_playlist = pl_Hold( p_this );
-    var_DelCallback( p_playlist, "item-current", ItemChange, p_this );
-    pl_Release( p_this );
+    var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this );
 
     if( p_sys->notification )
     {
@@ -176,7 +172,7 @@ 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 );
@@ -224,11 +220,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 );
@@ -263,26 +261,24 @@ 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);
     notify_notification_close( notification, NULL );
-    playlist_t *p_playlist = pl_Hold( p_object );
-    playlist_Next( p_playlist );
-    pl_Release( p_object );
+    playlist_Next( pl_Get( 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);
     notify_notification_close( notification, NULL );
-    playlist_t *p_playlist = pl_Hold( p_object );
-    playlist_Prev( p_playlist );
-    pl_Release( p_object );
+    playlist_Prev( pl_Get( p_object ) );
 }
 
 static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
@@ -303,7 +299,7 @@ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
     notification = notify_notification_new( _("Now Playing"),
                                             psz_temp, NULL, NULL );
     notify_notification_set_timeout( notification,
-                                     config_GetInt(p_this, "notify-timeout") );
+                                var_InheritInteger(p_this, "notify-timeout") );
     notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
     if( pix )
     {
@@ -315,9 +311,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);