Use gettext_noop() consistently

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 2fb2c065c3357e8b4c1e7311b62fdf564130cc89..0fb421aebb50fba08739a523bebf19811467be0b 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -26,7 +26,12 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
@@ -87,23 +92,23 @@ static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
 
 vlc_module_begin();
     set_category( CAT_INPUT );
-    set_shortname( _("Directory" ) );
+    set_shortname( N_("Directory" ) );
     set_subcategory( SUBCAT_INPUT_ACCESS );
-    set_description( _("Standard filesystem directory input") );
-    set_capability( "access2", 55 );
+    set_description( N_("Standard filesystem directory input") );
+    set_capability( "access", 55 );
     add_shortcut( "directory" );
     add_shortcut( "dir" );
     add_shortcut( "file" );
     add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
-                RECURSIVE_LONGTEXT, VLC_FALSE );
+                RECURSIVE_LONGTEXT, false );
       change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
     add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
-                NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
+                NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false );
     set_callbacks( Open, Close );
 
     add_submodule();
         set_description( "Directory EOF");
-        set_capability( "demux2", 0 );
+        set_capability( "demux", 0 );
         set_callbacks( DemuxOpen, NULL );
 vlc_module_end();
 
@@ -142,6 +147,13 @@ static int Open( vlc_object_t *p_this )
 {
     access_t *p_access = (access_t*)p_this;
 
+    if( !p_access->psz_path )
+        return VLC_EGENERIC;
+
+    struct stat st;
+    if( !stat( p_access->psz_path, &st ) && !S_ISDIR( st.st_mode ) )
+        return VLC_EGENERIC;
+
     DIR *handle = OpenDir (p_this, p_access->psz_path);
     if (handle == NULL)
         return VLC_EGENERIC;
@@ -154,6 +166,7 @@ static int Open( vlc_object_t *p_this )
     p_access->pf_control= Control;
 
     /* Force a demux */
+    free( p_access->psz_demux );
     p_access->psz_demux = strdup( "directory" );
 
     return VLC_SUCCESS;
@@ -206,7 +219,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
     }
 
     p_current_input = input_GetItem( p_input );
-    p_current = playlist_ItemGetByInput( p_playlist, p_current_input, VLC_FALSE );
+    p_current = playlist_ItemGetByInput( p_playlist, p_current_input, false );
 
     if( !p_current )
     {
@@ -240,7 +253,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
 
     p_current->p_input->i_type = ITEM_TYPE_DIRECTORY;
     p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
-                                              VLC_FALSE );
+                                              false );
 
     i_activity = var_GetInteger( p_playlist, "activity" );
     var_SetInteger( p_playlist, "activity", i_activity +
@@ -255,7 +268,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
 
     playlist_Signal( p_playlist );
 
-    if( psz_name ) free( psz_name );
+    free( psz_name );
     vlc_object_release( p_input );
     vlc_object_release( p_playlist );
 
@@ -269,7 +282,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {
-    vlc_bool_t   *pb_bool;
+    bool   *pb_bool;
     int          *pi_int;
     int64_t      *pi_64;
 
@@ -280,8 +293,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_CAN_FASTSEEK:
         case ACCESS_CAN_PAUSE:
         case ACCESS_CAN_CONTROL_PACE:
-            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
-            *pb_bool = VLC_FALSE;    /* FIXME */
+            pb_bool = (bool*)va_arg( args, bool* );
+            *pb_bool = false;    /* FIXME */
             break;
 
         /* */
@@ -339,7 +352,7 @@ static int Demux( demux_t *p_demux )
  *****************************************************************************/
 static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+    return demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
 }
 
 
@@ -444,7 +457,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
             psz_parser = ptr + 1;
         }
     }
-    if( psz_ignore ) free( psz_ignore );
+    free( psz_ignore );
 
     /* While we still have entries in the directory */
     for( i = 0; i < i_dir_content; i++ )
@@ -519,24 +532,27 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
                 {
                     if( p_current_input )
                         input_ItemCopyOptions( p_current_input, p_input );
-                    playlist_BothAddInput( p_playlist, p_input,
+                    int i_ret = playlist_BothAddInput( p_playlist, p_input,
                                            p_parent_category,
                                            PLAYLIST_APPEND|PLAYLIST_PREPARSE|
                                            PLAYLIST_NO_REBUILD,
                                            PLAYLIST_END, NULL, NULL,
-                                           VLC_FALSE );
+                                           false );
+                    vlc_gc_decref( p_input );
+                    if( i_ret != VLC_SUCCESS )
+                        return VLC_EGENERIC;
                 }
             }
         }
     }
 
     for( i = 0; i < i_extensions; i++ )
-        if( ppsz_extensions[i] ) free( ppsz_extensions[i] );
-    if( ppsz_extensions ) free( ppsz_extensions );
+        free( ppsz_extensions[i] );
+    free( ppsz_extensions );
 
     for( i = 0; i < i_dir_content; i++ )
-        if( pp_dir_content[i] ) free( pp_dir_content[i] );
-    if( pp_dir_content ) free( pp_dir_content );
+        free( pp_dir_content[i] );
+    free( pp_dir_content );
 
     return i_return;
 }