]> git.sesse.net Git - vlc/blobdiff - modules/demux/playlist/b4s.c
Removes trailing spaces. Removes tabs.
[vlc] / modules / demux / playlist / b4s.c
index a32d4ab8277fb705ebf023691b8795b16ba33627..f9d6c9ffc0522556bc5d6a8b9a3562ce796967cf 100644 (file)
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * b4s.c : B4S playlist format import
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#include <vlc_demux.h>
+#include <vlc_interface.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include "playlist.h"
 #include "vlc_xml.h"
 
 struct demux_sys_t
 {
     char *psz_prefix;
-    playlist_t *p_playlist;
     xml_t *p_xml;
     xml_reader_t *p_xml_reader;
-    int b_shout;
 };
 
 /*****************************************************************************
@@ -48,63 +44,31 @@ struct demux_sys_t
  *****************************************************************************/
 static int Demux( demux_t *p_demux);
 static int Control( demux_t *p_demux, int i_query, va_list args );
+//static char *GetNextToken(char *psz_cur_string);
 static int IsWhitespace( char *psz_string );
-static void ShoutcastAdd( playlist_t *p_playlist, playlist_item_t* p_genre,
-                          playlist_item_t *p_bitrate, playlist_item_t *p_item,
-                          char *psz_genre, char *psz_bitrate );
 
 /*****************************************************************************
  * Import_B4S: main import function
  *****************************************************************************/
-int Import_B4S( vlc_object_t *p_this )
+int E_(Import_B4S)( vlc_object_t *p_this )
 {
-    demux_t *p_demux = (demux_t *)p_this;
-    demux_sys_t *p_sys;
-
-    char    *psz_ext;
-
-    psz_ext = strrchr ( p_demux->psz_path, '.' );
-
-    if( ( psz_ext && !strcasecmp( psz_ext, ".b4s") ) ||
-        ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "b4s-open") ) ||
-        ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "shout-b4s") ) )
-    {
-        ;
-    }
-    else
-    {
-        return VLC_EGENERIC;
-    }
-    msg_Dbg( p_demux, "using b4s playlist import");
-
-    p_demux->pf_control = Control;
-    p_demux->pf_demux = Demux;
-    p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) );
-    if( p_sys == NULL )
-    {
-        msg_Err( p_demux, "Out of memory" );
-        return VLC_ENOMEM;
-    }
-    p_sys->b_shout = p_demux->psz_demux &&
-        !strcmp(p_demux->psz_demux, "shout-b4s");
-    p_sys->psz_prefix = FindPrefix( p_demux );
-    p_sys->p_playlist = NULL;
-    p_sys->p_xml = NULL;
-    p_sys->p_xml_reader = NULL;
-
+    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;
+    p_demux->p_sys->p_xml_reader = NULL;
     return VLC_SUCCESS;
 }
 
 /*****************************************************************************
  * Deactivate: frees unused data
  *****************************************************************************/
-void Close_B4S( vlc_object_t *p_this )
+void E_(Close_B4S)( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
     if( p_sys->psz_prefix ) free( p_sys->psz_prefix );
-    if( p_sys->p_playlist ) vlc_object_release( p_sys->p_playlist );
     if( p_sys->p_xml_reader ) xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader );
     if( p_sys->p_xml ) xml_Delete( p_sys->p_xml );
     free( p_sys );
@@ -113,44 +77,18 @@ void Close_B4S( vlc_object_t *p_this )
 static int Demux( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    playlist_t *p_playlist;
-    playlist_item_t *p_item, *p_current, *p_bitrate, *p_genre;
-
-    vlc_bool_t b_play;
     int i_ret;
 
     xml_t *p_xml;
     xml_reader_t *p_xml_reader;
     char *psz_elname = NULL;
-    int i_type, b_shoutcast;
+    int i_type;
+    input_item_t *p_input;
     char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL;
     char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL;
-        
 
-    b_shoutcast = p_sys->b_shout;
-    
-    p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
-                                                 FIND_PARENT );
-    if( !p_playlist )
-    {
-        msg_Err( p_demux, "can't find playlist" );
-        return -1;
-    }
-    p_sys->p_playlist = p_playlist;
-
-    b_play = FindItem( p_demux, p_playlist, &p_current );
+    INIT_PLAYLIST_STUFF;
 
-    playlist_ItemToNode( p_playlist, p_current );
-    p_current->input.i_type = ITEM_TYPE_PLAYLIST;
-    if( b_shoutcast )
-    {
-        p_genre = playlist_NodeCreate( p_playlist, p_current->pp_parents[0]->i_view, "Genre", p_current );
-        playlist_CopyParents( p_current, p_genre );
-
-        p_bitrate = playlist_NodeCreate( p_playlist, p_current->pp_parents[0]->i_view, "Bitrate", p_current );
-        playlist_CopyParents( p_current, p_bitrate );
-    }
-    
     p_xml = p_sys->p_xml = xml_Create( p_demux );
     if( !p_xml ) return -1;
 
@@ -167,6 +105,7 @@ static int Demux( demux_t *p_demux )
     if( xml_ReaderRead( p_xml_reader ) != 1 )
     {
         msg_Err( p_demux, "invalid file (no root node)" );
+        vlc_object_release( p_playlist );
         return -1;
     }
 
@@ -177,6 +116,7 @@ static int Demux( demux_t *p_demux )
         msg_Err( p_demux, "invalid root node %i, %s",
                  xml_ReaderNodeType( p_xml_reader ), psz_elname );
         if( psz_elname ) free( psz_elname );
+        vlc_object_release( p_playlist );
         return -1;
     }
     free( psz_elname );
@@ -214,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
         {
@@ -242,7 +182,7 @@ static int Demux( demux_t *p_demux )
                 if( psz_elname ) free( psz_elname );
                 psz_elname = xml_ReaderName( p_xml_reader );
                 if( !psz_elname ) return -1;
-                
+
 
                 // Read the attributes
                 while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
@@ -314,61 +254,24 @@ static int Demux( demux_t *p_demux )
                 if( !psz_elname ) return -1;
                 if( !strcmp( psz_elname, "entry" ) )
                 {
-                    p_item = playlist_ItemNew( p_playlist, psz_mrl, psz_name );
+                    p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
+                                                0, NULL, -1 );
                     if( psz_now )
-                    {
-                        vlc_input_item_AddInfo( &(p_item->input),
-                                                _("Meta-information"),
-                                                _( VLC_META_NOW_PLAYING ),
-                                                "%s",
-                                                psz_now );
-                    }
+                        input_item_SetNowPlaying( p_input, psz_now );
                     if( psz_genre )
-                    {
-                        vlc_input_item_AddInfo( &p_item->input,
-                                                _("Meta-information"),
-                                                _( VLC_META_GENRE ),
-                                                "%s",
-                                                psz_genre );
-                    }
+                        input_item_SetGenre( p_input, psz_genre );
                     if( psz_listeners )
-                    {
-                        vlc_input_item_AddInfo( &p_item->input,
-                                                _("Meta-information"),
-                                                _( "Listeners" ),
-                                                "%s",
-                                                psz_listeners );
-                    }
+                        msg_Err( p_playlist, "Unsupported meta listeners" );
                     if( psz_bitrate )
-                    {
-                        vlc_input_item_AddInfo( &p_item->input,
-                                                _("Meta-information"),
-                                                _( "Bitrate" ),
-                                                "%s",
-                                                psz_bitrate );
-                    }
-                    playlist_NodeAddItem( p_playlist, p_item,
-                                          p_current->pp_parents[0]->i_view,
-                                          p_current, PLAYLIST_APPEND,
-                                          PLAYLIST_END );
-
-                    /* We need to declare the parents of the node as the
-                     *                  * same of the parent's ones */
-                    playlist_CopyParents( p_current, p_item );
-                    
-                    vlc_input_item_CopyOptions( &p_current->input,
-                                                &p_item->input );
-                    if( b_shoutcast )
-                        ShoutcastAdd( p_playlist, p_genre, p_bitrate, p_item,
-                                      psz_genre, psz_bitrate );
-#define FREE(a) if( a ) free( a ); a = NULL;
-                    FREE( psz_name );
-                    FREE( psz_mrl );
-                    FREE( psz_genre );
-                    FREE( psz_bitrate );
-                    FREE( psz_listeners );
-                    FREE( psz_now );
-#undef FREE
+                        msg_Err( p_playlist, "Unsupported meta bitrate" );
+
+                    input_ItemAddSubItem( p_current_input, p_input );
+                    FREENULL( psz_name );
+                    FREENULL( psz_mrl );
+                    FREENULL( psz_genre );
+                    FREENULL( psz_bitrate );
+                    FREENULL( psz_listeners );
+                    FREENULL( psz_now );
                 }
                 free( psz_elname );
                 psz_elname = strdup("");
@@ -382,24 +285,9 @@ static int Demux( demux_t *p_demux )
     {
         msg_Warn( p_demux, "error while parsing data" );
     }
-    if( b_shoutcast )
-    {
-        vlc_mutex_lock( &p_playlist->object_lock );
-        playlist_NodeSort( p_playlist, p_bitrate, SORT_TITLE_NUMERIC, ORDER_NORMAL );
-        vlc_mutex_unlock( &p_playlist->object_lock );
-    }
 
-    /* Go back and play the playlist */
-    if( b_play )
-    {
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
-                          p_playlist->status.i_view,
-                          p_playlist->status.p_item, NULL );
-    }
-    
-    vlc_object_release( p_playlist );
-    p_sys->p_playlist = NULL;
-    return VLC_SUCCESS;
+    HANDLE_PLAY_AND_RELEASE;
+    return -1; /* Needed for correct operation of go back */
 }
 
 static int Control( demux_t *p_demux, int i_query, va_list args )
@@ -407,6 +295,29 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     return VLC_EGENERIC;
 }
 
+#if 0
+/**
+ * Get a in-string pointer to the start of the next token from a
+ * string terminating the pointer returned by a previous call.
+ *
+ * \param psz_cur_string The string to search for the token from
+ * \return a pointer to withing psz_cur_string, or NULL if no token
+ * was found
+ * \note The returned pointer may contain more than one
+ * token, Run GetNextToken once more to terminate the token properly
+ */
+static char *GetNextToken(char *psz_cur_string) {
+    while (*psz_cur_string && !isspace(*psz_cur_string))
+        psz_cur_string++;
+    if (!*psz_cur_string)
+        return NULL;
+    *psz_cur_string++ = '\0';
+    while (*psz_cur_string && isspace(*psz_cur_string))
+        psz_cur_string++;
+    return psz_cur_string;
+}
+#endif
+
 static int IsWhitespace( char *psz_string )
 {
     while( *psz_string )
@@ -420,38 +331,3 @@ static int IsWhitespace( char *psz_string )
     }
     return VLC_TRUE;
 }
-
-static void ShoutcastAdd( playlist_t *p_playlist, playlist_item_t* p_genre,
-                          playlist_item_t *p_bitrate, playlist_item_t *p_item,
-                          char *psz_genre, char *psz_bitrate )
-{
-    playlist_item_t *p_parent;
-    if( psz_bitrate )
-    {
-        playlist_item_t *p_copy = playlist_ItemCopy(p_playlist,p_item);
-        p_parent = playlist_ChildSearchName( p_bitrate, psz_bitrate );
-        if( !p_parent )
-        {
-            p_parent = playlist_NodeCreate( p_playlist, p_genre->pp_parents[0]->i_view, psz_bitrate,
-                                            p_bitrate );
-            playlist_CopyParents( p_bitrate, p_parent );
-        }
-        playlist_NodeAddItem( p_playlist, p_copy, p_parent->pp_parents[0]->i_view, p_parent, PLAYLIST_APPEND, PLAYLIST_END  );
-        playlist_CopyParents( p_parent, p_copy );
-
-    }
-
-    if( psz_genre )
-    {
-        playlist_item_t *p_copy = playlist_ItemCopy(p_playlist,p_item);
-        p_parent = playlist_ChildSearchName( p_genre, psz_genre );
-        if( !p_parent )
-        {
-            p_parent = playlist_NodeCreate( p_playlist, p_genre->pp_parents[0]->i_view, psz_genre,
-                                            p_genre );
-            playlist_CopyParents( p_genre, p_parent );
-        }
-        playlist_NodeAddItem( p_playlist, p_copy, p_parent->pp_parents[0]->i_view, p_parent, PLAYLIST_APPEND, PLAYLIST_END );
-        playlist_CopyParents( p_parent, p_copy );
-    }
-}