Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/input input_dvd.c,1.33,1.34 input_file.c,1.26,1.27 input_net.c,1.10,1.11 input_plugin.h,1.14,1.15 input_rtp.c,1.11,1.12 input_stdin_fifo.c,1.14,1.15 input_vcd.c,1.28,1.29
|
From: Guenter B. <gu...@us...> - 2001-10-20 02:01:54
|
Update of /cvsroot/xine/xine-lib/src/input
In directory usw-pr-cvs1:/tmp/cvs-serv8392/src/input
Modified Files:
input_dvd.c input_file.c input_net.c input_plugin.h
input_rtp.c input_stdin_fifo.c input_vcd.c
Log Message:
big event cleanup: one single mechanism is now used for all communications between gui, plugins and the xine engine; code cleanup
Index: input_dvd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- input_dvd.c 2001/10/17 20:33:09 1.33
+++ input_dvd.c 2001/10/20 02:01:51 1.34
@@ -738,7 +738,7 @@
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 @@
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);
Index: input_file.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_file.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- input_file.c 2001/10/17 20:33:09 1.26
+++ input_file.c 2001/10/20 02:01:51 1.27
@@ -740,7 +740,7 @@
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 @@
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;
Index: input_net.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_net.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- input_net.c 2001/10/17 20:33:09 1.10
+++ input_net.c 2001/10/20 02:01:51 1.11
@@ -301,7 +301,7 @@
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 @@
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;
Index: input_plugin.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_plugin.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- input_plugin.h 2001/10/18 23:46:40 1.14
+++ input_plugin.h 2001/10/20 02:01:51 1.15
@@ -33,7 +33,7 @@
#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 @@
/*
- * 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 @@
#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 @@
#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:
Index: input_rtp.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_rtp.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- input_rtp.c 2001/10/17 20:33:09 1.11
+++ input_rtp.c 2001/10/20 02:01:51 1.12
@@ -461,7 +461,7 @@
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 @@
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;
Index: input_stdin_fifo.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_stdin_fifo.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- input_stdin_fifo.c 2001/10/17 20:33:09 1.14
+++ input_stdin_fifo.c 2001/10/20 02:01:51 1.15
@@ -256,7 +256,7 @@
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 @@
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;
Index: input_vcd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_vcd.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- input_vcd.c 2001/10/17 20:33:09 1.28
+++ input_vcd.c 2001/10/20 02:01:51 1.29
@@ -1099,7 +1099,7 @@
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 @@
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);
|