summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_asf.c16
-rw-r--r--src/demuxers/demux_mpeg_block.c6
-rw-r--r--src/demuxers/demux_mpeg_pes.c9
-rw-r--r--src/demuxers/demux_qt.c9
-rw-r--r--src/demuxers/demux_slave.c6
-rw-r--r--src/demuxers/demux_yuv_frames.c6
-rw-r--r--src/input/input_cdda.c4
-rw-r--r--src/input/input_dvb.c2
-rw-r--r--src/input/input_dvd.c4
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_gnome_vfs.c4
-rw-r--r--src/input/input_http.c4
-rw-r--r--src/input/input_mms.c4
-rw-r--r--src/input/input_net.c4
-rw-r--r--src/input/input_plugin.h4
-rw-r--r--src/input/input_pnm.c2
-rw-r--r--src/input/input_pvr.c4
-rw-r--r--src/input/input_rtp.c2
-rw-r--r--src/input/input_rtsp.c2
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_v4l.c2
-rw-r--r--src/input/input_vcd.c4
-rw-r--r--src/libsputext/demux_sputext.c8
-rw-r--r--src/xine-engine/input_cache.c4
-rw-r--r--src/xine-engine/input_rip.c4
25 files changed, 51 insertions, 71 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 1bdea2fd7..bd48d9466 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_asf.c,v 1.191 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_asf.c,v 1.192 2007/01/19 01:05:24 dgp85 Exp $
*
* demultiplexer for asf streams
*
@@ -1356,7 +1356,6 @@ static int demux_asf_parse_http_references( demux_asf_t *this) {
int buf_used = 0;
int len;
char *href = NULL;
- char *mrl;
int free_href = 0;
/* read file to memory.
@@ -1381,7 +1380,7 @@ static int demux_asf_parse_http_references( demux_asf_t *this) {
ptr = buf;
if (!strncmp(ptr, "[Reference]", 11)) {
- mrl = this->input->get_mrl(this->input);
+ const char *const mrl = this->input->get_mrl(this->input);
if (!strncmp(mrl, "http", 4)) {
/* never trust a ms server, reopen the same mrl with the mms input plugin
* some servers are badly configured and return a incorrect reference.
@@ -2052,15 +2051,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
break;
case METHOD_BY_EXTENSION: {
- char *ending, *mrl;
-
- mrl = input->get_mrl (input);
-
- /*
- * check extension
- */
-
- ending = strrchr (mrl, '.');
+ const char *const mrl = input->get_mrl (input);
+ const char *const ending = strrchr (mrl, '.');
if (!ending)
return NULL;
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 760f8a6d1..e149e027a 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_block.c,v 1.218 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_mpeg_block.c,v 1.219 2007/01/19 01:05:24 dgp85 Exp $
*
* demultiplexer for mpeg 1/2 program streams
* used with fixed blocksize devices (like dvd/vcd)
@@ -1456,9 +1456,9 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
break;
case METHOD_BY_EXTENSION: {
- char *ending, *mrl;
+ char *ending;
- mrl = input->get_mrl (input);
+ const char *const mrl = input->get_mrl (input);
if(!strncmp(mrl, "vcd:", 4)) {
this->blocksize = 2324;
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index e9b7b8e52..0e0a3501d 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_pes.c,v 1.38 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_mpeg_pes.c,v 1.39 2007/01/19 01:05:24 dgp85 Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -1594,11 +1594,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
break;
case METHOD_BY_EXTENSION: {
- char *ending, *mrl;
-
- mrl = input->get_mrl (input);
-
- ending = strrchr(mrl, '.');
+ const char *const mrl = input->get_mrl (input);
+ const char *const ending = strrchr(mrl, '.');
if (!ending) {
free (this->scratch_base);
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 3b7874cb1..4144f3049 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
* build_frame_table
* free_qt_info
*
- * $Id: demux_qt.c,v 1.213 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_qt.c,v 1.214 2007/01/19 01:05:24 dgp85 Exp $
*
*/
@@ -2993,11 +2993,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
break;
case METHOD_BY_EXTENSION: {
- char *ending, *mrl;
-
- mrl = input->get_mrl (input);
-
- ending = strrchr(mrl, '.');
+ const char *const mrl = input->get_mrl (input);
+ const char *const ending = strrchr(mrl, '.');
if (!ending) {
free (this);
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index c49b44f3d..a00ad0661 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -21,7 +21,7 @@
*/
/*
- * $Id: demux_slave.c,v 1.22 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_slave.c,v 1.23 2007/01/19 01:05:24 dgp85 Exp $
*
* demuxer for slave "protocol"
* master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is,
@@ -338,9 +338,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
switch (stream->content_detection_method) {
case METHOD_BY_EXTENSION: {
- char *mrl;
-
- mrl = input->get_mrl (input);
+ const char *const mrl = input->get_mrl (input);
if(!strncmp(mrl, "slave://", 8))
break;
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 421ad6d27..3866f0437 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -20,7 +20,7 @@
*/
/*
- * $Id: demux_yuv_frames.c,v 1.23 2007/01/19 00:26:41 dgp85 Exp $
+ * $Id: demux_yuv_frames.c,v 1.24 2007/01/19 01:05:24 dgp85 Exp $
*
* dummy demultiplexer for raw yuv frames (delivered by v4l)
*/
@@ -185,9 +185,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
break;
case METHOD_BY_EXTENSION: {
- char *mrl;
-
- mrl = input->get_mrl (input);
+ const char *const mrl = input->get_mrl (input);
if (strncmp (mrl, "v4l:/", 5))
return NULL;
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 3733172e5..632ca3252 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
* Compact Disc Digital Audio (CDDA) Input Plugin
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: input_cdda.c,v 1.92 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_cdda.c,v 1.93 2007/01/19 01:05:24 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -2270,7 +2270,7 @@ static uint32_t cdda_plugin_get_blocksize (input_plugin_t *this_gen) {
return CD_RAW_FRAME_SIZE;
}
-static char* cdda_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* cdda_plugin_get_mrl (input_plugin_t *this_gen) {
cdda_input_plugin_t *this = (cdda_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 3bc9008a7..39507ac15 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -2651,7 +2651,7 @@ static void dvb_plugin_dispose (input_plugin_t *this_gen) {
free (this);
}
-static char* dvb_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* dvb_plugin_get_mrl (input_plugin_t *this_gen) {
dvb_input_plugin_t *this = (dvb_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 6a8315ce1..c132bdb04 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.213 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_dvd.c,v 1.214 2007/01/19 01:05:25 dgp85 Exp $
*
*/
@@ -930,7 +930,7 @@ static uint32_t dvd_plugin_get_blocksize (input_plugin_t *this_gen) {
return DVD_BLOCK_SIZE;
}
-static char* dvd_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* dvd_plugin_get_mrl (input_plugin_t *this_gen) {
dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen;
trace_print("Called\n");
diff --git a/src/input/input_file.c b/src/input/input_file.c
index dd2f078f9..82e317492 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_file.c,v 1.119 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_file.c,v 1.120 2007/01/19 01:05:25 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -299,7 +299,7 @@ static int is_a_dir(char *filepathname) {
return (S_ISDIR(pstat.st_mode));
}
-static char* file_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* file_plugin_get_mrl (input_plugin_t *this_gen) {
file_input_plugin_t *this = (file_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index 8948abe54..b9f516931 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_gnome_vfs.c,v 1.33 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_gnome_vfs.c,v 1.34 2007/01/19 01:05:25 dgp85 Exp $
*/
@@ -204,7 +204,7 @@ gnomevfs_plugin_get_blocksize (input_plugin_t *this_gen)
return 32 * 1024;
}
-static char*
+static const char*
gnomevfs_plugin_get_mrl (input_plugin_t *this_gen)
{
gnomevfs_input_t *this = (gnomevfs_input_t *) this_gen;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 18990e2bf..8555e3bc8 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
*
* input plugin for http network streams
*
- * $Id: input_http.c,v 1.126 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_http.c,v 1.127 2007/01/19 01:05:25 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -574,7 +574,7 @@ static off_t http_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin
return this->curpos;
}
-static char* http_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* http_plugin_get_mrl (input_plugin_t *this_gen) {
http_input_plugin_t *this = (http_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 350958d89..52a0d4bab 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_mms.c,v 1.67 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_mms.c,v 1.68 2007/01/19 01:05:25 dgp85 Exp $
*
* mms input plugin based on work from major mms
*/
@@ -292,7 +292,7 @@ static void mms_plugin_dispose (input_plugin_t *this_gen) {
free (this);
}
-static char* mms_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* mms_plugin_get_mrl (input_plugin_t *this_gen) {
mms_input_plugin_t *this = (mms_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 1baa8c3c6..0ce2e1340 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -20,7 +20,7 @@
* Read from a tcp network stream over a lan (put a tweaked mp1e encoder the
* other end and you can watch tv anywhere in the house ..)
*
- * $Id: input_net.c,v 1.69 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_net.c,v 1.70 2007/01/19 01:05:25 dgp85 Exp $
*
* how to set up mp1e for use with this plugin:
*
@@ -367,7 +367,7 @@ static off_t net_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin
}
-static char* net_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* net_plugin_get_mrl (input_plugin_t *this_gen) {
net_input_plugin_t *this = (net_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index aebbd08e7..370dc6a71 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_plugin.h,v 1.63 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_plugin.h,v 1.64 2007/01/19 01:05:25 dgp85 Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -201,7 +201,7 @@ struct input_plugin_s {
/*
* return current MRL
*/
- char * (*get_mrl) (input_plugin_t *this);
+ const char * (*get_mrl) (input_plugin_t *this);
/*
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index c847ca767..af860ac1e 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -181,7 +181,7 @@ static void pnm_plugin_dispose (input_plugin_t *this_gen) {
free (this);
}
-static char* pnm_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* pnm_plugin_get_mrl (input_plugin_t *this_gen) {
pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 93af332f4..bcf93af2b 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -38,7 +38,7 @@
* usage:
* xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
*
- * $Id: input_pvr.c,v 1.64 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_pvr.c,v 1.65 2007/01/19 01:05:25 dgp85 Exp $
*/
/**************************************************************************
@@ -1317,7 +1317,7 @@ static uint32_t pvr_plugin_get_blocksize (input_plugin_t *this_gen) {
return PVR_BLOCK_SIZE;
}
-static char* pvr_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* pvr_plugin_get_mrl (input_plugin_t *this_gen) {
pvr_input_plugin_t *this = (pvr_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index da6bad281..cd5d89686 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -559,7 +559,7 @@ static uint32_t rtp_plugin_get_blocksize (input_plugin_t *this_gen) {
/*
*
*/
-static char* rtp_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* rtp_plugin_get_mrl (input_plugin_t *this_gen) {
rtp_input_plugin_t *this = (rtp_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 5a7cc6c7f..c23c761cc 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -196,7 +196,7 @@ static void rtsp_plugin_dispose (input_plugin_t *this_gen) {
free (this);
}
-static char* rtsp_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* rtsp_plugin_get_mrl (input_plugin_t *this_gen) {
rtsp_input_plugin_t *this = (rtsp_input_plugin_t *) this_gen;
return this->public_mrl;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 435bf795b..654e5d1a2 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_stdin_fifo.c,v 1.68 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_stdin_fifo.c,v 1.69 2007/01/19 01:05:25 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -202,7 +202,7 @@ static off_t stdin_plugin_get_current_pos (input_plugin_t *this_gen){
return this->curpos;
}
-static char* stdin_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* stdin_plugin_get_mrl (input_plugin_t *this_gen) {
stdin_input_plugin_t *this = (stdin_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 8143c6b13..17c4223a2 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1628,7 +1628,7 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) {
*
* Get the current MRL used by the plugin.
*/
-static char* v4l_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* v4l_plugin_get_mrl (input_plugin_t *this_gen) {
v4l_input_plugin_t *this = (v4l_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 06b6707f9..82c1b53d9 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_vcd.c,v 1.87 2007/01/18 23:02:18 dgp85 Exp $
+ * $Id: input_vcd.c,v 1.88 2007/01/19 01:05:25 dgp85 Exp $
*
*/
@@ -813,7 +813,7 @@ static void vcd_plugin_dispose (input_plugin_t *this_gen ) {
free (this);
}
-static char* vcd_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* vcd_plugin_get_mrl (input_plugin_t *this_gen) {
vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
return this->mrl;
diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c
index 33d446458..c17dde6c8 100644
--- a/src/libsputext/demux_sputext.c
+++ b/src/libsputext/demux_sputext.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_sputext.c,v 1.52 2007/01/19 00:26:41 dgp85 Exp $
+ * $Id: demux_sputext.c,v 1.53 2007/01/19 01:05:25 dgp85 Exp $
*
* code based on old libsputext/xine_decoder.c
*
@@ -1404,10 +1404,8 @@ static demux_plugin_t *open_demux_plugin (demux_class_t *class_gen, xine_stream_
switch (stream->content_detection_method) {
case METHOD_BY_EXTENSION:
{
- char *mrl, *ending;
-
- mrl = input->get_mrl(input);
- ending = strrchr(mrl, '.');
+ const char *const mrl = input->get_mrl(input);
+ const char *const ending = strrchr(mrl, '.');
if (!ending || (
(strncasecmp(ending, ".asc", 4) != 0) &&
diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
index 33b8b47da..be5b005ec 100644
--- a/src/xine-engine/input_cache.c
+++ b/src/xine-engine/input_cache.c
@@ -22,7 +22,7 @@
* The goal of this input plugin is to reduce
* the number of calls to the real input plugin.
*
- * $Id: input_cache.c,v 1.12 2006/09/08 06:20:37 tmattern Exp $
+ * $Id: input_cache.c,v 1.13 2007/01/19 01:05:25 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -304,7 +304,7 @@ static uint32_t cache_plugin_get_blocksize(input_plugin_t *this_gen) {
return this->main_input_plugin->get_blocksize(this->main_input_plugin);
}
-static char* cache_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* cache_plugin_get_mrl (input_plugin_t *this_gen) {
cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
return this->main_input_plugin->get_mrl(this->main_input_plugin);
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index bdcc1ce50..d7a0c46ca 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -29,7 +29,7 @@
* - it's possible speeder saving streams in the xine without playing:
* xine stream_mrl#save:file.raw\;noaudio\;novideo
*
- * $Id: input_rip.c,v 1.32 2007/01/07 20:26:23 klan Exp $
+ * $Id: input_rip.c,v 1.33 2007/01/19 01:05:25 dgp85 Exp $
*/
/* TODO:
@@ -479,7 +479,7 @@ static uint32_t rip_plugin_get_blocksize(input_plugin_t *this_gen) {
return this->main_input_plugin->get_blocksize(this->main_input_plugin);
}
-static char* rip_plugin_get_mrl (input_plugin_t *this_gen) {
+static const char* rip_plugin_get_mrl (input_plugin_t *this_gen) {
rip_input_plugin_t *this = (rip_input_plugin_t *)this_gen;
return this->main_input_plugin->get_mrl(this->main_input_plugin);