totem r5428 - in trunk: . src src/plugins/youtube

[hadess svn gnome org]

Author: hadess
Date: Sun May 25 13:55:10 2008
New Revision: 5428
URL: http://svn.gnome.org/viewvc/totem?rev=5428&view=rev

Log:
2008-05-25  Bastien Nocera  <hadess hadess net>

	* src/totem.c (on_playlist_change_name): Remove unused variables,
	spotted by Philip Withnall <pwithnall svn gnome org>



Modified:
   trunk/ChangeLog
   trunk/src/plugins/youtube/youtube.py
   trunk/src/totem.c

Modified: trunk/src/plugins/youtube/youtube.py
==============================================================================
--- trunk/src/plugins/youtube/youtube.py	(original)
+++ trunk/src/plugins/youtube/youtube.py	Sun May 25 13:55:10 2008
@@ -59,7 +59,8 @@
 				registry = gst.registry_get_default ()
 				if registry.find_plugin ("flvdemux") == None or registry.find_plugin ("soup") == None:
 					"""This means an error will be displayed when they try to play anything"""
-					self.gstreamer_plugins_present = False
+					self.gstreamer_plugins_present = True
+#					self.gstreamer_plugins_present = False
 			except ImportError:
 				"""Do nothing; either it's using xine or python-gstreamer isn't installed"""
 
@@ -173,7 +174,7 @@
 		location = self.check_url_for_redirects ("/v/" + urllib.quote (youtube_id))
 
 		if location != False:
-			mrl = "http://www.youtube.com/get_video?video_id="; + urllib.quote (youtube_id) + "&t=" + urllib.quote (re.match (".*[?&]t=([^&]+)", location).groups ()[0])
+			mrl = "http://www.youtube.com/get_video?fmt=6&video_id="; + urllib.quote (youtube_id) + "&t=" + urllib.quote (re.match (".*[?&]t=([^&]+)", location).groups ()[0])
 			"""location_check = self.check_url_for_redirects (mrl)
 			if location_check != False:
 				mrl = location_check
@@ -193,7 +194,7 @@
 		youtube_id = model.get_value (iter, 3)
 
 		"""Open the video in the browser"""
-		os.spawnlp (os.P_NOWAIT, "xdg-open", "xdg-open", "http://www.youtube.com/watch?v="; + urllib.quote (youtube_id))
+		os.spawnlp (os.P_NOWAIT, "xdg-open", "xdg-open", "http://www.youtube.com/watch?fmt=6&v="; + urllib.quote (youtube_id))
 	def on_button_press_event (self, widget, event):
 		self.button_down = True
 	def on_button_release_event (self, widget, event):

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Sun May 25 13:55:10 2008
@@ -1664,7 +1664,7 @@
 static void
 on_playlist_change_name (TotemPlaylist *playlist, Totem *totem)
 {
-	char *name, *artist, *album, *title;
+	char *name;
 	gboolean cur;
 
 	if ((name = totem_playlist_get_current_title (playlist,