# HG changeset patch # User reimar # Date 1196631428 0 # Node ID 371a40dcc1ccc0fa8c2286e18d8c0b896d593293 # Parent bb7c65f2a28905db70f23e4dcbc5d03e4449219f stream_opts arrays should be const diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_cdda.c --- a/stream/stream_cdda.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_cdda.c Sun Dec 02 21:37:08 2007 +0000 @@ -47,7 +47,7 @@ }; #define ST_OFF(f) M_ST_OFF(struct cdda_params,f) -m_option_t cdda_params_fields[] = { +static const m_option_t cdda_params_fields[] = { { "speed", ST_OFF(speed), CONF_TYPE_INT, M_OPT_RANGE,1,100, NULL }, { "paranoia", ST_OFF(paranoia_mode), CONF_TYPE_INT,M_OPT_RANGE, 0, 2, NULL }, { "generic-dev", ST_OFF(generic_dev), CONF_TYPE_STRING, 0, 0, 0, NULL }, diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_cue.c --- a/stream/stream_cue.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_cue.c Sun Dec 02 21:37:08 2007 +0000 @@ -43,7 +43,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { { "string", ST_OFF(filename), CONF_TYPE_STRING, 0, 0 ,0, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL } }; diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_dvb.c --- a/stream/stream_dvb.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_dvb.c Sun Dec 02 21:37:08 2007 +0000 @@ -75,7 +75,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f) /// URL definition -static m_option_t stream_params[] = { +static const m_option_t stream_params[] = { {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL}, diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_dvd.c --- a/stream/stream_dvd.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_dvd.c Sun Dec 02 21:37:08 2007 +0000 @@ -145,7 +145,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { { "hostname", ST_OFF(title), CONF_TYPE_INT, M_OPT_MIN, 1, 0, NULL }, { NULL, NULL, 0, 0, 0, 0, NULL } }; diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_dvdnav.c --- a/stream/stream_dvdnav.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_dvdnav.c Sun Dec 02 21:37:08 2007 +0000 @@ -35,7 +35,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { {"filename", ST_OFF(device), CONF_TYPE_STRING, 0, 0, 0, NULL }, {"hostname", ST_OFF(track), CONF_TYPE_INT, 0, 0, 0, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL } diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_file.c --- a/stream/stream_file.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_file.c Sun Dec 02 21:37:08 2007 +0000 @@ -22,7 +22,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { {"string", ST_OFF(filename), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"filename", ST_OFF(filename2), CONF_TYPE_STRING, 0, 0 ,0, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL } diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_ftp.c --- a/stream/stream_ftp.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_ftp.c Sun Dec 02 21:37:08 2007 +0000 @@ -51,7 +51,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { {"username", ST_OFF(user), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"password", ST_OFF(pass), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"hostname", ST_OFF(host), CONF_TYPE_STRING, 0, 0 ,0, NULL}, diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_netstream.c --- a/stream/stream_netstream.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_netstream.c Sun Dec 02 21:37:08 2007 +0000 @@ -76,7 +76,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { {"hostname", ST_OFF(host), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"port", ST_OFF(port), CONF_TYPE_INT, M_OPT_MIN, 1 ,0, NULL}, {"filename", ST_OFF(url), CONF_TYPE_STRING, 0, 0 ,0, NULL}, diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_radio.c --- a/stream/stream_radio.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_radio.c Sun Dec 02 21:37:08 2007 +0000 @@ -141,7 +141,7 @@ } radio_driver_t; #define ST_OFF(f) M_ST_OFF(radio_param_t,f) -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { {"hostname", ST_OFF(freq_channel), CONF_TYPE_FLOAT, 0, 0 ,0, NULL}, {"filename", ST_OFF(capture), CONF_TYPE_STRING, 0, 0 ,0, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL } diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_smb.c --- a/stream/stream_smb.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_smb.c Sun Dec 02 21:37:08 2007 +0000 @@ -16,7 +16,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) // URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { { NULL, NULL, 0, 0, 0, 0, NULL } }; diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_tv.c --- a/stream/stream_tv.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_tv.c Sun Dec 02 21:37:08 2007 +0000 @@ -81,7 +81,7 @@ }; #define ST_OFF(f) M_ST_OFF(tv_param_t,f) -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { {"hostname", ST_OFF(channel), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"filename", ST_OFF(input), CONF_TYPE_INT, 0, 0 ,0, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL } diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_vcd.c --- a/stream/stream_vcd.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_vcd.c Sun Dec 02 21:37:08 2007 +0000 @@ -43,7 +43,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { { "track", ST_OFF(track), CONF_TYPE_INT, M_OPT_MIN, 1, 0, NULL }, { "device", ST_OFF(device), CONF_TYPE_STRING, 0, 0 ,0, NULL}, /// For url parsing diff -r bb7c65f2a289 -r 371a40dcc1cc stream/stream_vstream.c --- a/stream/stream_vstream.c Sun Dec 02 21:26:23 2007 +0000 +++ b/stream/stream_vstream.c Sun Dec 02 21:37:08 2007 +0000 @@ -72,7 +72,7 @@ #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) /// URL definition -static m_option_t stream_opts_fields[] = { +static const m_option_t stream_opts_fields[] = { {"hostname", ST_OFF(host), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"filename", ST_OFF(fsid), CONF_TYPE_STRING, 0, 0 ,0, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL }