[vlc-devel] commit: Revert "service_discovery: Remove an uneeded hack." (Pierre d' Herbemont )

git version control git at videolan.org
Sun Jun 1 14:38:37 CEST 2008


vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sun Jun  1 14:40:13 2008 +0200| [ca12c6bb9fffe9dee9442c5f57c8ad620e4c9c4d]

Revert "service_discovery: Remove an uneeded hack."

This reverts commit e31c7798f239aa6ea94c8ba302c663405d4d9a27.

Damned, this is a hack to display psz_cat in the playlist.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ca12c6bb9fffe9dee9442c5f57c8ad620e4c9c4d
---

 src/playlist/services_discovery.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index e7d9249..6f3cda6 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -219,6 +219,22 @@ static void playlist_sd_item_added( const vlc_event_t * p_event, void * user_dat
                 p_input->psz_name ? p_input->psz_name : "(null)",
                 psz_cat ? psz_cat : "(null)" );
 
+    /* If p_parent is in root category (this is clearly a hack) and we have a cat */
+    if( !EMPTY_STR(psz_cat) &&
+        p_parent->p_parent == p_parent->p_playlist->p_root_category )
+    {
+        /* */
+        playlist_item_t * p_cat;
+        p_cat = playlist_ChildSearchName( p_parent, psz_cat );
+        if( !p_cat )
+        {
+            p_cat = playlist_NodeCreate( p_parent->p_playlist, psz_cat,
+                                         p_parent, 0, NULL );
+            p_cat->i_flags &= ~PLAYLIST_SKIP_FLAG;
+        }
+        p_parent = p_cat;
+    }
+
     p_new_item = playlist_NodeAddInput( p_parent->p_playlist, p_input, p_parent,
                                         PLAYLIST_APPEND, PLAYLIST_END, false );
     if( p_new_item )




More information about the vlc-devel mailing list