# HG changeset patch # User reimar # Date 1196601773 0 # Node ID c1d17bd6683cd2c422e295040bd0f18b3eb30dbf # Parent 92204ff32b2708a341c8f5bfbe729d708abda77c Mark all stream_info_t as const diff -r 92204ff32b27 -r c1d17bd6683c stream/asf_streaming.c --- a/stream/asf_streaming.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/asf_streaming.c Sun Dec 02 13:22:53 2007 +0000 @@ -870,7 +870,7 @@ return STREAM_OK; } -stream_info_t stream_info_asf = { +const stream_info_t stream_info_asf = { "mms and mms over http streaming", "null", "Bertrand, Reimar Doeffinger, Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/http.c --- a/stream/http.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/http.c Sun Dec 02 13:22:53 2007 +0000 @@ -954,7 +954,7 @@ } -stream_info_t stream_info_http1 = { +const stream_info_t stream_info_http1 = { "http streaming", "null", "Bertrand, Albeau, Reimar Doeffinger, Arpi?", @@ -965,7 +965,7 @@ 0 // Urls are an option string }; -stream_info_t stream_info_http2 = { +const stream_info_t stream_info_http2 = { "http streaming", "null", "Bertrand, Albeu, Arpi? who?", diff -r 92204ff32b27 -r c1d17bd6683c stream/pnm.c --- a/stream/pnm.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/pnm.c Sun Dec 02 13:22:53 2007 +0000 @@ -897,7 +897,7 @@ } -stream_info_t stream_info_pnm = { +const stream_info_t stream_info_pnm = { "RealNetworks pnm", "pnm", "Arpi, xine team", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream.c --- a/stream/stream.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream.c Sun Dec 02 13:22:53 2007 +0000 @@ -36,57 +36,57 @@ //#include "vcd_read_bincue.h" #ifdef HAVE_VCD -extern stream_info_t stream_info_vcd; +extern const stream_info_t stream_info_vcd; #endif #ifdef HAVE_CDDA -extern stream_info_t stream_info_cdda; +extern const stream_info_t stream_info_cdda; #endif #ifdef MPLAYER_NETWORK -extern stream_info_t stream_info_netstream; -extern stream_info_t stream_info_pnm; -extern stream_info_t stream_info_asf; -extern stream_info_t stream_info_rtsp; -extern stream_info_t stream_info_rtp; -extern stream_info_t stream_info_udp; -extern stream_info_t stream_info_http1; -extern stream_info_t stream_info_http2; +extern const stream_info_t stream_info_netstream; +extern const stream_info_t stream_info_pnm; +extern const stream_info_t stream_info_asf; +extern const stream_info_t stream_info_rtsp; +extern const stream_info_t stream_info_rtp; +extern const stream_info_t stream_info_udp; +extern const stream_info_t stream_info_http1; +extern const stream_info_t stream_info_http2; #endif #ifdef HAS_DVBIN_SUPPORT -extern stream_info_t stream_info_dvb; +extern const stream_info_t stream_info_dvb; #endif #ifdef USE_TV -extern stream_info_t stream_info_tv; +extern const stream_info_t stream_info_tv; #endif #ifdef USE_RADIO -extern stream_info_t stream_info_radio; +extern const stream_info_t stream_info_radio; #endif #ifdef HAVE_PVR -extern stream_info_t stream_info_pvr; +extern const stream_info_t stream_info_pvr; #endif #ifdef HAVE_FTP -extern stream_info_t stream_info_ftp; +extern const stream_info_t stream_info_ftp; #endif #ifdef HAVE_VSTREAM -extern stream_info_t stream_info_vstream; +extern const stream_info_t stream_info_vstream; #endif #ifdef USE_DVDNAV -extern stream_info_t stream_info_dvdnav; +extern const stream_info_t stream_info_dvdnav; #endif #ifdef LIBSMBCLIENT -extern stream_info_t stream_info_smb; +extern const stream_info_t stream_info_smb; #endif #ifdef STREAMING_LIVE555 -extern stream_info_t stream_info_sdp; -extern stream_info_t stream_info_rtsp_sip; +extern const stream_info_t stream_info_sdp; +extern const stream_info_t stream_info_rtsp_sip; #endif -extern stream_info_t stream_info_cue; -extern stream_info_t stream_info_null; -extern stream_info_t stream_info_mf; -extern stream_info_t stream_info_file; +extern const stream_info_t stream_info_cue; +extern const stream_info_t stream_info_null; +extern const stream_info_t stream_info_mf; +extern const stream_info_t stream_info_file; #ifdef USE_DVDREAD -extern stream_info_t stream_info_ifo; -extern stream_info_t stream_info_dvd; +extern const stream_info_t stream_info_ifo; +extern const stream_info_t stream_info_dvd; #endif static const stream_info_t* const auto_open_streams[] = { diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_cdda.c --- a/stream/stream_cdda.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_cdda.c Sun Dec 02 13:22:53 2007 +0000 @@ -382,7 +382,7 @@ free(p); } -stream_info_t stream_info_cdda = { +const stream_info_t stream_info_cdda = { "CDDA", "cdda", "Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_cue.c --- a/stream/stream_cue.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_cue.c Sun Dec 02 13:22:53 2007 +0000 @@ -591,7 +591,7 @@ return STREAM_OK; } -stream_info_t stream_info_cue = { +const stream_info_t stream_info_cue = { "CUE track", "cue", "Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_dvb.c --- a/stream/stream_dvb.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_dvb.c Sun Dec 02 13:22:53 2007 +0000 @@ -840,7 +840,7 @@ -stream_info_t stream_info_dvb = { +const stream_info_t stream_info_dvb = { "Dvb Input", "dvbin", "Nico", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_dvd.c --- a/stream/stream_dvd.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_dvd.c Sun Dec 02 13:22:53 2007 +0000 @@ -1110,7 +1110,7 @@ return open_s(stream, mode, dvd_priv, file_format); } -stream_info_t stream_info_dvd = { +const stream_info_t stream_info_dvd = { "DVD stream", "null", "", @@ -1121,7 +1121,7 @@ 1 // Urls are an option string }; -stream_info_t stream_info_ifo = { +const stream_info_t stream_info_ifo = { "DVD IFO input", "ifo", "Benjamin Zores", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_dvdnav.c --- a/stream/stream_dvdnav.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_dvdnav.c Sun Dec 02 13:22:53 2007 +0000 @@ -725,7 +725,7 @@ hl->ey = hlev.ey; } -stream_info_t stream_info_dvdnav = { +const stream_info_t stream_info_dvdnav = { "DVDNAV stream", "null", "", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_file.c --- a/stream/stream_file.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_file.c Sun Dec 02 13:22:53 2007 +0000 @@ -175,7 +175,7 @@ return STREAM_OK; } -stream_info_t stream_info_file = { +const stream_info_t stream_info_file = { "File", "file", "Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_ftp.c --- a/stream/stream_ftp.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_ftp.c Sun Dec 02 13:22:53 2007 +0000 @@ -458,7 +458,7 @@ return STREAM_OK; } -stream_info_t stream_info_ftp = { +const stream_info_t stream_info_ftp = { "File Transfer Protocol", "ftp", "Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_livedotcom.c --- a/stream/stream_livedotcom.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_livedotcom.c Sun Dec 02 13:22:53 2007 +0000 @@ -96,7 +96,7 @@ } -stream_info_t stream_info_rtsp_sip = { +const stream_info_t stream_info_rtsp_sip = { "standard RTSP and SIP", "RTSP and SIP", "Ross Finlayson", @@ -107,7 +107,7 @@ 0 // Urls are an option string }; -stream_info_t stream_info_sdp = { +const stream_info_t stream_info_sdp = { "SDP stream descriptor", "SDP", "Ross Finlayson", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_mf.c --- a/stream/stream_mf.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_mf.c Sun Dec 02 13:22:53 2007 +0000 @@ -34,7 +34,7 @@ return STREAM_OK; } -stream_info_t stream_info_mf = { +const stream_info_t stream_info_mf = { "Multiple files input", "mf", "Benjamin Zores, Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_nemesi.c --- a/stream/stream_nemesi.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_nemesi.c Sun Dec 02 13:22:53 2007 +0000 @@ -64,7 +64,7 @@ return STREAM_OK; } -stream_info_t stream_info_rtsp = { +const stream_info_t stream_info_rtsp = { "RTSP streaming", "rtsp", "Alessandro Molina", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_netstream.c --- a/stream/stream_netstream.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_netstream.c Sun Dec 02 13:22:53 2007 +0000 @@ -296,7 +296,7 @@ return STREAM_ERROR; } -stream_info_t stream_info_netstream = { +const stream_info_t stream_info_netstream = { "Net stream", "netstream", "Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_null.c --- a/stream/stream_null.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_null.c Sun Dec 02 13:22:53 2007 +0000 @@ -13,7 +13,7 @@ } -stream_info_t stream_info_null = { +const stream_info_t stream_info_null = { "Null stream", "null", "Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_pvr.c --- a/stream/stream_pvr.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_pvr.c Sun Dec 02 13:22:53 2007 +0000 @@ -1766,7 +1766,7 @@ return force_freq_step (pvr, step); } -stream_info_t stream_info_pvr = { +const stream_info_t stream_info_pvr = { "V4L2 MPEG Input (a.k.a PVR)", "pvr", "Benjamin Zores", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_radio.c --- a/stream/stream_radio.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_radio.c Sun Dec 02 13:22:53 2007 +0000 @@ -1252,7 +1252,7 @@ stream->priv=NULL; } -stream_info_t stream_info_radio = { +const stream_info_t stream_info_radio = { "Radio stream", "Radio", "Vladimir Voroshilov", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_rtp.c --- a/stream/stream_rtp.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_rtp.c Sun Dec 02 13:22:53 2007 +0000 @@ -103,7 +103,7 @@ return STREAM_OK; } -stream_info_t stream_info_rtp = { +const stream_info_t stream_info_rtp = { "MPEG over RTP streaming", "rtp", "Dave Chapman, Benjamin Zores", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_rtsp.c --- a/stream/stream_rtsp.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_rtsp.c Sun Dec 02 13:22:53 2007 +0000 @@ -167,7 +167,7 @@ return STREAM_OK; } -stream_info_t stream_info_rtsp = { +const stream_info_t stream_info_rtsp = { "RTSP streaming", "rtsp", "Benjamin Zores, Roberto Togni", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_smb.c --- a/stream/stream_smb.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_smb.c Sun Dec 02 13:22:53 2007 +0000 @@ -153,7 +153,7 @@ return STREAM_OK; } -stream_info_t stream_info_smb = { +const stream_info_t stream_info_smb = { "Server Message Block", "smb", "M. Tourne", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_tv.c --- a/stream/stream_tv.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_tv.c Sun Dec 02 13:22:53 2007 +0000 @@ -113,7 +113,7 @@ return STREAM_OK; } -stream_info_t stream_info_tv = { +const stream_info_t stream_info_tv = { "TV Input", "tv", "Benjamin Zores, Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_udp.c --- a/stream/stream_udp.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_udp.c Sun Dec 02 13:22:53 2007 +0000 @@ -95,7 +95,7 @@ return STREAM_OK; } -stream_info_t stream_info_udp = { +const stream_info_t stream_info_udp = { "MPEG over UDP streaming", "udp", "Dave Chapman, Benjamin Zores", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_vcd.c --- a/stream/stream_vcd.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_vcd.c Sun Dec 02 13:22:53 2007 +0000 @@ -176,7 +176,7 @@ return STREAM_OK; } -stream_info_t stream_info_vcd = { +const stream_info_t stream_info_vcd = { "Video CD", "vcd", "Albeu", diff -r 92204ff32b27 -r c1d17bd6683c stream/stream_vstream.c --- a/stream/stream_vstream.c Sun Dec 02 13:13:02 2007 +0000 +++ b/stream/stream_vstream.c Sun Dec 02 13:22:53 2007 +0000 @@ -167,7 +167,7 @@ return STREAM_OK; } -stream_info_t stream_info_vstream = { +const stream_info_t stream_info_vstream = { "vstream client", "vstream", "Joey",