totem r5452 - in trunk: . browser-plugin src/backend

[hadess svn gnome org]

Author: hadess
Date: Mon Jun  9 10:12:08 2008
New Revision: 5452
URL: http://svn.gnome.org/viewvc/totem?rev=5452&view=rev

Log:
2008-06-09  Bastien Nocera  <hadess hadess net>

	* browser-plugin/TODO: Remove already done TODO items
	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_open_with_subtitle): Even when giosrc is
	available, use the local filename if it's available, works around
	early giosrc bugs



Modified:
   trunk/ChangeLog
   trunk/browser-plugin/TODO
   trunk/src/backend/bacon-video-widget-gst-0.10.c

Modified: trunk/browser-plugin/TODO
==============================================================================
--- trunk/browser-plugin/TODO	(original)
+++ trunk/browser-plugin/TODO	Mon Jun  9 10:12:08 2008
@@ -12,17 +12,9 @@
 - invert DBUS-OpenStream/NPN_GetURL order: this is necessary so we can push the real stream URI
   to the viewer (for use as base uri for redirects)
 
-Viewer:
-- show totem logo image when waiting for click to start?
-
-GMP plugin:
-- write IDL files (where [_not_ MSDN !] to find documentation?)
-
 Complex plugin:
 - write IDL file (nsIHXPlayer.idl available, but incompatible with totem's
   licence exception; is the exception needed for the *plugin* itself?)
 - implement the various 'controls' types in the viewer
 - in the viewer, cope with the 'main' window being removed? (maybe reparent to a hidden window)
 
-NarrowSpace plugin:
-- write IDL file (where to find documentation?)

Modified: trunk/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-gst-0.10.c	(original)
+++ trunk/src/backend/bacon-video-widget-gst-0.10.c	Mon Jun  9 10:12:08 2008
@@ -2631,6 +2631,7 @@
   GstMessage *err_msg = NULL;
   GFile *file;
   gboolean ret;
+  char *path;
 
   g_return_val_if_fail (bvw != NULL, FALSE);
   g_return_val_if_fail (mrl != NULL, FALSE);
@@ -2648,17 +2649,13 @@
   /* this allows non-URI type of files in the thumbnailer and so on */
   file = g_file_new_for_commandline_arg (mrl);
 
-  /* If giosrc isn't available, try to get the MRL's local path */
-  if (gst_default_registry_check_feature_version ("gio", 0, 10, 0) != FALSE)
+  /* Only use the URI when FUSE isn't available for a file */
+  path = g_file_get_path (file);
+  if (path) {
+    bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
+    g_free (path);
+  } else {
     bvw->com->mrl = g_file_get_uri (file);
-  else {
-    char *path;
-
-    path = g_file_get_path (file);
-    if (path) {
-      bvw->com->mrl = g_filename_to_uri (path, NULL, NULL);
-      g_free (path);
-    }
   }
 
   g_object_unref (file);