Sout - cleanup. and mark the TODO for the icecast MRL generation...

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 14526c8fc0c6ae03813bfe5a86073a26cd22ab73..10075f0a78d03b0c265c9a586f033b57c5d33a38 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -301,6 +301,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_SET_TITLE:
         case ACCESS_SET_SEEKPOINT:
         case ACCESS_SET_PRIVATE_ID_STATE:
+        case ACCESS_GET_CONTENT_TYPE:
             return VLC_EGENERIC;
 
         default:
@@ -377,8 +378,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
 
     if ((fd == -1) || fstat (fd, &stself.st))
     {
-        msg_Err (p_playlist, "cannot stat `%s': %s", psz_name,
-                 strerror (errno));
+        msg_Err (p_playlist, "cannot stat `%s': %m", psz_name);
         return VLC_EGENERIC;
     }
 
@@ -405,8 +405,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
     i_dir_content = utf8_loaddir (handle, &pp_dir_content, NULL, Sort);
     if( i_dir_content == -1 )
     {
-        msg_Err (p_playlist, "cannot read `%s': %s", psz_name,
-                 strerror (errno));
+        msg_Err (p_playlist, "cannot read `%s': %m", psz_name);
         return VLC_EGENERIC;
     }
     else if( i_dir_content <= 0 )
@@ -477,7 +476,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
 
                 p_node = playlist_NodeCreate( p_playlist, entry,
                                               p_parent_category,
-                                              PLAYLIST_NO_REBUILD );
+                                              PLAYLIST_NO_REBUILD, NULL );
 
                 /* If we had the parent in category, the it is now node.
                  * Else, we still don't have  */
@@ -551,7 +550,7 @@ static DIR *OpenDir (vlc_object_t *obj, const char *path)
     {
         int err = errno;
         if (err != ENOTDIR)
-            msg_Err (obj, "%s: %s", path, strerror (err));
+            msg_Err (obj, "%s: %m", path);
         else
             msg_Dbg (obj, "skipping non-directory `%s'", path);
         errno = err;