libvlccore: fix AUTO_ADJUST_PTS_DELAY short comment.

[vlc] / modules / meta_engine / folder.c

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 6e4b7be191662980def8ec0912becae6d30245ce..e6493e0e2e8d5545a72a26397196d8cba7843f78 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_meta.h>
 #include <vlc_playlist.h>
@@ -55,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 );
@@ -67,14 +68,19 @@ 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];
+    if( !p_item )
+        return VLC_EGENERIC;
+
     char *psz_dir = input_item_GetURI( p_item );
-    char *psz_buf = strrchr( psz_dir, '/' );
+    if( !psz_dir )
+        return VLC_EGENERIC;
 
+    char *psz_buf = strrchr( psz_dir, '/' );
     if( psz_buf )
     {
         psz_buf++;
@@ -89,7 +95,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 )
         {
@@ -115,7 +121,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;
         }
     }