rhythmbox r5709 - in trunk: . shell

[jmatthew svn gnome org]

Author: jmatthew
Date: Mon May 26 10:45:26 2008
New Revision: 5709
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5709&view=rev

Log:
2008-05-26  Jonathan Matthew  <jonathan d14n org>

	* shell/rb-shell-player.c: (rb_shell_player_constructor),
	(rb_shell_player_handle_eos_unlocked),
	(rb_shell_player_set_playing_time):
	Revert some changes I accidentally committed.


Modified:
   trunk/ChangeLog
   trunk/shell/rb-shell-player.c

Modified: trunk/shell/rb-shell-player.c
==============================================================================
--- trunk/shell/rb-shell-player.c	(original)
+++ trunk/shell/rb-shell-player.c	Mon May 26 10:45:26 2008
@@ -178,9 +178,6 @@
 						  gboolean from_eos,
 						  gboolean allow_stop,
 						  GError **error);
-static void rb_shell_player_slider_dragging_cb (GObject *header,
-						GParamSpec *pspec,
-						RBShellPlayer *player);
 
 
 
@@ -554,10 +551,6 @@
 	player->priv->header_widget = rb_header_new (player, player->priv->db);
 	gtk_widget_show (GTK_WIDGET (player->priv->header_widget));
 	gtk_box_pack_start (GTK_BOX (player), GTK_WIDGET (player->priv->header_widget), TRUE, TRUE, 0);
-	g_signal_connect_object (player->priv->header_widget,
-				 "notify::slider-dragging",
-				 G_CALLBACK (rb_shell_player_slider_dragging_cb),
-				 player, 0);
 
 	gtk_action_group_add_actions (player->priv->actiongroup,
 				      rb_shell_player_actions,
@@ -704,7 +697,6 @@
 	RhythmDBEntry *playing_entry;
 	RBSource *source;
 	gboolean update_stats;
-	gboolean dragging;
 
 	source = player->priv->current_playing_source;
 
@@ -726,14 +718,6 @@
 		return;
 	}
 
-	/* defer EOS handling while the position slider is being dragged */
-	g_object_get (player->priv->header_widget, "slider-dragging", &dragging, NULL);
-	if (dragging) {
-		rb_debug ("slider is dragging, will handle EOS (if applicable) on release");
-		player->priv->playing_entry_eos = TRUE;
-		return;
-	}
-
 	update_stats = FALSE;
 	switch (rb_source_handle_eos (source)) {
 	case RB_SOURCE_EOF_ERROR:
@@ -819,22 +803,6 @@
 }
 
 static void
-rb_shell_player_slider_dragging_cb (GObject *header, GParamSpec *pspec, RBShellPlayer *player)
-{
-	gboolean drag;
-
-	g_object_get (player->priv->header_widget, "slider-dragging", &drag, NULL);
-	rb_debug ("slider dragging? %d", drag);
-
-	/* if an EOS occurred while dragging, process it now */
-	if (drag == FALSE && player->priv->playing_entry_eos) {
-		rb_debug ("processing EOS delayed due to slider dragging");
-		player->priv->playing_entry_eos = FALSE;
-		rb_shell_player_handle_eos_unlocked (player, rb_shell_player_get_playing_entry (player), FALSE);
-	}
-}
-
-static void
 rb_shell_player_handle_eos (RBPlayer *player,
 			    RhythmDBEntry *entry,
 			    RBShellPlayer *shell_player)
@@ -2988,10 +2956,6 @@
 				  GError **error)
 {
 	if (rb_player_seekable (player->priv->mmplayer)) {
-		if (player->priv->playing_entry_eos) {
-			rb_debug ("forgetting that playing entry had EOS'd due to seek");
-			player->priv->playing_entry_eos = FALSE;
-		}
 		rb_player_set_time (player->priv->mmplayer, (long) time);
 		return TRUE;
 	} else {