Remove dead code

modules/gui/qt4/dialogs/sout.cpp

@@ -31,11 +31,66 @@
 #endif
 
 #include "dialogs/sout.hpp"
-#include <vlc_streaming.h>
 
 #include <QString>
 #include <QFileDialog>
 
+struct streaming_account_t
+{
+    char *psz_username; /*< username of account */
+    char *psz_password; /*< password of account */
+};
+
+struct sout_gui_descr_t
+{
+    /* Access types */
+    bool b_local;   /*< local access module */
+    bool b_file;    /*< file access module */
+    bool b_http;    /*< http access module */
+    bool b_mms;     /*< mms access module */
+    bool b_rtp;     /*< rtp access module */
+    bool b_udp;     /*< udp access module */
+    bool b_dump;    /*< dump access module */
+    bool b_icecast; /*< icecast access module */
+
+    char *psz_file;     /*< filename */
+    char *psz_http;     /*< HTTP servername or ipaddress */
+    char *psz_mms;      /*< MMS servername or ipaddress */
+    char *psz_rtp;      /*< RTP servername or ipaddress */
+    char *psz_udp;      /*< UDP servername or ipaddress */
+    char *psz_icecast;  /*< Icecast servername or ipaddress*/
+
+    int32_t i_http;     /*< http port number */
+    int32_t i_mms;      /*< mms port number */
+    int32_t i_rtp;      /*< rtp port number */
+    int32_t i_udp;      /*< udp port number */
+    int32_t i_icecast;  /*< icecast port number */
+
+    /* Mux */
+    char *psz_mux;      /*< name of muxer to use in streaming */
+
+    /* Transcode */
+    bool b_soverlay; /*< enable burning overlay in the video */
+    char *psz_vcodec;   /*< video codec to use in transcoding */
+    char *psz_acodec;   /*< audio codec to use in transcoding */
+    char *psz_scodec;   /*< subtitle codec to use in transcoding */
+    int32_t i_vb;       /*< video bitrate to use in transcoding */
+    int32_t i_ab;       /*< audio bitrate to use in transcoding */
+    int32_t i_channels; /*< number of audio channels to use in transcoding */
+    float f_scale;      /*< scaling factor to use in transcoding */
+
+    /* Misc */
+    bool b_sap;   /*< send SAP announcement */
+    bool b_all_es;/*< send all elementary streams from source stream */
+    char *psz_group;    /*< SAP Group name */
+    char *psz_name;     /*< SAP name */
+    int32_t i_ttl;      /*< Time To Live (TTL) for network traversal */
+
+    /* Icecast */
+    char *psz_icecast_mountpoint;/*< path to Icecast mountpoint */
+    struct streaming_account_t sa_icecast;  /*< Icecast account information */
+};
+
 SoutDialog* SoutDialog::instance = NULL;
 
 SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,

modules/gui/qt4/dialogs/sout.hpp

@@ -29,7 +29,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_streaming.h>
 
 #include "ui/sout.h"
 #include "util/qvlcframe.hpp"

modules/misc/Modules.am

@@ -21,12 +21,11 @@ SOURCES_logger = logger.c
 SOURCES_vod_rtsp = rtsp.c
 SOURCES_gnutls = gnutls.c dhparams.h
 SOURCES_svg = svg.c
-SOURCES_profile_parser = profile_parser.c
 SOURCES_audioscrobbler = audioscrobbler.c
 SOURCES_inhibit = inhibit.c
 
 if ENABLE_SOUT
 libvlc_LTLIBRARIES += \
 	libvod_rtsp_plugin.la \
-	libprofile_parser_plugin.la
+	$(NULL)
 endif

modules/misc/profile_parser.c

-/*****************************************************************************
- * profile_parser.c : VLC Streaming Profile parser
- *****************************************************************************
- * Copyright (C) 2003-2006 the VideoLAN team
- * $Id$
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *          Gildas Bazin <gbazin@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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_stream.h>
-#include <vlc_streaming.h>
-#include "vlc_xml.h"
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-static int  Open ( vlc_object_t * );
-
-vlc_module_begin();
-    set_capability( "profile parser", 1 );
-    set_callbacks( Open, NULL );
-vlc_module_end();
-
-static int Open( vlc_object_t *p_this )
-{
-    profile_parser_t *p_parser = (profile_parser_t *)p_this->p_private;
-    stream_t *p_stream = stream_UrlNew( p_this, p_parser->psz_profile );
-    xml_t *p_xml;
-    xml_reader_t *p_reader;
-    int i_ret;
-    char *psz_elname = NULL;
-
-    /* Open the profile and get a XML reader from it */
-    if( !p_stream )
-    {
-        msg_Err( p_this, "failed to parse profile %s", p_parser->psz_profile );
-        return VLC_EGENERIC;
-    }
-    p_xml = xml_Create( p_this );
-    if( !p_xml ) return VLC_EGENERIC;
-    p_reader = xml_ReaderCreate( p_xml, p_stream );
-
-    if( xml_ReaderRead( p_reader ) != 1 ||
-        xml_ReaderNodeType( p_reader ) != XML_READER_STARTELEM )
-    {
-        msg_Err( p_this, "invalid file (invalid root)" );
-        return VLC_EGENERIC;
-    }
-
-    /* Here goes the real parsing */
-
-    while( (i_ret = xml_ReaderRead( p_reader ) ) == 1 )
-    {
-        int i_type = xml_ReaderNodeType( p_reader );
-        switch( i_type )
-        {
-        case -1:
-            /* ERROR : Bail out */
-            return -1;
-
-        case XML_READER_STARTELEM:
-            free( psz_elname );
-            psz_elname = xml_ReaderName( p_reader );
-            if( !psz_elname ) return VLC_EGENERIC;
-            printf( "<%s", psz_elname );
-            break;
-
-        case XML_READER_TEXT:
-            break;
-        case XML_READER_ENDELEM:
-            free( psz_elname );
-            psz_elname = xml_ReaderName( p_reader );
-            if( !psz_elname ) return VLC_EGENERIC;
-            printf( ">" );
-            break;
-        }
-    }
-
-    if( i_ret != 0 )
-    {
-        msg_Err( p_this, "parse error" );
-        return VLC_EGENERIC;
-    }
-
-    if( p_reader ) xml_ReaderDelete( p_xml, p_reader );
-    if( p_xml ) xml_Delete( p_xml );
-
-    return VLC_SUCCESS;
-}

src/Makefile.am

@@ -96,7 +96,6 @@ noinst_HEADERS = \
 	../include/vlc_network.h \
 	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
-	../include/vlc_streaming.h \
 	../include/vlc_tls.h \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
@@ -372,7 +371,6 @@ SOURCES_libvlc_sout = \
 	stream_output/stream_output.c \
 	stream_output/stream_output.h \
 	stream_output/announce.c \
-	stream_output/profiles.c \
 	stream_output/sap.c \
 	stream_output/sdp.c \
 	$(NULL)

src/stream_output/profiles.c

-/*****************************************************************************
- * profiles.c: Streaming profiles
- *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
- * $Id$
- *
- * Authors: Clément Stenac <zorglub@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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_streaming.h>
-#include <assert.h>
-
-#define MAX_CHAIN 32768
-#define CHAIN_APPEND( format, args... ) { \
-    memcpy( psz_temp, psz_output, MAX_CHAIN ); \
-    snprintf( psz_output, MAX_CHAIN - 1, "%s"  format , psz_temp, ## args ); }
-
-#define DUPM p_module->typed.p_duplicate
-#define STDM p_module->typed.p_std
-#define DISM p_module->typed.p_display
-#define TRAM p_module->typed.p_transcode
-
-/**********************************************************************
- * General chain manipulation
- **********************************************************************/
-/** Add a new duplicate element to a streaming chain
- * \return the new element
- */
-static sout_duplicate_t *streaming_ChainAddDup( sout_chain_t *p_chain )
-{
-    DECMALLOC_NULL( p_module, sout_module_t );
-    MALLOC_NULL( DUPM, sout_duplicate_t );
-    p_module->i_type = SOUT_MOD_DUPLICATE;
-    DUPM->i_children = 0;
-    DUPM->pp_children = NULL;
-    TAB_APPEND( p_chain->i_modules, p_chain->pp_modules, p_module );
-    return DUPM;
-}
-
-/** Add a new standard element to a streaming chain
- * \return the new element
- */
-static sout_std_t *streaming_ChainAddStd( sout_chain_t *p_chain,
-                                          const char *psz_access,
-                                          const char *psz_mux,
-                                          const char *psz_url )
-{
-    DECMALLOC_NULL( p_module, sout_module_t );
-    MALLOC_NULL( STDM, sout_std_t );
-    p_module->i_type = SOUT_MOD_STD;
-    STDM->psz_mux = strdup( psz_mux );
-    STDM->psz_access = strdup( psz_access );
-    STDM->psz_url = strdup( psz_url );
-    TAB_APPEND( p_chain->i_modules, p_chain->pp_modules, p_module );
-    return STDM;
-}
-
-/** Add a new display element to a streaming chain
- * \return the new element
- */
-static sout_display_t *streaming_ChainAddDisplay( sout_chain_t *p_chain )
-{
-    DECMALLOC_NULL( p_module, sout_module_t );
-    MALLOC_NULL( DISM, sout_display_t );
-    p_module->i_type = SOUT_MOD_DISPLAY;
-    TAB_APPEND( p_chain->i_modules, p_chain->pp_modules, p_module );
-    return DISM;
-}
-
-/** Add a new transcode element to a streaming chain
- * \return the new element
- */
-static sout_transcode_t *streaming_ChainAddTranscode( sout_chain_t *p_chain,
-                        char *psz_vcodec, char * psz_acodec, char * psz_scodec,
-                        int i_vb, float f_scale, int i_ab, int i_channels,
-                        bool b_soverlay, char *psz_additional )
-{
-    DECMALLOC_NULL( p_module, sout_module_t );
-    MALLOC_NULL( TRAM, sout_transcode_t );
-    p_module->i_type = SOUT_MOD_TRANSCODE;
-    memset( TRAM, 0, sizeof( sout_transcode_t ) );
-    assert( !( b_soverlay && psz_scodec ) );
-    if( psz_vcodec ) TRAM->psz_vcodec = strdup( psz_vcodec );
-    if( psz_acodec ) TRAM->psz_acodec = strdup( psz_acodec );
-    if( psz_scodec ) TRAM->psz_scodec = strdup( psz_scodec );
-    TRAM->i_vb = i_vb; TRAM->i_ab = i_ab; TRAM->f_scale = f_scale;
-    TRAM->i_channels = i_channels; TRAM->b_soverlay = b_soverlay;
-    if( psz_additional ) TRAM->psz_additional = strdup( psz_additional );
-    TAB_APPEND( p_chain->i_modules, p_chain->pp_modules, p_module );
-    return TRAM;
-}
-
-/** Add a new clean child chain to an existing duplicate element */
-static void streaming_DupAddChild( sout_duplicate_t *p_dup )
-{
-    assert( p_dup );
-    sout_chain_t * p_child = streaming_ChainNew();
-    TAB_APPEND( p_dup->i_children, p_dup->pp_children, p_child );
-}
-
-#define DUP_OR_CHAIN p_dup ? p_dup->pp_children[p_dup->i_children-1] : p_chain
-
-#define ADD_OPT( format, args... ) { \
-    char *psz_opt; asprintf( &psz_opt, format, ##args ); \
-    INSERT_ELEM( p_chain->ppsz_options, p_chain->i_options, p_chain->i_options,\
-                 psz_opt );\
-    free( psz_opt ); }
-
-/** Clean up a chain (recursively if it has some children) */
-static void streaming_ChainClean( sout_chain_t *p_chain )
-{
-    int i,j;
-    sout_module_t *p_module;
-    if( p_chain->i_modules )
-    {
-        for( i = p_chain->i_modules -1; i >= 0 ; i-- )
-        {
-            p_module = p_chain->pp_modules[i];
-            switch( p_module->i_type )
-            {
-            case SOUT_MOD_DUPLICATE:
-                if( DUPM->i_children == 0 ) break;
-                for( j = DUPM->i_children - 1 ; j >= 0; j-- )
-                    streaming_ChainClean( DUPM->pp_children[j] );
-                break;
-            case SOUT_MOD_STD:
-                FREENULL( STDM->psz_url );
-                FREENULL( STDM->psz_name );
-                FREENULL( STDM->psz_group );
-                break;
-            case SOUT_MOD_TRANSCODE:
-                FREENULL( TRAM->psz_vcodec );
-                FREENULL( TRAM->psz_acodec );
-                FREENULL( TRAM->psz_scodec );
-                FREENULL( TRAM->psz_venc );
-                FREENULL( TRAM->psz_aenc );
-                FREENULL( TRAM->psz_additional );
-                break;
-            }
-            REMOVE_ELEM( p_chain->pp_modules, p_chain->i_modules, i );
-            free( p_module );
-        }
-    }
-}
-
-/**********************************************************************
- * Parameters handling
- **********************************************************************/
-
-#define APPLY_PSZ( element, field ) case element: \
-streaming_ParameterApply( p_param, &p_module->field, NULL, NULL, NULL ); break;
-#define APPLY_INT( element, field ) case element: \
-streaming_ParameterApply( p_param, NULL, &p_module->field, NULL, NULL ); break;
-#define APPLY_FLOAT( element, field ) case element: \
-streaming_ParameterApply( p_param, NULL, NULL, &p_module->field, NULL ); break;
-#define APPLY_BOOL( element, field ) case element: \
-streaming_ParameterApply( p_param, NULL, NULL, NULL, &p_module->field ); break;
-
-/** Apply the parameters for the Std module. It will copy the values from
- * the parameters to the fields themselves
- */
-void streaming_StdParametersApply( sout_std_t *p_module )
-{
-    int i;
-    for( i = 0 ; i< p_module->i_params; i++ )
-    {
-        sout_param_t *p_param = p_module->pp_params[i];
-        switch( p_param->i_element )
-        {
-            APPLY_PSZ( PSZ_MUX, psz_mux );
-            APPLY_PSZ( PSZ_ACCESS, psz_access );
-            APPLY_PSZ( PSZ_URL, psz_url );
-            APPLY_PSZ( PSZ_NAME, psz_name );
-            APPLY_PSZ( PSZ_GROUP, psz_group );
-        }
-    }
-}
-
-/** Apply the parameters for the Transcode module. It will copy the values from
- * the parameters to the fields themselves
- */
-void streaming_TranscodeParametersApply( sout_transcode_t *p_module )
-{
-    int i;
-    for( i = 0 ; i< p_module->i_params; i++ )
-    {
-        sout_param_t *p_param = p_module->pp_params[i];
-        switch( p_param->i_element )
-        {
-            APPLY_INT( I_VB, i_vb ); APPLY_INT( I_AB, i_ab );
-            APPLY_INT( I_CHANNELS, i_channels ) ;
-            APPLY_FLOAT( F_SCALE, f_scale );
-            APPLY_BOOL( B_SOVERLAY, b_soverlay );
-            APPLY_PSZ( PSZ_VC, psz_vcodec );
-            APPLY_PSZ( PSZ_AC, psz_acodec );
-            APPLY_PSZ( PSZ_SC, psz_scodec );
-            APPLY_PSZ( PSZ_VE, psz_venc ); APPLY_PSZ( PSZ_AE, psz_aenc );
-        }
-    }
-}
-
-/** Apply a single parameter
- * \param p_param the parameter to apply
- * \param ppsz_dest target string, if param is a string
- * \param pi_dest target int, if param is an integer
- * \param pf_dest target float, if param is a float
- * \param pb_dest target bool, if param is a bool
- */
-void streaming_ParameterApply( sout_param_t *p_param, char **ppsz_dest,
-                             int *pi_dest, float *pf_dest, bool *pb_dest )
-{
-    /* Todo : Handle psz_string like formatting */
-    if( p_param->psz_string )
-    {
-        assert( ppsz_dest );
-        fprintf( stderr, "Unsupported !\n" );
-    }
-    else
-    {
-        switch( p_param->i_type )
-        {
-        case VLC_VAR_INTEGER:
-            assert( pi_dest );
-            *pi_dest = p_param->value.i_int;
-            break;
-        case VLC_VAR_FLOAT:
-            assert( pf_dest );
-            *pf_dest = p_param->value.f_float;
-            break;
-        case VLC_VAR_STRING:
-            assert( ppsz_dest );
-            free( *ppsz_dest );
-            *ppsz_dest = p_param->value.psz_string ?
-                                strdup( p_param->value.psz_string ) :
-                                NULL;
-            break;
-        case VLC_VAR_BOOL:
-            assert( pb_dest );
-            *pb_dest = p_param->value.b_bool;
-            break;
-        }
-    }
-}
-
-/**********************************************************************
- * Interaction with streaming GUI descriptors
- **********************************************************************/
-#define DO_ENABLE_ACCESS \
-    if( !strcmp( STDM->psz_access, "file" ) )\
-    { \
-        pd->b_file = true; pd->psz_file = strdup( STDM->psz_url ); \
-    } \
-    else if( !strcmp( STDM->psz_access, "http" ) )\
-    { \
-        pd->b_http = true; pd->psz_http = strdup( STDM->psz_url ); \
-    } \
-    else if( !strcmp( STDM->psz_access, "mms" ) )\
-    { \
-        pd->b_mms = true; pd->psz_mms = strdup( STDM->psz_url ); \
-    } \
-    else if( !strcmp( STDM->psz_access, "udp" ) )\
-    { \
-        pd->b_udp = true; pd->psz_udp = strdup( STDM->psz_url ); \
-    } \
-    else \
-    { \
-        msg_Err( p_this, "unahandled access %s", STDM->psz_access ); \
-    }
-
-#if 0
-/**
- * Try to convert a chain to a gui descriptor. This is only possible for
- * "simple" chains.
- * \param p_this vlc object
- * \param p_chain the source streaming chain
- * \param pd the destination gui descriptor object
- * \return TRUE if the conversion succeeded, false else
- */
-bool streaming_ChainToGuiDesc( vlc_object_t *p_this,
-                                  sout_chain_t *p_chain, sout_gui_descr_t *pd )
-{
-    int j, i_last = 0;
-    sout_module_t *p_module;
-    if( p_chain->i_modules == 0 || p_chain->i_modules > 2 ) return false;
-
-    if( p_chain->pp_modules[0]->i_type == SOUT_MOD_TRANSCODE )
-    {
-        if( p_chain->i_modules == 1 ) return false;
-        p_module = p_chain->pp_modules[0];
-        i_last++;
-
-        pd->b_soverlay = TRAM->b_soverlay;
-        pd->i_vb = TRAM->i_vb; pd->i_ab = TRAM->i_ab;
-        pd->i_channels = TRAM->i_channels; pd->f_scale = TRAM->f_scale;
-        if( TRAM->psz_vcodec ) pd->psz_vcodec = strdup( TRAM->psz_vcodec );
-        if( TRAM->psz_acodec ) pd->psz_acodec = strdup( TRAM->psz_acodec );
-        if( TRAM->psz_scodec ) pd->psz_scodec = strdup( TRAM->psz_scodec );
-    }
-    if( p_chain->pp_modules[i_last]->i_type == SOUT_MOD_DUPLICATE )
-    {
-        p_module = p_chain->pp_modules[i_last];
-
-        // Nothing allowed after duplicate. Duplicate mustn't be empty
-        if( p_chain->i_modules > i_last +1 || !DUPM->i_children )
-            return false;
-        for( j = 0 ; j<  DUPM->i_children ; j++ )
-        {
-            sout_chain_t *p_child = DUPM->pp_children[j];
-            if( p_child->i_modules != 1 ) return false;
-            p_module = p_child->pp_modules[0];
-            if( p_module->i_type == SOUT_MOD_STD )
-            {
-                DO_ENABLE_ACCESS
-            }
-            else if( p_module->i_type == SOUT_MOD_DISPLAY )
-                pd->b_local = true;
-            else if( p_module->i_type == SOUT_MOD_RTP )
-            {
-                msg_Err( p_this, "RTP unhandled" );
-                return false;
-            }
-        }
-        i_last++;
-    }
-    if( p_chain->pp_modules[i_last]->i_type == SOUT_MOD_STD )
-    {
-        p_module = p_chain->pp_modules[i_last];
-        DO_ENABLE_ACCESS;
-    }
-    else if( p_chain->pp_modules[i_last]->i_type == SOUT_MOD_DISPLAY )
-    {
-        pd->b_local = true;
-    }
-    else if( p_chain->pp_modules[i_last]->i_type == SOUT_MOD_RTP )
-    {
-        msg_Err( p_this, "RTP unhandled" );
-        return false;
-
-    }
-    return true;
-
-}
-#endif
-
-#define HANDLE_GUI_URL( type, access ) if( pd->b_##type ) { \
-        if( p_dup ) streaming_DupAddChild( p_dup ); \
-        if( pd->i_##type > 0 ) \
-        { \
-            char *psz_url; \
-            asprintf( &psz_url, "%s:%i", pd->psz_##type, pd->i_##type ); \
-            streaming_ChainAddStd( DUP_OR_CHAIN, access, pd->psz_mux,\
-                                   psz_url ); \
-            free( psz_url ); \
-        } \
-        else \
-        { \
-            streaming_ChainAddStd( DUP_OR_CHAIN, access, pd->psz_mux,\
-                                   pd->psz_##type );\
-        }\
-    }
-
-void streaming_GuiDescToChain( vlc_object_t *p_obj, sout_chain_t *p_chain,
-                               sout_gui_descr_t *pd )
-{
-    sout_duplicate_t *p_dup = NULL;
-    (void)p_obj;
-
-    /* Clean up the chain */
-    streaming_ChainClean( p_chain );
-
-    /* Transcode */
-    if( pd->psz_vcodec || pd->psz_acodec || pd->psz_scodec || pd->b_soverlay )
-    {
-        fprintf( stderr, "382 vcodec %s\n", pd->psz_vcodec );
-        streaming_ChainAddTranscode( p_chain, pd->psz_vcodec, pd->psz_acodec,
-                                     pd->psz_scodec, pd->i_vb, pd->f_scale,
-                                     pd->i_ab, pd->i_channels,
-                                     pd->b_soverlay, NULL );
-    }
-    /* #std{} */
-    if( pd->b_local + pd->b_file + pd->b_http + pd->b_mms + pd->b_rtp +
-        pd->b_udp + pd->b_icecast > 1 )
-    {
-        p_dup = streaming_ChainAddDup( p_chain );
-    }
-    if( pd->b_local )
-    {
-        if( p_dup ) streaming_DupAddChild( p_dup );
-        streaming_ChainAddDisplay( DUP_OR_CHAIN );
-    }
-    if( pd->b_file )
-    {
-        if( p_dup ) streaming_DupAddChild( p_dup );
-        streaming_ChainAddStd( DUP_OR_CHAIN, "file", pd->psz_mux,
-                               pd->psz_file );
-    }
-    if( pd->b_udp )
-    {
-        sout_std_t *p_std;
-        if( p_dup ) streaming_DupAddChild( p_dup );
-        if( pd->i_udp > 0 )
-        {
-            char *psz_url;
-            asprintf( &psz_url, "%s:%i", pd->psz_udp, pd->i_udp );
-            p_std = streaming_ChainAddStd( DUP_OR_CHAIN, "udp",
-                                           pd->psz_mux, psz_url );
-            free( psz_url );
-        }
-        else
-        {
-            p_std = streaming_ChainAddStd( DUP_OR_CHAIN, "udp",
-                                           pd->psz_mux, pd->psz_udp );
-        }
-        if( pd->i_ttl )
-            ADD_OPT( "ttl=%i", pd->i_ttl );
-        if( pd->b_sap )
-        {
-            pd->b_sap = true;
-            p_std->psz_name = strdup( pd->psz_name );
-            p_std->psz_group = pd->psz_group ? strdup( pd->psz_group ) : NULL;
-        }
-    }
-    if( pd->b_icecast )
-    {
-        sout_std_t *p_std;
-        char *psz_username;
-
-        if( p_dup ) streaming_DupAddChild( p_dup );
-
-        if( !strcmp( pd->sa_icecast.psz_username, "" ) )
-        {
-            asprintf( &psz_username, "%s", "" );
-        }
-        else
-        {
-            asprintf( &psz_username, "%s:%s@", pd->sa_icecast.psz_username,
-                      pd->sa_icecast.psz_password );
-        }
-        if( pd->i_icecast > 0 )
-        {
-            char *psz_url;
-            asprintf( &psz_url, "%s%s:%i%s", psz_username, pd->psz_icecast,
-                      pd->i_icecast, pd->psz_icecast_mountpoint );
-            p_std = streaming_ChainAddStd( DUP_OR_CHAIN, "shout",
-                                           pd->psz_mux, psz_url );
-            free( psz_url );
-        }
-        else
-        {
-            char *psz_url;
-            asprintf( &psz_url, "%s:%s@%s%s", pd->sa_icecast.psz_username,
-                      pd->sa_icecast.psz_password, pd->psz_icecast,
-                      pd->psz_icecast_mountpoint );
-            p_std = streaming_ChainAddStd( DUP_OR_CHAIN, "shout",
-                                           pd->psz_mux, psz_url );
-            free( psz_url );
-        }
-        free( psz_username );
-    }
-    HANDLE_GUI_URL( http, "http" )
-    HANDLE_GUI_URL( mms, "mms" )
-}
-#undef HANDLE_GUI_URL
-
-/**********************************************************************
- * Create a sout string from a chain
- **********************************************************************/
-static char * ChainToPsz( sout_chain_t *p_chain, bool b_root )
-{
-    int i, j;
-    char psz_output[MAX_CHAIN];
-    char psz_temp[MAX_CHAIN];
-    if( b_root ) sprintf( psz_output, "#" );
-    else psz_output[0] = '\0';
-
-    for( i = 0 ; i< p_chain->i_modules; i++ )
-    {
-        sout_module_t *p_module = p_chain->pp_modules[i];
-        switch( p_module->i_type )
-        {
-        case SOUT_MOD_DUPLICATE:
-            CHAIN_APPEND( "duplicate{" );
-            for( j = 0 ; j < DUPM->i_children ; j ++ )
-            {
-                char *psz_child = ChainToPsz( DUPM->pp_children[j], false);
-                fprintf(stderr, "child %s\n", psz_child);
-                CHAIN_APPEND( "dst=%s", psz_child );
-                free( psz_child );
-                if( j != DUPM->i_children - 1 ) CHAIN_APPEND( "," );
-            }
-            CHAIN_APPEND( "}" );
-            break;
-        case SOUT_MOD_TRANSCODE:
-            CHAIN_APPEND( "transcode{" );
-            if( TRAM->psz_vcodec )
-            {
-                CHAIN_APPEND( "vcodec=%s,vb=%i,scale=%f", TRAM->psz_vcodec,
-                                     TRAM->i_vb, TRAM->f_scale );
-                if( TRAM->psz_acodec || TRAM->psz_scodec || TRAM->b_soverlay )
-                    CHAIN_APPEND( "," );
-            }
-            if( TRAM->psz_acodec )
-            {
-                CHAIN_APPEND( "acodec=%s,ab=%i,channels=%i", TRAM->psz_acodec,
-                              TRAM->i_ab, TRAM->i_channels );
-                if( TRAM->psz_scodec || TRAM->b_soverlay )
-                    CHAIN_APPEND( "," );
-            }
-            assert( !(TRAM->psz_scodec && TRAM->b_soverlay) );
-            if( TRAM->psz_scodec )
-                CHAIN_APPEND( "scodec=%s", TRAM->psz_scodec) ;
-            if( TRAM->b_soverlay )
-                CHAIN_APPEND( "soverlay" );
-            CHAIN_APPEND( "}" );
-            break;
-
-        case SOUT_MOD_DISPLAY:
-            CHAIN_APPEND( "display" );
-            break;
-        case SOUT_MOD_STD:
-            CHAIN_APPEND( "std{access=%s,dst=%s,mux=%s}", STDM->psz_access,
-                          STDM->psz_url, STDM->psz_mux );
-            break;
-        }
-        if( i != p_chain->i_modules - 1 ) CHAIN_APPEND( ":" );
-    }
-    return strdup( psz_output );
-}
-
-char * streaming_ChainToPsz( sout_chain_t *p_chain )
-{
-    return ChainToPsz( p_chain, true );
-}
-
-/**********************************************************************
- * Handle streaming profiles
- **********************************************************************/
-
-#if 0
-/**
- * List the available profiles. Fills the pp_profiles list with preinitialized
- * values.
- * \param p_this vlc object
- * \param pi_profiles number of listed profiles
- * \param pp_profiles array of profiles
- */
-void streaming_ProfilesList( vlc_object_t *p_this, int *pi_profiles,
-                             streaming_profile_t **pp_profiles )
-{
-}
-
-
-/** Parse a profile */
-int streaming_ProfileParse( vlc_object_t *p_this,streaming_profile_t *p_profile,
-                            const char *psz_profile )
-{
-    module_t *p_module;
-    DECMALLOC_ERR( p_parser, profile_parser_t );
-    assert( p_profile ); assert( psz_profile );
-
-    p_parser->psz_profile = strdup( psz_profile );
-    p_parser->p_profile = p_profile;
-
-    p_this->p_private = (void *)p_parser;
-
-    /* And call the module ! All work is done now */
-    p_module = module_Need( p_this, "profile parser", "", true );
-    if( !p_module )
-    {
-        msg_Warn( p_this, "parsing profile failed" );
-        return VLC_EGENERIC;
-    }
-    return VLC_SUCCESS;
-}
-#endif