return immediately in _rite if we already have a playlist, as we need to

2006-10-23  Bastien Nocera  <hadess@hadess.net>

	* browser-plugin/totemPlugin.cpp: return immediately in _rite if
	we already have a playlist, as we need to wait for it to be on-disk
	(Closes: #360592)

2006-10-23  Bastien Nocera  <hadess@hadess.net>

	* browser-plugin/totemPlugin.cpp: remove is_mimetype_supported call,
	it was to work-around the broken server in bug #355881, for which
	the work isn't finished anyway. Same code is still on HEAD
	(Closes: #364307)

2 files changed, 18 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 2aecdf85c..37fa76201 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-23  Bastien Nocera  <hadess@hadess.net>
+
+	* browser-plugin/totemPlugin.cpp: return immediately in _rite if
+	we already have a playlist, as we need to wait for it to be on-disk
+	(Closes: #360592)
+
+2006-10-23  Bastien Nocera  <hadess@hadess.net>
+
+	* browser-plugin/totemPlugin.cpp: remove is_mimetype_supported call,
+	it was to work-around the broken server in bug #355881, for which
+	the work isn't finished anyway. Same code is still on HEAD
+	(Closes: #364307)
+
 2006-10-17  Bastien Nocera  <hadess@hadess.net>
 
 	* src/plparse/totem-disc.c: (cd_cache_free): Don't close the
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index fc3ca4767..5b4f0b5b1 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -155,22 +155,6 @@ get_real_mimetype (const char *mimetype)
 }
 
 static gboolean
-is_mimetype_supported (const char *mimetype)
-{
-	const totemPluginMimeEntry *mimetypes;
-	PRUint32 count;
-
-	totemScriptablePlugin::PluginMimeTypes (&mimetypes, &count);
-
-	for (PRUint32 i = 0; i < count; ++i) {
-		if (strcmp (mimetypes[i].mimetype, mimetype) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
 is_supported_scheme (const char *url)
 {
 	if (url == NULL)
@@ -672,11 +656,6 @@ totem_plugin_new_stream (NPP instance,
 
 	D("plugin_new_stream type: %s url: %s", type, plugin->src);
 
-	if (is_mimetype_supported (type) == FALSE) {
-		 D("plugin_new_stream type: %s is not supported\n", type);
-		return NPERR_INVALID_PLUGIN_ERROR;
-	}
-
 	//FIXME need to find better semantics?
 	//what about saving the state, do we get confused?
 	if (g_str_has_prefix (plugin->src, "file://")) {
@@ -756,6 +735,11 @@ static int32 totem_plugin_write (NPP instance, NPStream *stream, int32 offset,
 	if (plugin == NULL)
 		return -1;
 
+	/* We already know it's a playlist, don't try to check it again
+	 * and just wait for it to be on-disk */
+	if (plugin->is_playlist != FALSE)
+		return len;
+
 	if (!plugin->player_pid) {
 		if (!plugin->stream) {
 			g_warning ("No stream in NPP_Write!?");