rhythmbox r5544 - in trunk: . plugins/coherence/upnp_coherence plugins/daap

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Jan 15 09:50:15 2008
New Revision: 5544
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5544&view=rev

Log:
2008-01-15  Jonathan Matthew  <jonathan d14n org>

	* plugins/coherence/upnp_coherence/MediaStore.py:
	* plugins/daap/rb-daap-share.c: (add_entry_to_mlcl):
	Don't send hidden entries to DAAP or UPnP clients.  Fixes #509148.


Modified:
   trunk/ChangeLog
   trunk/plugins/coherence/upnp_coherence/MediaStore.py
   trunk/plugins/daap/rb-daap-share.c

Modified: trunk/plugins/coherence/upnp_coherence/MediaStore.py
==============================================================================
--- trunk/plugins/coherence/upnp_coherence/MediaStore.py	(original)
+++ trunk/plugins/coherence/upnp_coherence/MediaStore.py	Tue Jan 15 09:50:15 2008
@@ -206,6 +206,8 @@
 		tracks = []
 
 		def track_cb (entry):
+			if self.db.entry_get (entry, rhythmdb.PROP_HIDDEN):
+				return
 			id = self.db.entry_get (entry, rhythmdb.PROP_ENTRY_ID)
 			tracks.append(Track(self, id))
 		self.db.entry_foreach_by_type (self.db.entry_type_get_by_name('song'), track_cb)

Modified: trunk/plugins/daap/rb-daap-share.c
==============================================================================
--- trunk/plugins/daap/rb-daap-share.c	(original)
+++ trunk/plugins/daap/rb-daap-share.c	Tue Jan 15 09:50:15 2008
@@ -993,6 +993,9 @@
 	GNode *mlit;
 	gint id;
 
+	if (rhythmdb_entry_get_boolean (entry, RHYTHMDB_PROP_HIDDEN))
+		return;
+
 	id = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_ENTRY_ID);
 	mlit = rb_daap_structure_add (mb->mlcl, RB_DAAP_CC_MLIT);