[MPlayer-cvslog] r25239 - in trunk/stream: asf_streaming.c http.c pnm.c stream.c stream_cdda.c stream_cue.c stream_dvb.c stream_dvd.c stream_dvdnav.c stream_file.c stream_ftp.c stream_livedotcom.c stream_mf.c stream_nemesi.c stream_netstream.c stream_null.c stream_pvr.c stream_radio.c stream_rtp.c stream_rtsp.c stream_smb.c stream_tv.c stream_udp.c stream_vcd.c stream_vstream.c
reimar
subversion at mplayerhq.hu
Sun Dec 2 14:22:53 CET 2007
Author: reimar
Date: Sun Dec 2 14:22:53 2007
New Revision: 25239
Log:
Mark all stream_info_t as const
Modified:
trunk/stream/asf_streaming.c
trunk/stream/http.c
trunk/stream/pnm.c
trunk/stream/stream.c
trunk/stream/stream_cdda.c
trunk/stream/stream_cue.c
trunk/stream/stream_dvb.c
trunk/stream/stream_dvd.c
trunk/stream/stream_dvdnav.c
trunk/stream/stream_file.c
trunk/stream/stream_ftp.c
trunk/stream/stream_livedotcom.c
trunk/stream/stream_mf.c
trunk/stream/stream_nemesi.c
trunk/stream/stream_netstream.c
trunk/stream/stream_null.c
trunk/stream/stream_pvr.c
trunk/stream/stream_radio.c
trunk/stream/stream_rtp.c
trunk/stream/stream_rtsp.c
trunk/stream/stream_smb.c
trunk/stream/stream_tv.c
trunk/stream/stream_udp.c
trunk/stream/stream_vcd.c
trunk/stream/stream_vstream.c
Modified: trunk/stream/asf_streaming.c
==============================================================================
--- trunk/stream/asf_streaming.c (original)
+++ trunk/stream/asf_streaming.c Sun Dec 2 14:22:53 2007
@@ -870,7 +870,7 @@ static int open_s(stream_t *stream,int m
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",
Modified: trunk/stream/http.c
==============================================================================
--- trunk/stream/http.c (original)
+++ trunk/stream/http.c Sun Dec 2 14:22:53 2007
@@ -954,7 +954,7 @@ static int open_s2(stream_t *stream,int
}
-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 @@ stream_info_t stream_info_http1 = {
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?",
Modified: trunk/stream/pnm.c
==============================================================================
--- trunk/stream/pnm.c (original)
+++ trunk/stream/pnm.c Sun Dec 2 14:22:53 2007
@@ -897,7 +897,7 @@ fail:
}
-stream_info_t stream_info_pnm = {
+const stream_info_t stream_info_pnm = {
"RealNetworks pnm",
"pnm",
"Arpi, xine team",
Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c (original)
+++ trunk/stream/stream.c Sun Dec 2 14:22:53 2007
@@ -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[] = {
Modified: trunk/stream/stream_cdda.c
==============================================================================
--- trunk/stream/stream_cdda.c (original)
+++ trunk/stream/stream_cdda.c Sun Dec 2 14:22:53 2007
@@ -382,7 +382,7 @@ static void close_cdda(stream_t* s) {
free(p);
}
-stream_info_t stream_info_cdda = {
+const stream_info_t stream_info_cdda = {
"CDDA",
"cdda",
"Albeu",
Modified: trunk/stream/stream_cue.c
==============================================================================
--- trunk/stream/stream_cue.c (original)
+++ trunk/stream/stream_cue.c Sun Dec 2 14:22:53 2007
@@ -591,7 +591,7 @@ static int open_s(stream_t *stream,int m
return STREAM_OK;
}
-stream_info_t stream_info_cue = {
+const stream_info_t stream_info_cue = {
"CUE track",
"cue",
"Albeu",
Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c (original)
+++ trunk/stream/stream_dvb.c Sun Dec 2 14:22:53 2007
@@ -840,7 +840,7 @@ dvb_config_t *dvb_get_config(void)
-stream_info_t stream_info_dvb = {
+const stream_info_t stream_info_dvb = {
"Dvb Input",
"dvbin",
"Nico",
Modified: trunk/stream/stream_dvd.c
==============================================================================
--- trunk/stream/stream_dvd.c (original)
+++ trunk/stream/stream_dvd.c Sun Dec 2 14:22:53 2007
@@ -1110,7 +1110,7 @@ ifo_stream_open (stream_t *stream, int m
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 @@ stream_info_t stream_info_dvd = {
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",
Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c (original)
+++ trunk/stream/stream_dvdnav.c Sun Dec 2 14:22:53 2007
@@ -725,7 +725,7 @@ void mp_dvdnav_get_highlight (stream_t *
hl->ey = hlev.ey;
}
-stream_info_t stream_info_dvdnav = {
+const stream_info_t stream_info_dvdnav = {
"DVDNAV stream",
"null",
"",
Modified: trunk/stream/stream_file.c
==============================================================================
--- trunk/stream/stream_file.c (original)
+++ trunk/stream/stream_file.c Sun Dec 2 14:22:53 2007
@@ -175,7 +175,7 @@ static int open_f(stream_t *stream,int m
return STREAM_OK;
}
-stream_info_t stream_info_file = {
+const stream_info_t stream_info_file = {
"File",
"file",
"Albeu",
Modified: trunk/stream/stream_ftp.c
==============================================================================
--- trunk/stream/stream_ftp.c (original)
+++ trunk/stream/stream_ftp.c Sun Dec 2 14:22:53 2007
@@ -458,7 +458,7 @@ static int open_f(stream_t *stream,int m
return STREAM_OK;
}
-stream_info_t stream_info_ftp = {
+const stream_info_t stream_info_ftp = {
"File Transfer Protocol",
"ftp",
"Albeu",
Modified: trunk/stream/stream_livedotcom.c
==============================================================================
--- trunk/stream/stream_livedotcom.c (original)
+++ trunk/stream/stream_livedotcom.c Sun Dec 2 14:22:53 2007
@@ -96,7 +96,7 @@ static int open_live_sdp(stream_t *strea
}
-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 @@ stream_info_t stream_info_rtsp_sip = {
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",
Modified: trunk/stream/stream_mf.c
==============================================================================
--- trunk/stream/stream_mf.c (original)
+++ trunk/stream/stream_mf.c Sun Dec 2 14:22:53 2007
@@ -34,7 +34,7 @@ mf_stream_open (stream_t *stream, int mo
return STREAM_OK;
}
-stream_info_t stream_info_mf = {
+const stream_info_t stream_info_mf = {
"Multiple files input",
"mf",
"Benjamin Zores, Albeu",
Modified: trunk/stream/stream_nemesi.c
==============================================================================
--- trunk/stream/stream_nemesi.c (original)
+++ trunk/stream/stream_nemesi.c Sun Dec 2 14:22:53 2007
@@ -64,7 +64,7 @@ static int rtsp_streaming_open (stream_t
return STREAM_OK;
}
-stream_info_t stream_info_rtsp = {
+const stream_info_t stream_info_rtsp = {
"RTSP streaming",
"rtsp",
"Alessandro Molina",
Modified: trunk/stream/stream_netstream.c
==============================================================================
--- trunk/stream/stream_netstream.c (original)
+++ trunk/stream/stream_netstream.c Sun Dec 2 14:22:53 2007
@@ -296,7 +296,7 @@ static int open_s(stream_t *stream,int m
return STREAM_ERROR;
}
-stream_info_t stream_info_netstream = {
+const stream_info_t stream_info_netstream = {
"Net stream",
"netstream",
"Albeu",
Modified: trunk/stream/stream_null.c
==============================================================================
--- trunk/stream/stream_null.c (original)
+++ trunk/stream/stream_null.c Sun Dec 2 14:22:53 2007
@@ -13,7 +13,7 @@ static int open_s(stream_t *stream,int m
}
-stream_info_t stream_info_null = {
+const stream_info_t stream_info_null = {
"Null stream",
"null",
"Albeu",
Modified: trunk/stream/stream_pvr.c
==============================================================================
--- trunk/stream/stream_pvr.c (original)
+++ trunk/stream/stream_pvr.c Sun Dec 2 14:22:53 2007
@@ -1766,7 +1766,7 @@ pvr_force_freq_step (stream_t *stream, i
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",
Modified: trunk/stream/stream_radio.c
==============================================================================
--- trunk/stream/stream_radio.c (original)
+++ trunk/stream/stream_radio.c Sun Dec 2 14:22:53 2007
@@ -1252,7 +1252,7 @@ static void close_s(struct stream_st * s
stream->priv=NULL;
}
-stream_info_t stream_info_radio = {
+const stream_info_t stream_info_radio = {
"Radio stream",
"Radio",
"Vladimir Voroshilov",
Modified: trunk/stream/stream_rtp.c
==============================================================================
--- trunk/stream/stream_rtp.c (original)
+++ trunk/stream/stream_rtp.c Sun Dec 2 14:22:53 2007
@@ -103,7 +103,7 @@ rtp_stream_open (stream_t *stream, int m
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",
Modified: trunk/stream/stream_rtsp.c
==============================================================================
--- trunk/stream/stream_rtsp.c (original)
+++ trunk/stream/stream_rtsp.c Sun Dec 2 14:22:53 2007
@@ -167,7 +167,7 @@ rtsp_streaming_open (stream_t *stream, i
return STREAM_OK;
}
-stream_info_t stream_info_rtsp = {
+const stream_info_t stream_info_rtsp = {
"RTSP streaming",
"rtsp",
"Benjamin Zores, Roberto Togni",
Modified: trunk/stream/stream_smb.c
==============================================================================
--- trunk/stream/stream_smb.c (original)
+++ trunk/stream/stream_smb.c Sun Dec 2 14:22:53 2007
@@ -153,7 +153,7 @@ static int open_f (stream_t *stream, int
return STREAM_OK;
}
-stream_info_t stream_info_smb = {
+const stream_info_t stream_info_smb = {
"Server Message Block",
"smb",
"M. Tourne",
Modified: trunk/stream/stream_tv.c
==============================================================================
--- trunk/stream/stream_tv.c (original)
+++ trunk/stream/stream_tv.c Sun Dec 2 14:22:53 2007
@@ -113,7 +113,7 @@ tv_stream_open (stream_t *stream, int mo
return STREAM_OK;
}
-stream_info_t stream_info_tv = {
+const stream_info_t stream_info_tv = {
"TV Input",
"tv",
"Benjamin Zores, Albeu",
Modified: trunk/stream/stream_udp.c
==============================================================================
--- trunk/stream/stream_udp.c (original)
+++ trunk/stream/stream_udp.c Sun Dec 2 14:22:53 2007
@@ -95,7 +95,7 @@ udp_stream_open (stream_t *stream, int m
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",
Modified: trunk/stream/stream_vcd.c
==============================================================================
--- trunk/stream/stream_vcd.c (original)
+++ trunk/stream/stream_vcd.c Sun Dec 2 14:22:53 2007
@@ -176,7 +176,7 @@ static int open_s(stream_t *stream,int m
return STREAM_OK;
}
-stream_info_t stream_info_vcd = {
+const stream_info_t stream_info_vcd = {
"Video CD",
"vcd",
"Albeu",
Modified: trunk/stream/stream_vstream.c
==============================================================================
--- trunk/stream/stream_vstream.c (original)
+++ trunk/stream/stream_vstream.c Sun Dec 2 14:22:53 2007
@@ -167,7 +167,7 @@ static int open_s(stream_t *stream, int
return STREAM_OK;
}
-stream_info_t stream_info_vstream = {
+const stream_info_t stream_info_vstream = {
"vstream client",
"vstream",
"Joey",
More information about the MPlayer-cvslog
mailing list