rpms/rhythmbox/F-8 rb-fix-lastfm-data-submission.patch, 1.1, 1.2 rhythmbox.spec, 1.154, 1.155

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9148

Modified Files:
	rb-fix-lastfm-data-submission.patch rhythmbox.spec 
Log Message:
* Fri May 02 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-11
- Update last.fm submission patch (#426046 again)


rb-fix-lastfm-data-submission.patch:

Index: rb-fix-lastfm-data-submission.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-8/rb-fix-lastfm-data-submission.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rb-fix-lastfm-data-submission.patch	1 Apr 2008 15:33:15 -0000	1.1
+++ rb-fix-lastfm-data-submission.patch	2 May 2008 11:14:27 -0000	1.2
@@ -1,6 +1,6 @@
---- rhythmbox-0.11.3.old/plugins/audioscrobbler/rb-audioscrobbler.c	2007-08-10 09:34:45.000000000 +0100
-+++ rhythmbox-0.11.3/plugins/audioscrobbler/rb-audioscrobbler.c	2008-04-01 16:30:45.000000000 +0100
-@@ -564,8 +564,8 @@ rb_audioscrobbler_add_to_queue (RBAudios
+--- rhythmbox-0.11.3/plugins/audioscrobbler/rb-audioscrobbler.c	2007-08-10 05:34:45.000000000 -0300
++++ rhythmbox-0.11.5/plugins/audioscrobbler/rb-audioscrobbler.c	2008-02-28 08:16:39.000000000 -0300
+@@ -564,8 +592,8 @@
  static void
  maybe_add_current_song_to_queue (RBAudioscrobbler *audioscrobbler)
  {
@@ -10,10 +10,12 @@
  	AudioscrobblerEntry *cur_entry;
  
  	cur_entry = audioscrobbler->priv->currently_playing;
-@@ -575,25 +575,30 @@ maybe_add_current_song_to_queue (RBAudio
- 
- 	rb_debug ("Adding currently playing song to queue");
+@@ -573,27 +601,30 @@
+ 		return;
+ 	}
  
+-	rb_debug ("Adding currently playing song to queue");
+-
 -	rb_shell_player_get_playing_time (audioscrobbler->priv->shell_player, &elapsed, NULL);
 -	elapsed_delta = elapsed - audioscrobbler->priv->current_elapsed;
 -	audioscrobbler->priv->current_elapsed = elapsed;
@@ -58,7 +60,7 @@
  	}
  }
  
-@@ -1274,6 +1279,7 @@ rb_audioscrobbler_song_changed_cb (RBShe
+@@ -1274,6 +1330,7 @@
  				   RhythmDBEntry *entry,
  				   RBAudioscrobbler *audioscrobbler)
  {
@@ -66,9 +68,14 @@
  	guint time;
  
  	if (audioscrobbler->priv->currently_playing != NULL) {
-@@ -1285,11 +1291,17 @@ rb_audioscrobbler_song_changed_cb (RBShe
+@@ -1282,14 +1339,22 @@
+ 	}
+ 
+ 	if (entry == NULL) {
++		rb_debug ("called with no playing entry");
  		return;
  	}
++	rb_debug ("new entry: %s", rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION));
  
 -	rb_shell_player_get_playing_time (audioscrobbler->priv->shell_player,
 -					  &time, NULL);
@@ -88,3 +95,50 @@
  		AudioscrobblerEntry *as_entry;
  		
  		/* even if it's the same song, it's being played again from
+--- rhythmbox-0.11.3/shell/rb-shell-player.c	2007-10-28 07:58:23.000000000 -0200
++++ rhythmbox-0.11.5/shell/rb-shell-player.c	2008-02-28 08:16:36.000000000 -0300
+@@ -2868,10 +2868,21 @@
+ 				  guint *time,
+ 				  GError **error)
+ {
+-	if (time != NULL)
+-		*time = (guint) rb_player_get_time (player->priv->mmplayer);
++	int ptime;
+ 
+-	return TRUE;
++	ptime = rb_player_get_time (player->priv->mmplayer);
++	if (ptime >= 0) {
++		if (time != NULL) {
++			*time = (guint)ptime;
++		}
++		return TRUE;
++	} else {
++		g_set_error (error,
++			     RB_SHELL_PLAYER_ERROR,
++			     RB_SHELL_PLAYER_ERROR_POSITION_NOT_AVAILABLE,
++			     _("Playback position not available"));
++		return FALSE;
++	}
+ }
+ 
+ gboolean
+@@ -3273,6 +3284,7 @@
+ 			ENUM_ENTRY (RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST, "End of playlist reached"),
+ 			ENUM_ENTRY (RB_SHELL_PLAYER_ERROR_NOT_PLAYING, "Not playing"),
+ 			ENUM_ENTRY (RB_SHELL_PLAYER_ERROR_NOT_SEEKABLE, "Not seekable"),
++			ENUM_ENTRY (RB_SHELL_PLAYER_ERROR_POSITION_NOT_AVAILABLE, "Playback position not available"),
+ 			{ 0, 0, 0 }
+ 		};
+ 
+--- rhythmbox-0.11.3/shell/rb-shell-player.h	2007-08-03 23:39:57.000000000 -0300
++++ rhythmbox-0.11.5/shell/rb-shell-player.h	2007-12-17 07:26:51.000000000 -0200
+@@ -44,7 +44,8 @@
+ 	RB_SHELL_PLAYER_ERROR_PLAYLIST_PARSE_ERROR,
+ 	RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST,
+ 	RB_SHELL_PLAYER_ERROR_NOT_PLAYING,
+-        RB_SHELL_PLAYER_ERROR_NOT_SEEKABLE,
++	RB_SHELL_PLAYER_ERROR_NOT_SEEKABLE,
++	RB_SHELL_PLAYER_ERROR_POSITION_NOT_AVAILABLE,
+ } RBShellPlayerError;
+ 
+ GType rb_shell_player_error_get_type (void);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-8/rhythmbox.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- rhythmbox.spec	1 Apr 2008 15:33:15 -0000	1.154
+++ rhythmbox.spec	2 May 2008 11:14:27 -0000	1.155
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -208,6 +208,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Fri May 02 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-11
+- Update last.fm submission patch (#426046 again)
+
 * Tue Apr 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-10
 - Add last.fm submission patch (#426046)