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)