summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_cda.c4
-rw-r--r--src/input/input_dvd.c33
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_http.c2
-rw-r--r--src/input/input_mms.c4
-rw-r--r--src/input/input_net.c2
-rw-r--r--src/input/input_rtp.c5
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_vcd.c4
9 files changed, 26 insertions, 36 deletions
diff --git a/src/input/input_cda.c b/src/input/input_cda.c
index 4029587c1..3f64984d3 100644
--- a/src/input/input_cda.c
+++ b/src/input/input_cda.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_cda.c,v 1.30 2002/09/05 20:19:48 guenter Exp $
+ * $Id: input_cda.c,v 1.31 2002/09/05 20:44:39 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1782,7 +1782,7 @@ static void cda_plugin_dispose (input_plugin_t *this_gen ) {
/*
* Initialize plugin.
*/
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
cda_input_plugin_t *this;
config_values_t *config;
int i;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 6dd6611ef..cadc69e0d 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.74 2002/09/05 20:19:48 guenter Exp $
+ * $Id: input_dvd.c,v 1.75 2002/09/05 20:44:39 mroi Exp $
*
*/
@@ -768,7 +768,7 @@ static buf_element_t *dvdnav_plugin_read_block (input_plugin_t *this_gen,
break;
case DVDNAV_HOP_CHANNEL:
{
- //flush_buffers(this);
+ flush_buffers(this);
break;
}
case DVDNAV_NAV_PACKET:
@@ -1227,9 +1227,7 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
goto __audio_success;
}
- /* FIXME: where is xine_get_audio_channel now? */
- /* channel = (int8_t) xine_get_audio_channel(this->xine); */
- channel = 0;
+ channel = (int8_t) xine_get_audio_channel(this->xine);
/* printf("input_dvd: ********* AUDIO CHANNEL = %d\n", channel); */
channel = dvdnav_get_audio_logical_stream(this->dvdnav, channel);
if(channel != -1) {
@@ -1239,15 +1237,11 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
sprintf(data, " %c%c", lang >> 8, lang & 0xff);
}
else {
- /* FIXME: where is xine_get_audio_channel now? */
-/* sprintf(data, "%3i", xine_get_audio_channel(this->xine)); */
- sprintf(data, "%3i", 0);
+ sprintf(data, "%3i", xine_get_audio_channel(this->xine));
}
}
else {
- /* FIXME: where is xine_get_audio_channel now? */
-/* channel = xine_get_audio_channel(this->xine); */
- channel = 0;
+ channel = xine_get_audio_channel(this->xine);
sprintf(data, "%3i", channel);
}
@@ -1272,9 +1266,7 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
goto __spu_success;
}
- /* FIXME: where is xine_get_spu_channel now? */
- /* channel = (int8_t) xine_get_spu_channel(this->xine);*/
- channel = 0;
+ channel = (int8_t) xine_get_spu_channel(this->xine);
/* printf("input_dvd: ********* SPU CHANNEL = %i\n", channel); */
if(channel == -1)
channel = dvdnav_get_spu_logical_stream(this->dvdnav, this->xine->spu_channel);
@@ -1288,14 +1280,11 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
sprintf(data, " %c%c", lang >> 8, lang & 0xff);
}
else {
- /* sprintf(data, "%3i", xine_get_spu_channel(this->xine));*/
- sprintf(data, "%3i", 0);
+ sprintf(data, "%3i", xine_get_spu_channel(this->xine));
}
}
else {
- /* FIXME: where is xine_get_spu_channel now? */
-/* channel = xine_get_spu_channel(this->xine); */
- channel = 0;
+ channel = xine_get_spu_channel(this->xine);
if(channel == -1)
sprintf(data, "%3s", "off");
else
@@ -1395,7 +1384,7 @@ check_solaris_vold_device(dvdnav_input_plugin_t *this)
}
#endif
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
dvdnav_input_plugin_t *this;
config_values_t *config = xine->config;
void *dvdcss;
@@ -1508,6 +1497,10 @@ void *init_input_plugin (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.75 2002/09/05 20:44:39 mroi
+ * make all the plugin init functions static
+ * (geez this was a job)
+ *
* Revision 1.74 2002/09/05 20:19:48 guenter
* use xine_mrl_t instead of mrl_t in input plugins, implement more configfile functions
*
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 91661f675..cfea3fc55 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.54 2002/09/05 20:19:49 guenter Exp $
+ * $Id: input_file.c,v 1.55 2002/09/05 20:44:39 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -847,7 +847,7 @@ static void file_plugin_dispose (input_plugin_t *this_gen ) {
free (this);
}
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
file_input_plugin_t *this;
config_values_t *config;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 84ffad158..f74506732 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -685,7 +685,7 @@ static void http_plugin_dispose (input_plugin_t *this_gen ) {
free (this_gen);
}
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
http_input_plugin_t *this;
config_values_t *config;
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index d378f880b..07e67bed7 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.16 2002/09/04 23:31:08 guenter Exp $
+ * $Id: input_mms.c,v 1.17 2002/09/05 20:44:39 mroi Exp $
*
* mms input plugin based on work from major mms
*/
@@ -284,7 +284,7 @@ static void mms_plugin_dispose (input_plugin_t *this_gen ) {
free (this);
}
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
mms_input_plugin_t *this;
config_values_t *config;
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 1b023e38e..00abfa9e5 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -331,7 +331,7 @@ static void net_plugin_dispose (input_plugin_t *this_gen ) {
free (this_gen);
}
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
net_input_plugin_t *this;
config_values_t *config;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index cbce3e7db..d4db61874 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -500,10 +500,7 @@ static void rtp_plugin_dispose (input_plugin_t *this_gen ) {
free (this);
}
-/*
- *
- */
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
rtp_input_plugin_t *this;
config_values_t *config;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 4dd3f1116..46c80e283 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.29 2002/09/04 23:31:08 guenter Exp $
+ * $Id: input_stdin_fifo.c,v 1.30 2002/09/05 20:44:39 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -347,7 +347,7 @@ static void stdin_plugin_dispose (input_plugin_t *this_gen ) {
}
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
stdin_input_plugin_t *this;
config_values_t *config;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 68138e49d..7ea1cc9e8 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.48 2002/09/05 20:19:49 guenter Exp $
+ * $Id: input_vcd.c,v 1.49 2002/09/05 20:44:39 mroi Exp $
*
*/
@@ -1135,7 +1135,7 @@ static void vcd_plugin_dispose (input_plugin_t *this_gen ) {
/*
*
*/
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
vcd_input_plugin_t *this;
config_values_t *config;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 15:43:00 +0000