From: <th...@fr...> - 2005-04-16 12:08:03
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: thaytan Date: Sat Apr 16 2005 05:08:00 PDT Branch: BRANCH-GSTREAMER-0_8 Log message: * ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_open_file): If random access is not supported, fallback to non-seekable behaviour rather than erroring out. Modified files: . : ChangeLog ext/gnomevfs : gstgnomevfssrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1641.2.107&r2=1.1641.2.108 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/gnomevfs/gstgnomevfssrc.c.diff?r1=1.63.4.1&r2=1.63.4.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1641.2.107 retrieving revision 1.1641.2.108 diff -u -d -r1.1641.2.107 -r1.1641.2.108 --- ChangeLog 16 Apr 2005 11:02:21 -0000 1.1641.2.107 +++ ChangeLog 16 Apr 2005 12:07:47 -0000 1.1641.2.108 @@ -1,4 +1,9 @@ 2005-04-16 Jan Schmidt,,, <th...@ma...> + * ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_open_file): + If random access is not supported, fallback to non-seekable + behaviour rather than erroring out. + +2005-04-16 Jan Schmidt,,, <th...@ma...> * gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_send_data): * gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_data): Use the default event handler for EOS and other unknown events that Index: gstgnomevfssrc.c RCS file: /cvs/gstreamer/gst-plugins/ext/gnomevfs/gstgnomevfssrc.c,v retrieving revision 1.63.4.1 retrieving revision 1.63.4.2 diff -u -d -r1.63.4.1 -r1.63.4.2 --- gstgnomevfssrc.c 12 Apr 2005 13:25:02 -0000 1.63.4.1 +++ gstgnomevfssrc.c 16 Apr 2005 12:07:48 -0000 1.63.4.2 @@ -1147,6 +1147,15 @@ if (src->uri != NULL) { result = gnome_vfs_open_uri (&(src->handle), src->uri, GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM); + if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE || + result == GNOME_VFS_ERROR_NOT_SUPPORTED) { + /* seeking might not be supported, try without it */ + result = gnome_vfs_open_uri (&(src->handle), src->uri, + GNOME_VFS_OPEN_READ); + } if (result != GNOME_VFS_OK) { gchar *filename = gnome_vfs_uri_to_string (src->uri, GNOME_VFS_URI_HIDE_PASSWORD); |