/*****************************************************************************
* Includes
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-
-#include <vlc/input.h>
-
-#include "network.h"
+#include <vlc_playlist.h>
+#include <vlc_network.h>
#include <errno.h> /* ENOMEM */
add_string( "podcast-urls", NULL, NULL,
URLS_TEXT, URLS_LONGTEXT, VLC_FALSE );
+ change_autosave();
set_capability( "services_discovery", 0 );
set_callbacks( Open, Close );
struct services_discovery_sys_t
{
/* playlist node */
- playlist_item_t *p_node;
- input_thread_t *p_input;
+ input_thread_t **pp_input;
char **ppsz_urls;
int i_urls;
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
services_discovery_sys_t *p_sys = malloc(
sizeof( services_discovery_sys_t ) );
+
+ p_sys->i_urls = 0;
+ p_sys->ppsz_urls = NULL;
+ p_sys->pp_input = NULL;
+
+ p_sd->pf_run = Run;
+ p_sd->p_sys = p_sys;
- vlc_value_t val;
- playlist_t *p_playlist;
- playlist_view_t *p_view;
- playlist_item_t *p_item;
+ /* Give us a name */
+ services_discovery_SetLocalizedName( p_sd, _("Podcasts") );
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close:
+ *****************************************************************************/
+static void Close( vlc_object_t *p_this )
+{
+ services_discovery_t *p_sd = ( services_discovery_t* )p_this;
+ services_discovery_sys_t *p_sys = p_sd->p_sys;
+ int i;
+ for( i = 0; i < p_sys->i_urls; i++ )
+ {
+ if( p_sd->p_sys->pp_input[i] )
+ {
+ input_StopThread( p_sd->p_sys->pp_input[i] );
+ input_DestroyThread( p_sd->p_sys->pp_input[i] );
+ p_sd->p_sys->pp_input[i] = NULL;
+ }
+ }
+ free( p_sd->p_sys->pp_input );
+ for( i = 0; i < p_sys->i_urls; i++ ) free( p_sys->ppsz_urls[i] );
+ free( p_sys->ppsz_urls );
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * Run: main thread
+ *****************************************************************************/
+static void Run( services_discovery_t *p_sd )
+{
+ services_discovery_sys_t *p_sys = p_sd->p_sys;
int i, j;
char *psz_buf;
char *psz_tmp = psz_buf = var_CreateGetString( p_sd, "podcast-urls" );
i = 0;
- p_sys->i_urls = 1;
+ p_sys->i_urls = psz_buf[0] ? 1 : 0;
while( psz_buf[i] != 0 )
if( psz_buf[i++] == '|' )
p_sys->i_urls++;
p_sys->ppsz_urls[j] = strdup( psz_tmp );
free( psz_buf );
- p_sd->pf_run = Run;
- p_sd->p_sys = p_sys;
-
- /* Create our playlist node */
- p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Warn( p_sd, "unable to find playlist, cancelling");
- return VLC_EGENERIC;
- }
-
- p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
- p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
- _("Podcast"), p_view->p_root );
+ p_sys->pp_input = malloc( p_sys->i_urls * sizeof( input_thread_t * ) );
for( i = 0; i < p_sys->i_urls; i++ )
{
+ input_item_t *p_input;
asprintf( &psz_buf, "%s", p_sys->ppsz_urls[i] );
- p_item = playlist_ItemNew( p_playlist, psz_buf,
- p_sys->ppsz_urls[i] );
- free( psz_buf );
- playlist_ItemAddOption( p_item, "demux=podcast" );
- playlist_NodeAddItem( p_playlist, p_item,
- p_sys->p_node->pp_parents[0]->i_view,
- p_sys->p_node, PLAYLIST_APPEND,
- PLAYLIST_END );
-
- /* We need to declare the parents of the node as the same of the
- * parent's ones */
- playlist_CopyParents( p_sys->p_node, p_item );
- p_sys->p_input = input_CreateThread( p_playlist, &p_item->input );
+ p_input = input_ItemNewExt( p_sd, psz_buf,
+ p_sys->ppsz_urls[i], 0, NULL, -1 );
+ input_ItemAddOption( p_input, "demux=podcast" );
+ services_discovery_AddItem( p_sd, p_input, NULL /* no cat */ );
+ p_sys->pp_input[i] = input_CreateThread( p_sd, p_input );
}
-
- p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- vlc_object_release( p_playlist );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Close:
- *****************************************************************************/
-static void Close( vlc_object_t *p_this )
-{
- services_discovery_t *p_sd = ( services_discovery_t* )p_this;
- services_discovery_sys_t *p_sys = p_sd->p_sys;
- playlist_t *p_playlist = (playlist_t *) vlc_object_find( p_sd,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- int i;
- if( p_sd->p_sys->p_input )
- {
- input_StopThread( p_sd->p_sys->p_input );
- input_DestroyThread( p_sd->p_sys->p_input );
- vlc_object_detach( p_sd->p_sys->p_input );
- vlc_object_destroy( p_sd->p_sys->p_input );
- p_sd->p_sys->p_input = NULL;
- }
- if( p_playlist )
- {
- playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );
- vlc_object_release( p_playlist );
- }
- for( i = 0; i < p_sys->i_urls; i++ ) free( p_sys->ppsz_urls[i] );
- free( p_sys->ppsz_urls );
- free( p_sys );
-}
-
-/*****************************************************************************
- * Run: main thread
- *****************************************************************************/
-static void Run( services_discovery_t *p_sd )
-{
while( !p_sd->b_die )
{
- if( p_sd->p_sys->p_input &&
- ( p_sd->p_sys->p_input->b_eof || p_sd->p_sys->p_input->b_error ) )
+ int i;
+ for( i = 0; i < p_sd->p_sys->i_urls; i++ )
{
- input_StopThread( p_sd->p_sys->p_input );
- input_DestroyThread( p_sd->p_sys->p_input );
- vlc_object_detach( p_sd->p_sys->p_input );
- vlc_object_destroy( p_sd->p_sys->p_input );
- p_sd->p_sys->p_input = NULL;
+ if( p_sd->p_sys->pp_input[i] &&
+ ( p_sd->p_sys->pp_input[i]->b_eof
+ || p_sd->p_sys->pp_input[i]->b_error ) )
+ {
+ input_StopThread( p_sd->p_sys->pp_input[i] );
+ input_DestroyThread( p_sd->p_sys->pp_input[i] );
+ p_sd->p_sys->pp_input[i] = NULL;
+ }
}
msleep( 100000 );
}
projects / vlc / blobdiff