Remove VLC_OBJECT_OPENGL

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

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 68a5f7f64fd2df166ba612f9deaa7290ae48ffc6..8879b0878c2d11c8f38367d161ec7481861af621 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -28,7 +28,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_meta.h>
@@ -66,11 +67,11 @@ struct intf_sys_t
 vlc_module_begin();
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_shortname( _( "Notify" ) );
-    set_description( _("LibNotify Notification Plugin") );
+    set_shortname( N_( "Notify" ) );
+    set_description( N_("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 );
@@ -97,13 +98,13 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    vlc_mutex_init( p_this, &p_sys->lock );
+    vlc_mutex_init( &p_sys->lock );
 
     p_intf->p_sys = p_sys;
 
     p_intf->p_sys->notification = NULL;
 
-    p_playlist = pl_Yield( p_intf );
+    p_playlist = pl_Hold( p_intf );
     var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
     pl_Release( p_intf );
 
@@ -118,7 +119,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_Yield( p_this );
+    playlist_t *p_playlist = pl_Hold( p_this );
     var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this );
     pl_Release( p_this );
 
@@ -136,22 +137,19 @@ 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;
     char                *psz_arturl     = NULL;
-    input_thread_t      *p_input        = NULL;
-    playlist_t          * p_playlist    = pl_Yield( p_this );
+    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;
 
-    p_input = p_playlist->p_input;
-    pl_Release( p_playlist );
-
     if( !p_input ) return VLC_SUCCESS;
-    vlc_object_yield( p_input );
 
     if( p_input->b_dead )
     {
@@ -218,7 +216,13 @@ 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 '&amp;' because '&' is a keyword of
      * notification-daemon parser */
@@ -251,16 +255,18 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
 
 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_t *p_playlist = pl_Hold( ((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_t *p_playlist = pl_Hold( ((vlc_object_t*) p) );
     playlist_Prev( p_playlist );
     pl_Release( ((vlc_object_t*) p) );
 }