summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_dvd.c10
-rw-r--r--src/input/input_mms.c6
-rw-r--r--src/input/input_v4l.c4
-rw-r--r--src/input/librtsp/rtsp_session.c4
4 files changed, 12 insertions, 12 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index a8d805fa4..69010ff3f 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project,
+ * Copyright (C) 2000-2014 the xine project,
* Rich Wareham <richwareham@users.sourceforge.net>
*
* This file is part of xine, a free video player.
@@ -1805,7 +1805,7 @@ static void *init_class (xine_t *xine, void *data) {
if (raw_device) xine_setenv("DVDCSS_RAW_DEVICE", raw_device, 0);
mode = config->register_enum(config, "media.dvd.css_decryption_method", 0,
- decrypt_modes, _("CSS decryption method"),
+ (char **)decrypt_modes, _("CSS decryption method"),
_("Selects the decryption method libdvdcss will use to descramble "
"copy protected DVDs. Try the various methods, if you have problems "
"playing scrambled DVDs."), 20, NULL, NULL);
@@ -1841,7 +1841,7 @@ static void *init_class (xine_t *xine, void *data) {
"of the DVD layer change on faster drives."),
10, read_ahead_cb, this);
config->register_enum(config, "media.dvd.skip_behaviour", 0,
- skip_modes,
+ (char **)skip_modes,
_("unit for the skip action"),
_("You can configure the behaviour when issuing a skip command (using the skip "
"buttons for example). The individual values mean:\n\n"
@@ -1857,7 +1857,7 @@ static void *init_class (xine_t *xine, void *data) {
"features on the DVD"),
20, NULL, NULL);
config->register_enum(config, "media.dvd.seek_behaviour", 0,
- seek_modes,
+ (char **)seek_modes,
_("unit for seeking"),
_("You can configure the domain spanned by the seek slider. The individual "
"values mean:\n\n"
@@ -1869,7 +1869,7 @@ static void *init_class (xine_t *xine, void *data) {
"a chapter of the current feature"),
20, seek_mode_cb, this);
config->register_enum(config, "media.dvd.play_single_chapter", 0,
- play_single_chapter_modes,
+ (char **)play_single_chapter_modes,
_("play mode when title/chapter is given"),
_("You can configure the behaviour when playing a dvd from a given "
"title/chapter (eg. using MRL 'dvd:/1.2'). The individual values mean:\n\n"
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 66d85af65..a9462b50c 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2009 the xine project
+ * Copyright (C) 2002-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -471,7 +471,7 @@ static void *init_class (xine_t *xine, void *data) {
this->input_class.eject_media = NULL;
xine->config->register_enum(xine->config, "media.network.bandwidth", 10,
- mms_bandwidth_strs,
+ (char **)mms_bandwidth_strs,
_("network bandwidth"),
_("Specify the bandwidth of your internet connection here. "
"This will be used when streaming servers offer different versions "
@@ -481,7 +481,7 @@ static void *init_class (xine_t *xine, void *data) {
this->protocol = xine->config->register_enum(xine->config,
"media.network.mms_protocol",
0,
- mms_protocol_strs,
+ (char **)mms_protocol_strs,
_("MMS protocol"),
_("Select the protocol to encapsulate MMS.\nTCP is better but you may need HTTP behind a firewall."),
20,
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 79c7f34f8..a1e1d1233 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 the xine project
+ * Copyright (C) 2003-2014 the xine project
* Copyright (C) 2003 J.Asselman <j.asselman@itsec-ps.nl>
*
* This file is part of xine, a free video player.
@@ -1925,7 +1925,7 @@ static void *init_video_class (xine_t *xine, void *data)
10, NULL, NULL);
#endif
config->register_enum (config, "media.video4linux.tv_standard", 0 /* auto */,
- tv_standard_names, _("v4l TV standard"),
+ (char **)tv_standard_names, _("v4l TV standard"),
_("Selects the TV standard of the input signals. "
"Either: AUTO, PAL, NTSC or SECAM. "), 20, NULL, NULL);
diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c
index 6571ab6b9..6ace06836 100644
--- a/src/input/librtsp/rtsp_session.c
+++ b/src/input/librtsp/rtsp_session.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2009 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -91,7 +91,7 @@ rtsp_session_t *rtsp_session_start(xine_stream_t *stream, char *mrl) {
uint32_t bandwidth;
bandwidth_id = xine->config->register_enum(xine->config, "media.network.bandwidth", 10,
- rtsp_bandwidth_strs,
+ (char **)rtsp_bandwidth_strs,
_("network bandwidth"),
_("Specify the bandwidth of your internet connection here. "
"This will be used when streaming servers offer different versions "