Changeset b52262672cba990293d6e202ddd626cc744a5e62

Show
Ignore:
Timestamp:
07/05/08 18:45:34 (2 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1215276334 +0300
git-parent:

[081c8d03ae3e16a8b38a0b4c39c9ce6d5edfa45b]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1215276300 +0300
Message:

Remove dead code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/gui/qt4/dialogs/sout.cpp

    r99fab90 rb522626  
    3232 
    3333#include "dialogs/sout.hpp" 
    34 #include <vlc_streaming.h> 
    3534 
    3635#include <QString> 
    3736#include <QFileDialog> 
     37 
     38struct streaming_account_t 
     39{ 
     40    char *psz_username; /*< username of account */ 
     41    char *psz_password; /*< password of account */ 
     42}; 
     43 
     44struct sout_gui_descr_t 
     45{ 
     46    /* Access types */ 
     47    bool b_local;   /*< local access module */ 
     48    bool b_file;    /*< file access module */ 
     49    bool b_http;    /*< http access module */ 
     50    bool b_mms;     /*< mms access module */ 
     51    bool b_rtp;     /*< rtp access module */ 
     52    bool b_udp;     /*< udp access module */ 
     53    bool b_dump;    /*< dump access module */ 
     54    bool b_icecast; /*< icecast access module */ 
     55 
     56    char *psz_file;     /*< filename */ 
     57    char *psz_http;     /*< HTTP servername or ipaddress */ 
     58    char *psz_mms;      /*< MMS servername or ipaddress */ 
     59    char *psz_rtp;      /*< RTP servername or ipaddress */ 
     60    char *psz_udp;      /*< UDP servername or ipaddress */ 
     61    char *psz_icecast;  /*< Icecast servername or ipaddress*/ 
     62 
     63    int32_t i_http;     /*< http port number */ 
     64    int32_t i_mms;      /*< mms port number */ 
     65    int32_t i_rtp;      /*< rtp port number */ 
     66    int32_t i_udp;      /*< udp port number */ 
     67    int32_t i_icecast;  /*< icecast port number */ 
     68 
     69    /* Mux */ 
     70    char *psz_mux;      /*< name of muxer to use in streaming */ 
     71 
     72    /* Transcode */ 
     73    bool b_soverlay; /*< enable burning overlay in the video */ 
     74    char *psz_vcodec;   /*< video codec to use in transcoding */ 
     75    char *psz_acodec;   /*< audio codec to use in transcoding */ 
     76    char *psz_scodec;   /*< subtitle codec to use in transcoding */ 
     77    int32_t i_vb;       /*< video bitrate to use in transcoding */ 
     78    int32_t i_ab;       /*< audio bitrate to use in transcoding */ 
     79    int32_t i_channels; /*< number of audio channels to use in transcoding */ 
     80    float f_scale;      /*< scaling factor to use in transcoding */ 
     81 
     82    /* Misc */ 
     83    bool b_sap;   /*< send SAP announcement */ 
     84    bool b_all_es;/*< send all elementary streams from source stream */ 
     85    char *psz_group;    /*< SAP Group name */ 
     86    char *psz_name;     /*< SAP name */ 
     87    int32_t i_ttl;      /*< Time To Live (TTL) for network traversal */ 
     88 
     89    /* Icecast */ 
     90    char *psz_icecast_mountpoint;/*< path to Icecast mountpoint */ 
     91    struct streaming_account_t sa_icecast;  /*< Icecast account information */ 
     92}; 
    3893 
    3994SoutDialog* SoutDialog::instance = NULL; 
  • modules/gui/qt4/dialogs/sout.hpp

    r3561b9b rb522626  
    3030 
    3131#include <vlc_common.h> 
    32 #include <vlc_streaming.h> 
    3332 
    3433#include "ui/sout.h" 
  • modules/misc/Modules.am

    rf4844c9 rb522626  
    2222SOURCES_gnutls = gnutls.c dhparams.h 
    2323SOURCES_svg = svg.c 
    24 SOURCES_profile_parser = profile_parser.c 
    2524SOURCES_audioscrobbler = audioscrobbler.c 
    2625SOURCES_inhibit = inhibit.c 
     
    2928libvlc_LTLIBRARIES += \ 
    3029    libvod_rtsp_plugin.la \ 
    31     libprofile_parser_plugin.la 
     30    $(NULL) 
    3231endif 
  • src/Makefile.am

    r91a4847 rb522626  
    9797    ../include/vlc_osd.h \ 
    9898    ../include/vlc_pgpkey.h \ 
    99     ../include/vlc_streaming.h \ 
    10099    ../include/vlc_tls.h \ 
    101100    ../include/vlc_update.h \ 
     
    373372    stream_output/stream_output.h \ 
    374373    stream_output/announce.c \ 
    375     stream_output/profiles.c \ 
    376374    stream_output/sap.c \ 
    377375    stream_output/sdp.c \