Do not throw VLCException in Video class

[vlc] / modules / access / gnomevfs.c

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index 92a99d49d2c671654e4ac165230bfedee59af158..d14d5b73a5dc8eeb76c6e12ccc3033cde640499c 100644 (file)
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -18,22 +18,24 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
+
 #include <libgnomevfs/gnome-vfs.h>
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
-#include "charset.h"
-#include "network.h"
+#include <vlc_charset.h>
+#include "vlc_url.h"
 
 /*****************************************************************************
  * Module descriptor
@@ -43,12 +45,12 @@ static void Close( vlc_object_t * );
 
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for GnomeVFS streams."\
-    "This value should be set in millisecond units." )
+    "Caching value for GnomeVFS streams."\
+    "This value should be set in milliseconds." )
 
 vlc_module_begin();
-    set_description( _("GnomeVFS filesystem file input") );
-    set_shortname( _("GnomeVFS") );
+    set_description( _("GnomeVFS input") );
+    set_shortname( "GnomeVFS" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
@@ -93,7 +95,6 @@ static int Open( vlc_object_t *p_this )
     GnomeVFSURI    *p_uri = NULL;
     GnomeVFSResult  i_ret;
     GnomeVFSHandle *p_handle = NULL;
-
     if( !(gnome_vfs_init()) )
     {
         msg_Warn( p_access, "couldn't initilize GnomeVFS" );
@@ -105,20 +106,7 @@ static int Open( vlc_object_t *p_this )
        open a file with a valid protocol, try to open at least file:// */
     gnome_vfs_open( &p_handle, "file://", 5 );
 
-    p_access->pf_read = Read;
-    p_access->pf_block = NULL;
-    p_access->pf_seek = Seek;
-    p_access->pf_control = Control;
-    p_access->info.i_update = 0;
-    p_access->info.i_size = 0;
-    p_access->info.i_pos = 0;
-    p_access->info.b_eof = VLC_FALSE;
-    p_access->info.i_title = 0;
-    p_access->info.i_seekpoint = 0;
-
-    p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
-    if( !p_sys )
-        return VLC_ENOMEM;
+    STANDARD_READ_ACCESS_INIT;
 
     p_sys->p_handle = p_handle;
     p_sys->i_nb_reads = 0;
@@ -159,18 +147,25 @@ static int Open( vlc_object_t *p_this )
         char *psz_path_begin;
 
         vlc_UrlParse( &url, psz_unescaped, 0 );
-
         psz_escaped_path = gnome_vfs_escape_path_string( url.psz_path );
 
+        if( psz_escaped_path )
+        {
     /* Now let's reconstruct a valid URI from all that stuff */
-        psz_path_begin = strstr( psz_unescaped, url.psz_path );
-        *psz_path_begin = '\0';
-        psz_uri = malloc( strlen( psz_unescaped ) +
+            psz_path_begin = psz_unescaped + strlen( psz_unescaped )
+                                           - strlen( url.psz_path );
+            *psz_path_begin = '\0';
+            psz_uri = malloc( strlen( psz_unescaped ) +
                                         strlen( psz_escaped_path ) + 1 );
-        sprintf( psz_uri, "%s%s",psz_unescaped, psz_escaped_path );
+            sprintf( psz_uri, "%s%s",psz_unescaped, psz_escaped_path );
 
-        g_free( psz_escaped_path );
-        g_free( psz_unescaped );
+            g_free( psz_escaped_path );
+            g_free( psz_unescaped );
+        }
+        else
+        {
+            psz_uri = psz_unescaped;
+        }
     }
     else
     {
@@ -183,11 +178,11 @@ static int Open( vlc_object_t *p_this )
     {
         p_sys->p_file_info = gnome_vfs_file_info_new();
         i_ret = gnome_vfs_get_file_info_uri( p_uri,
-                                                p_sys->p_file_info, 8 ); 
+                                                p_sys->p_file_info, 8 );
 
         if( i_ret )
         {
-            msg_Err( p_access, "cannot get file info for uri %s (%s)", 
+            msg_Warn( p_access, "cannot get file info for uri %s (%s)",
                                 psz_uri, gnome_vfs_result_to_string( i_ret ) );
             gnome_vfs_file_info_unref( p_sys->p_file_info );
             gnome_vfs_uri_unref( p_uri);
@@ -215,7 +210,7 @@ static int Open( vlc_object_t *p_this )
 
         gnome_vfs_uri_unref( p_uri);
         g_free( psz_uri );
-        free( p_sys ); 
+        free( p_sys );
         free( psz_name );
         return VLC_EGENERIC;
     }
@@ -225,7 +220,7 @@ static int Open( vlc_object_t *p_this )
         p_sys->b_local = VLC_TRUE;
     }
 
-    if( p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_REGULAR || 
+    if( p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_REGULAR ||
         p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE ||
         p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_BLOCK_DEVICE )
     {
@@ -246,7 +241,7 @@ static int Open( vlc_object_t *p_this )
     if( p_sys->b_seekable && !p_access->info.i_size )
     {
         /* FIXME that's bad because all others access will be probed */
-        msg_Err( p_access, "file %s is empty, aborting", psz_name );
+        msg_Warn( p_access, "file %s is empty, aborting", psz_name );
         gnome_vfs_file_info_unref( p_sys->p_file_info );
         gnome_vfs_uri_unref( p_uri);
         free( p_sys );
@@ -421,6 +416,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_SET_SEEKPOINT:
         case ACCESS_SET_PRIVATE_ID_STATE:
         case ACCESS_GET_META:
+        case ACCESS_GET_CONTENT_TYPE:
             return VLC_EGENERIC;
 
         default: