summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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_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.h5
-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/input/vcd/xineplug_inp_vcd.c4
16 files changed, 28 insertions, 27 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 7ea7e2074..833f3b025 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.60 2004/06/13 21:28:55 miguelfreitas Exp $
+ * $Id: input_cdda.c,v 1.61 2004/07/20 00:50:10 rockyb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -2468,7 +2468,7 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str
}
-static char *cdda_class_get_identifier (input_class_t *this_gen) {
+static const char *cdda_class_get_identifier (input_class_t *this_gen) {
return "cdda";
}
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 30b9891e8..836d9c73b 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1284,7 +1284,7 @@ static char *dvb_class_get_description (input_class_t *this_gen) {
return _("DVB (Digital TV) input plugin");
}
-static char *dvb_class_get_identifier (input_class_t *this_gen) {
+static const char *dvb_class_get_identifier (input_class_t *this_gen) {
return "dvb";
}
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index e060dd7a6..201d312f8 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.184 2004/06/21 18:48:17 mroi Exp $
+ * $Id: input_dvd.c,v 1.185 2004/07/20 00:50:11 rockyb Exp $
*
*/
@@ -1549,7 +1549,7 @@ static char *dvd_class_get_description (input_class_t *this_gen) {
return "DVD Navigator";
}
-static char *dvd_class_get_identifier (input_class_t *this_gen) {
+static const char *dvd_class_get_identifier (input_class_t *this_gen) {
trace_print("Called\n");
return "DVD";
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 0690f9bae..0a4390c84 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.93 2004/06/22 14:31:40 athp Exp $
+ * $Id: input_file.c,v 1.94 2004/07/20 00:50:11 rockyb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -510,7 +510,7 @@ static char *file_class_get_description (input_class_t *this_gen) {
return _("file input plugin");
}
-static char *file_class_get_identifier (input_class_t *this_gen) {
+static const char *file_class_get_identifier (input_class_t *this_gen) {
return "file";
}
diff --git a/src/input/input_http.c b/src/input/input_http.c
index a348a2bb6..8a8c4b8c4 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.93 2004/07/05 20:47:42 f1rmb Exp $
+ * $Id: input_http.c,v 1.94 2004/07/20 00:50:11 rockyb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -977,7 +977,7 @@ static char *http_class_get_description (input_class_t *this_gen) {
return _("http input plugin");
}
-static char *http_class_get_identifier (input_class_t *this_gen) {
+static const char *http_class_get_identifier (input_class_t *this_gen) {
return "http";
}
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index befb42f25..b4c7289e7 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.52 2004/06/13 21:28:56 miguelfreitas Exp $
+ * $Id: input_mms.c,v 1.53 2004/07/20 00:50:11 rockyb Exp $
*
* mms input plugin based on work from major mms
*/
@@ -424,7 +424,7 @@ static char *mms_class_get_description (input_class_t *this_gen) {
return _("mms streaming input plugin");
}
-static char *mms_class_get_identifier (input_class_t *this_gen) {
+static const char *mms_class_get_identifier (input_class_t *this_gen) {
return "mms";
}
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 0d560b9d4..f44bb6d81 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.58 2004/06/13 21:28:56 miguelfreitas Exp $
+ * $Id: input_net.c,v 1.59 2004/07/20 00:50:11 rockyb Exp $
*
* how to set up mp1e for use with this plugin:
*
@@ -511,7 +511,7 @@ static char *net_class_get_description (input_class_t *this_gen) {
return _("net input plugin as shipped with xine");
}
-static char *net_class_get_identifier (input_class_t *this_gen) {
+static const char *net_class_get_identifier (input_class_t *this_gen) {
return "TCP";
}
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 65d50ce73..3fd97d7bc 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.56 2004/06/13 21:28:56 miguelfreitas Exp $
+ * $Id: input_plugin.h,v 1.57 2004/07/20 00:50:11 rockyb Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -51,8 +51,9 @@ struct input_class_s {
/*
* return short, human readable identifier for this plugin class
+ * The returned string should not be malloc'd as it is not freed.
*/
- char* (*get_identifier) (input_class_t *this);
+ const char* (*get_identifier) (input_class_t *this);
/*
* return human readable (verbose = 1 line) description for
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 0849ea6a7..0f5df891f 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -265,7 +265,7 @@ static char *pnm_class_get_description (input_class_t *this_gen) {
return _("pnm streaming input plugin");
}
-static char *pnm_class_get_identifier (input_class_t *this_gen) {
+static const char *pnm_class_get_identifier (input_class_t *this_gen) {
return "pnm";
}
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 0cbffd47d..25b069894 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.46 2004/06/13 21:28:56 miguelfreitas Exp $
+ * $Id: input_pvr.c,v 1.47 2004/07/20 00:50:11 rockyb Exp $
*/
/**************************************************************************
@@ -1514,7 +1514,7 @@ static char *pvr_class_get_description (input_class_t *this_gen) {
return _("WinTV-PVR 250/350 input plugin");
}
-static char *pvr_class_get_identifier (input_class_t *this_gen) {
+static const char *pvr_class_get_identifier (input_class_t *this_gen) {
return "pvr";
}
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index c13ba963e..6730d1e30 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -742,7 +742,7 @@ static char *rtp_class_get_description (input_class_t *this_gen) {
return _("RTP and UDP input plugin as shipped with xine");
}
-static char *rtp_class_get_identifier (input_class_t *this_gen) {
+static const char *rtp_class_get_identifier (input_class_t *this_gen) {
return "RTP/UDP";
}
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 3057be8cf..3ca4ea3b2 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -278,7 +278,7 @@ static char *rtsp_class_get_description (input_class_t *this_gen) {
return _("rtsp streaming input plugin");
}
-static char *rtsp_class_get_identifier (input_class_t *this_gen) {
+static const char *rtsp_class_get_identifier (input_class_t *this_gen) {
return "rtsp";
}
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index fa1dd682f..37db6049f 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.58 2004/06/13 21:28:56 miguelfreitas Exp $
+ * $Id: input_stdin_fifo.c,v 1.59 2004/07/20 00:50:11 rockyb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -341,7 +341,7 @@ static char *stdin_class_get_description (input_class_t *this_gen) {
return _("stdin streaming input plugin");
}
-static char *stdin_class_get_identifier (input_class_t *this_gen) {
+static const char *stdin_class_get_identifier (input_class_t *this_gen) {
return "stdin_fifo";
}
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 3c527f773..22aea7426 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1889,7 +1889,7 @@ static char *v4l_class_get_radio_description (input_class_t *this_gen) {
return _("v4l radio input plugin");
}
-static char *v4l_class_get_identifier (input_class_t *this_gen) {
+static const char *v4l_class_get_identifier (input_class_t *this_gen) {
return "v4l";
}
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index cc255b370..49895e67b 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.74 2004/06/13 21:28:56 miguelfreitas Exp $
+ * $Id: input_vcd.c,v 1.75 2004/07/20 00:50:11 rockyb Exp $
*
*/
@@ -922,7 +922,7 @@ static char *vcd_class_get_description (input_class_t *this_gen) {
return _("Video CD input plugin");
}
-static char *vcd_class_get_identifier (input_class_t *this_gen) {
+static const char *vcd_class_get_identifier (input_class_t *this_gen) {
return "vcdo";
}
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 11a81ce4c..6b726894f 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1,5 +1,5 @@
/*
- $Id: xineplug_inp_vcd.c,v 1.22 2004/07/20 00:31:37 rockyb Exp $
+ $Id: xineplug_inp_vcd.c,v 1.23 2004/07/20 00:50:11 rockyb Exp $
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -920,7 +920,7 @@ vcd_class_get_description (input_class_t *this_gen)
this is used for GUI buttons, The identifier must have max. 4 characters
characters (max. 5 including terminating \0)
*/
-static char *
+static const char *
vcd_class_get_identifier (input_class_t *this_gen) {
dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
return SHORT_PLUGIN_NAME;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:18:26 +0000