[MPlayer-cvslog] r25270 - in trunk/stream: stream_cdda.c stream_cue.c stream_dvb.c stream_dvd.c stream_dvdnav.c stream_file.c stream_ftp.c stream_netstream.c stream_radio.c stream_smb.c stream_tv.c stream_vcd.c stream_vstream.c
reimar
subversion at mplayerhq.hu
Sun Dec 2 22:37:08 CET 2007
Author: reimar
Date: Sun Dec 2 22:37:08 2007
New Revision: 25270
Log:
stream_opts arrays should be const
Modified:
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_netstream.c
trunk/stream/stream_radio.c
trunk/stream/stream_smb.c
trunk/stream/stream_tv.c
trunk/stream/stream_vcd.c
trunk/stream/stream_vstream.c
Modified: trunk/stream/stream_cdda.c
==============================================================================
--- trunk/stream/stream_cdda.c (original)
+++ trunk/stream/stream_cdda.c Sun Dec 2 22:37:08 2007
@@ -47,7 +47,7 @@ static struct cdda_params {
};
#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 },
Modified: trunk/stream/stream_cue.c
==============================================================================
--- trunk/stream/stream_cue.c (original)
+++ trunk/stream/stream_cue.c Sun Dec 2 22:37:08 2007
@@ -43,7 +43,7 @@ static struct stream_priv_s {
#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 }
};
Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c (original)
+++ trunk/stream/stream_dvb.c Sun Dec 2 22:37:08 2007
@@ -75,7 +75,7 @@ stream_defaults =
#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},
Modified: trunk/stream/stream_dvd.c
==============================================================================
--- trunk/stream/stream_dvd.c (original)
+++ trunk/stream/stream_dvd.c Sun Dec 2 22:37:08 2007
@@ -145,7 +145,7 @@ static struct stream_priv_s {
#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 }
};
Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c (original)
+++ trunk/stream/stream_dvdnav.c Sun Dec 2 22:37:08 2007
@@ -35,7 +35,7 @@ static struct stream_priv_s {
#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 }
Modified: trunk/stream/stream_file.c
==============================================================================
--- trunk/stream/stream_file.c (original)
+++ trunk/stream/stream_file.c Sun Dec 2 22:37:08 2007
@@ -22,7 +22,7 @@ static struct stream_priv_s {
#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 }
Modified: trunk/stream/stream_ftp.c
==============================================================================
--- trunk/stream/stream_ftp.c (original)
+++ trunk/stream/stream_ftp.c Sun Dec 2 22:37:08 2007
@@ -51,7 +51,7 @@ static struct stream_priv_s {
#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},
Modified: trunk/stream/stream_netstream.c
==============================================================================
--- trunk/stream/stream_netstream.c (original)
+++ trunk/stream/stream_netstream.c Sun Dec 2 22:37:08 2007
@@ -76,7 +76,7 @@ static struct stream_priv_s {
#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},
Modified: trunk/stream/stream_radio.c
==============================================================================
--- trunk/stream/stream_radio.c (original)
+++ trunk/stream/stream_radio.c Sun Dec 2 22:37:08 2007
@@ -141,7 +141,7 @@ typedef struct radio_driver_s {
} 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 }
Modified: trunk/stream/stream_smb.c
==============================================================================
--- trunk/stream/stream_smb.c (original)
+++ trunk/stream/stream_smb.c Sun Dec 2 22:37:08 2007
@@ -16,7 +16,7 @@ static struct stream_priv_s {
#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 }
};
Modified: trunk/stream/stream_tv.c
==============================================================================
--- trunk/stream/stream_tv.c (original)
+++ trunk/stream/stream_tv.c Sun Dec 2 22:37:08 2007
@@ -81,7 +81,7 @@ tv_param_t stream_tv_defaults = {
};
#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 }
Modified: trunk/stream/stream_vcd.c
==============================================================================
--- trunk/stream/stream_vcd.c (original)
+++ trunk/stream/stream_vcd.c Sun Dec 2 22:37:08 2007
@@ -43,7 +43,7 @@ static struct stream_priv_s {
#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
Modified: trunk/stream/stream_vstream.c
==============================================================================
--- trunk/stream/stream_vstream.c (original)
+++ trunk/stream/stream_vstream.c Sun Dec 2 22:37:08 2007
@@ -72,7 +72,7 @@ static struct stream_priv_s {
#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 }
More information about the MPlayer-cvslog
mailing list