mkv.cpp: store silent tracks info

[vlc] / modules / access / file.c

diff --git a/modules/access/file.c b/modules/access/file.c
index fc7bd47047da2c8fa1d604116bc9bb305d196596..ebbc63b6445f06c374a9fcff45ad46703a8cc130 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -86,7 +86,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("Standard filesystem file input") );
-    set_name( _("File") );
+    set_shortname( _("File") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
@@ -185,7 +185,9 @@ static int Open( vlc_object_t *p_this )
     p_sys->file = NULL;
     p_sys->i_file = 0;
     p_sys->i_index = 0;
+#ifndef UNDER_CE
     p_sys->fd = -1;
+#endif
 
     if( !strcasecmp( p_access->psz_access, "stream" ) )
     {
@@ -555,6 +557,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_META:
             return VLC_EGENERIC;
 
         default:
@@ -577,7 +580,7 @@ static int _OpenFile( access_t * p_access, char * psz_name )
     p_sys->fd = fopen( psz_name, "rb" );
     if ( !p_sys->fd )
     {
-        msg_Err( p_access, "cannot open file %s" );
+        msg_Err( p_access, "cannot open file %s", psz_name );
         return VLC_EGENERIC;
     }