Plugins: include vlc_common.h directly instead of vlc/vlc.h

[vlc] / modules / meta_engine / folder.c

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 7d84ae9e99aad1db748c6d95a25155d656f0102c..d2fb5dbf4bed28b35fef818bde72b6ac3534e9fa 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -24,9 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#define _GNU_SOURCE
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_meta.h>
 #include <vlc_playlist.h>
@@ -52,7 +56,7 @@ static int FindMeta( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( N_( "Folder" ) );
-    set_description( _("Folder meta data") );
+    set_description( N_("Folder meta data") );
 
     set_capability( "art finder", 90 );
     set_callbacks( FindMeta, NULL );
@@ -64,12 +68,12 @@ static int FindMeta( vlc_object_t *p_this )
 {
     playlist_t *p_playlist = (playlist_t *)p_this;
     input_item_t *p_item = (input_item_t *)(p_playlist->p_private);
-    vlc_bool_t b_have_art = VLC_FALSE;
+    bool b_have_art = false;
 
     int i = 0;
     struct stat a;
     char psz_filename[MAX_PATH];
-    char *psz_dir = strdup( p_item->psz_uri );
+    char *psz_dir = input_item_GetURI( p_item );
     char *psz_buf = strrchr( psz_dir, '/' );
 
     if( psz_buf )
@@ -86,7 +90,7 @@ static int FindMeta( vlc_object_t *p_this )
     if( !strncmp( psz_path, "file://", 7 ) )
         psz_path += 7;
 
-    for( i = 0; b_have_art == VLC_FALSE && i < 3; i++ )
+    for( i = 0; b_have_art == false && i < 3; i++ )
     {
         switch( i )
         {
@@ -112,7 +116,7 @@ static int FindMeta( vlc_object_t *p_this )
         if( utf8_stat( psz_filename+7, &a ) != -1 )
         {
             input_item_SetArtURL( p_item, psz_filename );
-            b_have_art = VLC_TRUE;
+            b_have_art = true;
         }
     }