X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fb4s.c;h=f9d6c9ffc0522556bc5d6a8b9a3562ce796967cf;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=6f4eca3379c605462de34376afaab58036dee16e;hpb=0900f11014557ea895a290d2c1518d739f97a8b6;p=vlc

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index 6f4eca3379..f9d6c9ffc0 100644
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -24,11 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#include <vlc_demux.h>
+#include <vlc_interface.h>
 
 #include "playlist.h"
 #include "vlc_xml.h"
@@ -53,7 +52,7 @@ static int IsWhitespace( char *psz_string );
  *****************************************************************************/
 int E_(Import_B4S)( vlc_object_t *p_this )
 {
-    DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open", 
+    DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open",
                                       "using B4S playlist reader" );
     p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
     p_demux->p_sys->p_xml = NULL;
@@ -155,7 +154,7 @@ static int Demux( demux_t *p_demux )
         }
         else if( !strcmp( psz_name, "label" ) )
         {
-            playlist_ItemSetName( p_current, psz_value );
+            input_item_SetName( p_current_input, psz_value );
         }
         else
         {
@@ -258,18 +257,15 @@ static int Demux( demux_t *p_demux )
                     p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
                                                 0, NULL, -1 );
                     if( psz_now )
-                        vlc_meta_SetNowPlaying( p_input->p_meta, psz_now );
+                        input_item_SetNowPlaying( p_input, psz_now );
                     if( psz_genre )
-                        vlc_meta_SetGenre( p_input->p_meta, psz_genre );
+                        input_item_SetGenre( p_input, psz_genre );
                     if( psz_listeners )
                         msg_Err( p_playlist, "Unsupported meta listeners" );
                     if( psz_bitrate )
                         msg_Err( p_playlist, "Unsupported meta bitrate" );
 
-                    playlist_BothAddInput( p_playlist, p_input,
-                                           p_item_in_category,
-                                           PLAYLIST_APPEND | PLAYLIST_SPREPARSE,
-                                           PLAYLIST_END, NULL, NULL );
+                    input_ItemAddSubItem( p_current_input, p_input );
                     FREENULL( psz_name );
                     FREENULL( psz_mrl );
                     FREENULL( psz_genre );