[patch] updated Rhythmbox patch

rhythmbox-0.8.3-corba-stuff.patch (text/plain), 4.47 KB, created by Alex Revo on 2004-07-10 03:28:32 UTC

diff -u --recursive rhythmbox-0.8.3/corba/Rhythmbox.idl rhythmbox-0.8.3/corba/Rhythmbox.idl
--- rhythmbox-0.8.3/corba/Rhythmbox.idl	2004-04-15 12:30:20.000000000 -0700
+++ rhythmbox-0.8.3/corba/Rhythmbox.idl	2004-05-25 20:59:28.455181584 -0700
@@ -39,16 +39,12 @@
 
 		long getPlayingTime ();         /* returns -1 if not playing */
 		void setPlayingTime (in long seconds);
+
+		void setRating (in long rating);
 	        
 		/* Available properties:
-		 * (repeat and shuffle should be pretty easy to make read-write
-		 *  instead of using the generic bonobo wrapper for gobject
-		 *  properties in rb-shell.c, one needs to write custom
-		 *  get/set functions for repeat/shuffle (as is currently
-		 *  done for song
-		 * 
-		 * repeat:     boolean, read-only, notification
-		 * shuffle:    boolean, read-only, notification
+		 * repeat:     boolean, read-write, notification
+		 * shuffle:    boolean, read-write, notification
 		 * play-order: string,  read-only, notification
 		 * playing:    boolean, read-only, notification
 		 * song:       SongInfo, read-only, notification
diff -u --recursive rhythmbox-0.8.3/shell/rb-shell.c rhythmbox-0.8.3/shell/rb-shell.c
--- rhythmbox-0.8.3/shell/rb-shell.c	2004-05-07 12:47:14.000000000 -0700
+++ rhythmbox-0.8.3/shell/rb-shell.c	2004-05-25 21:05:35.256419320 -0700
@@ -127,6 +127,8 @@
 static void rb_shell_corba_set_playing_time (PortableServer_Servant _servant,
 						   CORBA_long time, CORBA_Environment *ev);
 
+static void rb_shell_corba_set_rating (PortableServer_Servant _servant,
+					CORBA_long rating, CORBA_Environment *ev);
 static Bonobo_PropertyBag rb_shell_corba_get_player_properties (PortableServer_Servant _servant, CORBA_Environment *ev);
 
 static gboolean rb_shell_window_state_cb (GtkWidget *widget,
@@ -439,6 +441,7 @@
 	epv->next = rb_shell_corba_next;
 	epv->getPlayingTime = rb_shell_corba_get_playing_time;
 	epv->setPlayingTime = rb_shell_corba_set_playing_time;
+	epv->setRating = rb_shell_corba_set_rating;
 	epv->getPlayerProperties = rb_shell_corba_get_player_properties;
 
 	g_object_class_install_property (object_class,
@@ -881,6 +884,7 @@
 	PROP_VISIBILITY,
 	PROP_SONG,
 	PROP_SHUFFLE,
+	PROP_REPEAT,
 };
 
 
@@ -964,6 +968,15 @@
 		break;
 	}
 
+	case PROP_REPEAT:
+	{
+		gboolean shuffle, repeat;
+		rb_shell_player_get_playback_state (player,
+						    &shuffle, &repeat);
+		BONOBO_ARG_SET_BOOLEAN (arg, repeat);
+		break;
+	}
+
 	case PROP_SONG: {
 		GNOME_Rhythmbox_SongInfo *ret_val;
 		
@@ -1020,6 +1033,22 @@
 		break;
 	}
 
+	case PROP_REPEAT:
+	{
+		gboolean repeat;
+		gboolean shuffle;
+
+
+		rb_shell_player_get_playback_state (player, &shuffle,
+						    &repeat);
+		repeat = BONOBO_ARG_GET_BOOLEAN (arg);
+
+		rb_shell_player_set_playback_state (player,
+						    shuffle,
+						    repeat);
+		break;
+	}
+
 	default:
 		bonobo_exception_set (ev, ex_Bonobo_PropertyBag_NotFound);
 		break;
@@ -1064,7 +1093,13 @@
 		/* Manually install the other properties */
 		bonobo_property_bag_add (shell->priv->pb, "shuffle", 
 					 PROP_SHUFFLE, BONOBO_ARG_BOOLEAN, NULL, 
-					 _("Whether shuffle is enabled"), 0);
+					 _("Whether shuffle is enabled"), 
+					 (Bonobo_PROPERTY_READABLE | Bonobo_PROPERTY_WRITEABLE));
+
+		bonobo_property_bag_add (shell->priv->pb, "repeat", 
+					 PROP_REPEAT, BONOBO_ARG_BOOLEAN, NULL, 
+					 _("Whether repeat is enabled"), 
+					 (Bonobo_PROPERTY_READABLE | Bonobo_PROPERTY_WRITEABLE));
 
 		bonobo_property_bag_add (shell->priv->pb, "song", 
 					 PROP_SONG, TC_GNOME_Rhythmbox_SongInfo, NULL, 
@@ -1145,6 +1182,37 @@
 
 
 static void
+rb_shell_corba_set_rating (PortableServer_Servant _servant,
+				 CORBA_long rating, CORBA_Environment *ev)
+{
+	RBShell *shell = RB_SHELL (bonobo_object (_servant));
+	RhythmDBEntry *entry;
+	RhythmDB *db = shell->priv->db;
+	RBEntryView *view;
+	RBSource *playing_source;
+	GValue value = {0, };
+
+	rb_debug ("got set rating");
+
+	g_value_init (&value, G_TYPE_DOUBLE);
+	g_value_set_double (&value, rating);
+
+	playing_source = rb_shell_player_get_playing_source (shell->priv->player_shell);
+	if (playing_source != NULL) {
+	    view = rb_source_get_entry_view (playing_source);
+	    g_object_get (G_OBJECT (view), "playing_entry", &entry, NULL);
+	    if (entry != NULL) {
+			rhythmdb_write_lock (db);
+			rhythmdb_entry_set (db, entry, RHYTHMDB_PROP_RATING, &value);
+			rhythmdb_write_unlock (db);
+	    }
+	}
+
+	g_value_unset (&value);
+}
+
+
+static void
 rb_shell_property_changed_generic_cb (GObject *object,
 				      GParamSpec *pspec, 
 				      RBShell *shell)