/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <ctype.h> /* isspace() */
-
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#include <vlc_demux.h>
-#include <errno.h> /* ENOMEM */
#include "playlist.h"
#include "vlc_xml.h"
int E_(Import_podcast)( 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( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "podcast") )
- {
- ;
- }
- else
- {
+ if( !demux2_IsForced( p_demux, "podcast" ) )
return VLC_EGENERIC;
- }
- msg_Dbg( p_demux, "using podcast 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->psz_prefix = E_(FindPrefix)( p_demux );
- p_sys->p_playlist = NULL;
- p_sys->p_xml = NULL;
- p_sys->p_xml_reader = NULL;
+ STANDARD_DEMUX_INIT_MSG( "using podcast reader" );
+ p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
+ p_demux->p_sys->p_playlist = NULL;
+ p_demux->p_sys->p_xml = NULL;
+ p_demux->p_sys->p_xml_reader = NULL;
return VLC_SUCCESS;
}
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;
- vlc_bool_t b_play;
vlc_bool_t b_item = VLC_FALSE;
vlc_bool_t b_image = VLC_FALSE;
int i_ret;
char *psz_item_subtitle = NULL;
char *psz_item_summary = NULL;
int i_type;
+ input_item_t *p_input;
- p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Err( p_demux, "can't find playlist" );
- return -1;
- }
- p_sys->p_playlist = p_playlist;
-
- b_play = E_(FindItem)( p_demux, p_playlist, &p_current );
-
- playlist_ItemToNode( p_playlist, p_current );
- p_current->input.i_type = ITEM_TYPE_PLAYLIST;
+ INIT_PLAYLIST_STUFF;
p_xml = p_sys->p_xml = xml_Create( p_demux );
if( !p_xml ) return -1;
- psz_elname = stream_ReadLine( p_demux->s );
+/* psz_elname = stream_ReadLine( p_demux->s );
if( psz_elname ) free( psz_elname );
- psz_elname = 0;
+ psz_elname = 0;*/
p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
if( !p_xml_reader ) return -1;
}
case XML_READER_TEXT:
{
+#define SET_DATA( field, name ) else if( b_item == VLC_TRUE \
+ && !strcmp( psz_elname, name ) ) \
+ { \
+ field = strdup( psz_text ); \
+ }
char *psz_text = xml_ReaderValue( p_xml_reader );
/* item specific meta data */
if( b_item == VLC_TRUE && !strcmp( psz_elname, "title" ) )
{
psz_item_name = strdup( psz_text );
}
- else if( b_item == VLC_TRUE
- && !strcmp( psz_elname, "pubDate" ) )
- {
- psz_item_date = strdup( psz_text );
- }
else if( b_item == VLC_TRUE
&& ( !strcmp( psz_elname, "itunes:author" )
||!strcmp( psz_elname, "author" ) ) )
{ /* <author> isn't standard iTunes podcast stuff */
psz_item_author = strdup( psz_text );
}
- else if( b_item == VLC_TRUE
- && !strcmp( psz_elname, "itunes:category" ) )
- {
- psz_item_category = strdup( psz_text );
- }
- else if( b_item == VLC_TRUE
- && !strcmp( psz_elname, "itunes:duration" ) )
- {
- psz_item_duration = strdup( psz_text );
- }
- else if( b_item == VLC_TRUE
- && !strcmp( psz_elname, "itunes:keywords" ) )
- {
- psz_item_keywords = strdup( psz_text );
- }
- else if( b_item == VLC_TRUE
- && !strcmp( psz_elname, "itunes:subtitle" ) )
- {
- psz_item_subtitle = strdup( psz_text );
- }
else if( b_item == VLC_TRUE
&& ( !strcmp( psz_elname, "itunes:summary" )
||!strcmp( psz_elname, "description" ) ) )
{ /* <description> isn't standard iTunes podcast stuff */
psz_item_summary = strdup( psz_text );
}
+ SET_DATA( psz_item_date, "pubDate" )
+ SET_DATA( psz_item_category, "itunes:category" )
+ SET_DATA( psz_item_duration, "itunes:duration" )
+ SET_DATA( psz_item_keywords, "itunes:keywords" )
+ SET_DATA( psz_item_subtitle, "itunes:subtitle" )
/* toplevel meta data */
else if( b_item == VLC_FALSE && b_image == VLC_FALSE
&& !strcmp( psz_elname, "title" ) )
{
- playlist_ItemSetName( p_current, psz_text );
- }
- else if( b_item == VLC_FALSE && b_image == VLC_FALSE
- && !strcmp( psz_elname, "link" ) )
- {
- vlc_input_item_AddInfo( &(p_current->input),
- _("Meta-information"),
- _( "Podcast Link" ),
- "%s",
- psz_text );
- }
- else if( b_item == VLC_FALSE && b_image == VLC_FALSE
- && !strcmp( psz_elname, "copyright" ) )
- {
- vlc_input_item_AddInfo( &(p_current->input),
- _("Meta-information"),
- _( "Podcast Copyright" ),
- "%s",
- psz_text );
- }
- else if( b_item == VLC_FALSE && b_image == VLC_FALSE
- && !strcmp( psz_elname, "itunes:category" ) )
- {
- vlc_input_item_AddInfo( &(p_current->input),
- _("Meta-information"),
- _( "Podcast Category" ),
- "%s",
- psz_text );
- }
- else if( b_item == VLC_FALSE && b_image == VLC_FALSE
- && !strcmp( psz_elname, "itunes:keywords" ) )
- {
- vlc_input_item_AddInfo( &(p_current->input),
- _("Meta-information"),
- _( "Podcast Keywords" ),
- "%s",
- psz_text );
- }
- else if( b_item == VLC_FALSE && b_image == VLC_FALSE
- && !strcmp( psz_elname, "itunes:subtitle" ) )
- {
- vlc_input_item_AddInfo( &(p_current->input),
- _("Meta-information"),
- _( "Podcast Subtitle" ),
- "%s",
- psz_text );
+ input_item_SetName( p_current_input, psz_text );
}
+#define ADD_GINFO( info, name ) \
+ else if( !b_item && !b_image && !strcmp( psz_elname, name ) ) \
+ { \
+ input_ItemAddInfo( p_current_input, _("Podcast Info"), \
+ _( info ), "%s", psz_text ); \
+ }
+ ADD_GINFO( "Podcast Link", "link" )
+ ADD_GINFO( "Podcast Copyright", "copyright" )
+ ADD_GINFO( "Podcast Category", "itunes:category" )
+ ADD_GINFO( "Podcast Keywords", "itunes:keywords" )
+ ADD_GINFO( "Podcast Subtitle", "itunes:subtitle" )
+#undef ADD_GINFO
else if( b_item == VLC_FALSE && b_image == VLC_FALSE
&& ( !strcmp( psz_elname, "itunes:summary" )
||!strcmp( psz_elname, "description" ) ) )
{ /* <description> isn't standard iTunes podcast stuff */
- vlc_input_item_AddInfo( &(p_current->input),
- _("Meta-information"),
- _( "Podcast Summary" ),
- "%s",
- psz_text );
+ input_ItemAddInfo( p_current_input,
+ _( "Podcast Info" ), _( "Podcast Summary" ),
+ "%s", psz_text );
}
else
{
if( !psz_elname ) return -1;
if( !strcmp( psz_elname, "item" ) )
{
- p_item = playlist_ItemNew( p_playlist, psz_item_mrl,
- psz_item_name );
- if( p_item == NULL ) break;
- 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 );
-
- if( psz_item_date )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Publication Date" ),
- "%s",
- psz_item_date );
- }
- if( psz_item_author )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Author" ),
- "%s",
- psz_item_author );
- }
- if( psz_item_category )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Subcategory" ),
- "%s",
- psz_item_category );
- }
- if( psz_item_duration )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Duration" ),
- "%s",
- psz_item_duration );
- }
- if( psz_item_keywords )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Keywords" ),
- "%s",
- psz_item_keywords );
- }
- if( psz_item_subtitle )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Subtitle" ),
- "%s",
- psz_item_subtitle );
- }
- if( psz_item_summary )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Summary" ),
- "%s",
- psz_item_summary );
- }
+ p_input = input_ItemNewExt( p_playlist, psz_item_mrl,
+ psz_item_name, 0, NULL, -1 );
+ if( p_input == NULL ) break;
+#define ADD_INFO( info, field ) \
+ if( field ) { input_ItemAddInfo( p_input, \
+ _( "Podcast Info" ), _( info ), "%s", field ); }
+ ADD_INFO( "Podcast Publication Date", psz_item_date );
+ ADD_INFO( "Podcast Author", psz_item_author );
+ ADD_INFO( "Podcast Subcategory", psz_item_category );
+ ADD_INFO( "Podcast Duration", psz_item_duration );
+ ADD_INFO( "Podcast Keywords", psz_item_keywords );
+ ADD_INFO( "Podcast Subtitle", psz_item_subtitle );
+ ADD_INFO( "Podcast Summary", psz_item_summary );
+ ADD_INFO( "Podcast Type", psz_item_type );
if( psz_item_size )
{
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
+ input_ItemAddInfo( p_input,
+ _( "Podcast Info" ),
_( "Podcast Size" ),
"%s bytes",
psz_item_size );
}
- if( psz_item_type )
- {
- vlc_input_item_AddInfo( &p_item->input,
- _("Meta-information"),
- _( "Podcast Type" ),
- "%s",
- psz_item_type );
- }
-
-#define FREE(a) if( a ) free( a ); a = NULL;
- FREE( psz_item_name );
- FREE( psz_item_mrl );
- FREE( psz_item_size );
- FREE( psz_item_type );
- FREE( psz_item_date );
- FREE( psz_item_author );
- FREE( psz_item_category );
- FREE( psz_item_duration );
- FREE( psz_item_keywords );
- FREE( psz_item_subtitle );
- FREE( psz_item_summary );
-#undef FREE
-
+ input_ItemAddSubItem( p_current_input, p_input );
+ FREENULL( psz_item_name );
+ FREENULL( psz_item_mrl );
+ FREENULL( psz_item_size );
+ FREENULL( psz_item_type );
+ FREENULL( psz_item_date );
+ FREENULL( psz_item_author );
+ FREENULL( psz_item_category );
+ FREENULL( psz_item_duration );
+ FREENULL( psz_item_keywords );
+ FREENULL( psz_item_subtitle );
+ FREENULL( psz_item_summary );
b_item = VLC_FALSE;
}
else if( !strcmp( psz_elname, "image" ) )
msg_Warn( p_demux, "error while parsing data" );
}
- /* Go back and play the playlist */
- if( b_play && p_playlist->status.p_item &&
- p_playlist->status.p_item->i_children > 0 )
- {
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- p_playlist->status.i_view,
- p_playlist->status.p_item,
- p_playlist->status.p_item->pp_children[0] );
- }
-
- 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 )
projects / vlc / blobdiff