* $Id$
*
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
+ * Antoine Cellerier <dionoea -@T- videolan -d.t- 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
/*****************************************************************************
* Includes
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc_interaction.h>
+#include <vlc_playlist.h>
+#include <vlc_interface.h>
-#include <vlc/input.h>
-
-#include "network.h"
+#include <vlc_network.h>
#include <errno.h> /* ENOMEM */
************************************************************************/
#define MAX_LINE_LENGTH 256
-
+#define SHOUTCAST_BASE_URL "http/shout-winamp://www.shoutcast.com/sbin/newxml.phtml"
+#define SHOUTCAST_TV_BASE_URL "http/shout-winamp://www.shoutcast.com/sbin/newtvlister.phtml?alltv=1"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
/* Callbacks */
- static int Open ( vlc_object_t * );
+ static int Open ( vlc_object_t *, int );
+ static int OpenRadio ( vlc_object_t * );
+ static int OpenTV ( vlc_object_t * );
static void Close( vlc_object_t * );
-/// \bug Shortdesc too long
-#define LIMIT_TEXT N_("Maximum number of shoutcast servers to be listed")
-#define LIMIT_LONGTEXT LIMIT_TEXT
-
vlc_module_begin();
set_shortname( "Shoutcast");
- /// \bug Correct ?
set_description( _("Shoutcast radio listings") );
+ add_shortcut( "shoutcast" );
set_category( CAT_PLAYLIST );
set_subcategory( SUBCAT_PLAYLIST_SD );
- add_integer( "shoutcast-limit", 1000, NULL, LIMIT_TEXT,
- LIMIT_LONGTEXT, VLC_TRUE );
+ add_obsolete_integer( "shoutcast-limit" );
set_capability( "services_discovery", 0 );
- set_callbacks( Open, Close );
+ set_callbacks( OpenRadio, Close );
+
+ add_submodule();
+ set_shortname( "ShoutcastTV" );
+ set_description( _("Shoutcast TV listings") );
+ set_capability( "services_discovery", 0 );
+ set_callbacks( OpenTV, Close );
+ add_shortcut( "shoutcasttv" );
vlc_module_end();
struct services_discovery_sys_t
{
- /* playlist node */
- playlist_item_t *p_node;
- playlist_item_t *p_item;
- int i_limit;
+ input_item_t *p_input;
vlc_bool_t b_dialog;
};
+#define RADIO 0
+#define TV 1
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static void Run( services_discovery_t *p_sd );
+
/* Main functions */
- static void Run ( services_discovery_t *p_intf );
+static int OpenRadio( vlc_object_t *p_this )
+{
+ return Open( p_this, RADIO );
+}
+
+static int OpenTV( vlc_object_t *p_this )
+{
+ return Open( p_this, TV );
+}
/*****************************************************************************
* Open: initialize and create stuff
*****************************************************************************/
-static int Open( vlc_object_t *p_this )
+static int Open( vlc_object_t *p_this, int i_type )
{
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
- services_discovery_sys_t *p_sys = malloc(
- sizeof( services_discovery_sys_t ) );
-
- vlc_value_t val;
- playlist_t *p_playlist;
- playlist_view_t *p_view;
- playlist_item_t *p_item;
-
- char *psz_shoutcast_url;
- char *psz_shoutcast_title;
-
- p_sd->pf_run = Run;
+ DECMALLOC_ERR( p_sys, services_discovery_sys_t );
p_sd->p_sys = p_sys;
+ p_sd->pf_run = Run;
- /* Create our playlist node */
- p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
+ switch( i_type )
{
- msg_Warn( p_sd, "unable to find playlist, cancelling");
- return VLC_EGENERIC;
+ case TV:
+ p_sys->p_input = input_ItemNewExt( p_sd,
+ SHOUTCAST_TV_BASE_URL, _("Shoutcast TV"),
+ 0, NULL, -1 );
+ break;
+ case RADIO:
+ default:
+ p_sys->p_input = input_ItemNewExt( p_sd,
+ SHOUTCAST_BASE_URL, _("Shoutcast"),
+ 0, NULL, -1 );
+ break;
}
-
- p_sys->i_limit = config_GetInt( p_this->p_libvlc, "shoutcast-limit" );
- #define SHOUTCAST_BASE_URL "http/shout-b4s://www.shoutcast.com/sbin/xmllister.phtml?service=vlc&no_compress=1&limit="
- psz_shoutcast_url = (char *)malloc( strlen( SHOUTCAST_BASE_URL ) + 20 );
- psz_shoutcast_title = (char *)malloc( 6 + 20 );
-
- sprintf( psz_shoutcast_url, SHOUTCAST_BASE_URL "%d", p_sys->i_limit );
- sprintf( psz_shoutcast_title, "Top %d", p_sys->i_limit );
-
- p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
- p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
- _("Shoutcast"), p_view->p_root );
- p_item = playlist_ItemNew( p_playlist, psz_shoutcast_url,
- psz_shoutcast_title );
- free( psz_shoutcast_url );
- free( psz_shoutcast_title );
- 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_item = p_item;
- 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 );
-
+ input_ItemAddOption( p_sys->p_input, "no-playlist-autostart" );
return VLC_SUCCESS;
}
/*****************************************************************************
- * Close:
+ * Run:
*****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static void Run( services_discovery_t *p_sd )
{
- 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 );
- if( p_playlist )
- {
- playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );
- vlc_object_release( p_playlist );
- }
- free( p_sys );
+ services_discovery_AddItem( p_sd, p_sd->p_sys->p_input, NULL /* no category */ );
+
+ input_Read( pl_Yield(p_sd), p_sd->p_sys->p_input, VLC_FALSE );
}
/*****************************************************************************
- * Run: main thread
+ * Close:
*****************************************************************************/
-static void Run( services_discovery_t *p_sd )
+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_id = input_Read( p_sd, &p_sys->p_item->input, VLC_FALSE );
- int i_dialog_id;
-
- i_dialog_id = intf_UserProgress( p_sd, "Shoutcast" , "Connecting...", 0.0 );
-
- p_sys->b_dialog = VLC_TRUE;
- while( !p_sd->b_die )
- {
- input_thread_t *p_input = (input_thread_t *)vlc_object_get( p_sd,
- i_id );
-
- /* The Shoutcast server does not return a content-length so we
- * can't know where we are. Use the number of inserted items
- * as a hint */
- if( p_input != NULL )
- {
- int i_state = var_GetInteger( p_input, "state" );
- if( i_state == PLAYING_S )
- {
- float f_pos = (float)(p_sys->p_item->i_children)* 100.0 /
- (float)(p_sys->i_limit);
- intf_UserProgressUpdate( p_sd, i_dialog_id, "Downloading",
- f_pos );
- }
- vlc_object_release( p_input );
- }
- else if( p_sys->b_dialog )
- {
- p_sys->b_dialog = VLC_FALSE;
- intf_UserHide( p_sd, i_dialog_id );
- }
- msleep( 100000 );
- }
+ services_discovery_RemoveItem( p_sd, p_sys->p_input );
+ free( p_sys );
}
projects / vlc / blobdiff