/*****************************************************************************
* shout.c: Shoutcast services discovery module
*****************************************************************************
- * Copyright (C) 2005 VideoLAN (Centrale Réseaux) and its contributors
+ * 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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/vlc.h>
#include <vlc/intf.h>
+#include <vlc_interaction.h>
#include <vlc/input.h>
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-#define LIMIT_TEXT N_("Maximum number of shoutcast servers to be listed")
-#define LIMIT_LONGTEXT LIMIT_TEXT
+#define LIMIT_TEXT N_("Number of streams")
+/// \bug [String] -which would be listed + to list
+#define LIMIT_LONGTEXT N_("Maximum number of Shoutcast radio streams which " \
+ "would be listed.")
vlc_module_begin();
set_shortname( "Shoutcast");
{
/* playlist node */
playlist_item_t *p_node;
- input_thread_t *p_input;
-
+ playlist_item_t *p_item;
+ int i_limit;
+ vlc_bool_t b_dialog;
};
/*****************************************************************************
playlist_view_t *p_view;
playlist_item_t *p_item;
- int i_limit;
char *psz_shoutcast_url;
char *psz_shoutcast_title;
return VLC_EGENERIC;
}
- i_limit = config_GetInt( p_this->p_libvlc, "shoutcast-limit" );
- #define SHOUTCAST_BASE_URL "http/shout-b4s://shoutcast.com/sbin/xmllister.phtml?service=vlc&no_compress=1&limit="
+ 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", i_limit );
- sprintf( psz_shoutcast_title, "Top %d", i_limit );
+ 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,
/* 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_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 );
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_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 );
*****************************************************************************/
static void Run( services_discovery_t *p_sd )
{
+ 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 )
{
- if( p_sd->p_sys->p_input &&
- ( p_sd->p_sys->p_input->b_eof || p_sd->p_sys->p_input->b_error ) )
+ 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)* 2 *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 )
{
- 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;
+ p_sys->b_dialog = VLC_FALSE;
+ intf_UserHide( p_sd, i_dialog_id );
}
- msleep( 100000 );
+ msleep( 10000 );
}
}