summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_dvd.c5
-rw-r--r--src/input/input_file.c5
-rw-r--r--src/input/input_net.c3
-rw-r--r--src/input/input_plugin.h26
-rw-r--r--src/input/input_rtp.c3
-rw-r--r--src/input/input_stdin_fifo.c5
-rw-r--r--src/input/input_vcd.c5
7 files changed, 15 insertions, 37 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 918c9aa1a..a494f4a41 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.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_dvd.c,v 1.33 2001/10/17 20:33:09 guenter Exp $
+ * $Id: input_dvd.c,v 1.34 2001/10/20 02:01:51 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -738,7 +738,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
config_values_t *config;
int i;
- if (iface != 4) {
+ if (iface != 5) {
printf("dvd input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
"This means there's a version mismatch between xine and this input"
@@ -774,7 +774,6 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
this->input_plugin.get_mrl = dvd_plugin_get_mrl;
this->input_plugin.get_autoplay_list = dvd_plugin_get_autoplay_list;
this->input_plugin.get_optional_data = dvd_plugin_get_optional_data;
- this->input_plugin.handle_input_event= NULL;
this->input_plugin.is_branch_possible= NULL;
this->device = config->lookup_str(config, "dvd_device", DVD);
diff --git a/src/input/input_file.c b/src/input/input_file.c
index bf104087e..ab7b70356 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.26 2001/10/17 20:33:09 guenter Exp $
+ * $Id: input_file.c,v 1.27 2001/10/20 02:01:51 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -740,7 +740,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
file_input_plugin_t *this;
config_values_t *config;
- if (iface != 4) {
+ if (iface != 5) {
printf("file input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
"This means there's a version mismatch between xine and this input"
@@ -771,7 +771,6 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
this->input_plugin.get_identifier = file_plugin_get_identifier;
this->input_plugin.get_autoplay_list = NULL;
this->input_plugin.get_optional_data = file_plugin_get_optional_data;
- this->input_plugin.handle_input_event = NULL;
this->input_plugin.is_branch_possible = NULL;
this->fh = -1;
diff --git a/src/input/input_net.c b/src/input/input_net.c
index af74335cd..d7a576030 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -301,7 +301,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
net_input_plugin_t *this;
config_values_t *config;
- if (iface != 4) {
+ if (iface != 5) {
printf("net input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
"This means there's a version mismatch between xine and this input"
@@ -332,7 +332,6 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
this->input_plugin.get_identifier = net_plugin_get_identifier;
this->input_plugin.get_autoplay_list = NULL;
this->input_plugin.get_optional_data = net_plugin_get_optional_data;
- this->input_plugin.handle_input_event= NULL;
this->input_plugin.is_branch_possible= NULL;
this->fh = -1;
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 890787e87..b00b501d4 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.14 2001/10/18 23:46:40 guenter Exp $
+ * $Id: input_plugin.h,v 1.15 2001/10/20 02:01:51 guenter Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -33,7 +33,7 @@ extern "C" {
#include "buffer.h"
#include "configfile.h"
-#define INPUT_PLUGIN_IFACE_VERSION 4
+#define INPUT_PLUGIN_IFACE_VERSION 5
/*
* Return pointer of allocate/cleaned memory size *size*.
@@ -267,18 +267,11 @@ struct input_plugin_s
/*
- * Request optional datas from input plugin.
+ * request optional data from input plugin.
*/
int (*get_optional_data) (input_plugin_t *this, void *data, int data_type);
/*
- * deliver an input event (mouse press/move, keypress)
- * optional: may be NULL
- */
- void (*handle_input_event) (input_plugin_t *this, int event_type, int key,
- int x, int y);
-
- /*
* check if it is possible/valid to directly branch to this MRL
* optional: may be NULL
*/
@@ -297,6 +290,7 @@ struct input_plugin_s
#define INPUT_CAP_BROWSABLE 0x00000010
#define INPUT_CAP_CLUT 0x00000020
#define INPUT_CAP_AUDIOLANG 0x00000040
+#define INPUT_CAP_SPULANG 0x00000080
#define INPUT_OPTIONAL_UNSUPPORTED 0
@@ -304,17 +298,7 @@ struct input_plugin_s
#define INPUT_OPTIONAL_DATA_CLUT 1
#define INPUT_OPTIONAL_DATA_AUDIOLANG 2
-
-#define INPUT_EVENT_MOUSEBUTTON 1
-#define INPUT_EVENT_KEYPRESS 2
-#define INPUT_EVENT_MOUSEMOVE 3
-#define INPUT_EVENT_UP 4
-#define INPUT_EVENT_DOWN 5
-#define INPUT_EVENT_LEFT 6
-#define INPUT_EVENT_RIGHT 7
-#define INPUT_EVENT_MENU1 8
-#define INPUT_EVENT_MENU2 9
-#define INPUT_EVENT_MENU3 10
+#define INPUT_OPTIONAL_DATA_SPULANG 3
/*
* each input plugin _must_ implement this function:
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index b83d7ebf2..488980be7 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -461,7 +461,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
config_values_t *config;
int bufn;
- if (iface != 4) {
+ if (iface != 5) {
printf("rtp input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
"This means there's a version mismatch between xine and this input"
@@ -508,7 +508,6 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
this->input_plugin.get_mrl = rtp_plugin_get_mrl;
this->input_plugin.get_autoplay_list = NULL;
this->input_plugin.get_optional_data = rtp_plugin_get_optional_data;
- this->input_plugin.handle_input_event= NULL;
this->input_plugin.is_branch_possible= NULL;
this->fh = -1;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index b13271833..f0b2ccd54 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.14 2001/10/17 20:33:09 guenter Exp $
+ * $Id: input_stdin_fifo.c,v 1.15 2001/10/20 02:01:51 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -256,7 +256,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
stdin_input_plugin_t *this;
config_values_t *config;
- if (iface != 4) {
+ if (iface != 5) {
printf("rtp input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
"This means there's a version mismatch between xine and this input"
@@ -287,7 +287,6 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
this->input_plugin.get_identifier = stdin_plugin_get_identifier;
this->input_plugin.get_autoplay_list = NULL;
this->input_plugin.get_optional_data = stdin_plugin_get_optional_data;
- this->input_plugin.handle_input_event= NULL;
this->input_plugin.is_branch_possible= NULL;
this->fh = -1;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 74b83073e..9c6581dd5 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.28 2001/10/17 20:33:09 guenter Exp $
+ * $Id: input_vcd.c,v 1.29 2001/10/20 02:01:51 guenter Exp $
*
*/
@@ -1099,7 +1099,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
config_values_t *config;
int i;
- if (iface != 4) {
+ if (iface != 5) {
printf("vcd input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
"This means there's a version mismatch between xine and this input"
@@ -1134,7 +1134,6 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
this->input_plugin.get_mrl = vcd_plugin_get_mrl;
this->input_plugin.get_autoplay_list = vcd_plugin_get_autoplay_list;
this->input_plugin.get_optional_data = vcd_plugin_get_optional_data;
- this->input_plugin.handle_input_event= NULL;
this->input_plugin.is_branch_possible= NULL;
this->device = config->lookup_str(config, "vcd_device", CDROM);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 05:57:02 +0000