diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/configfile.c | 17 | ||||
| -rw-r--r-- | src/xine-engine/configfile.h | 23 | ||||
| -rw-r--r-- | src/xine-engine/events.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/events.h | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 12 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 13 |
6 files changed, 39 insertions, 34 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 729d2e600..d901f0d5c 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.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: configfile.c,v 1.3 2001/06/15 11:08:13 f1rmb Exp $ + * $Id: configfile.c,v 1.4 2001/07/26 11:12:26 f1rmb Exp $ * * config file management - implementation * @@ -33,17 +33,6 @@ #include "configfile.h" #include "utils.h" -typedef struct cfg_entry_s { - struct cfg_entry_s *next; - char *key, *value; -} cfg_entry_t; - -struct cfg_data_s { - cfg_entry_t *gConfig, *gConfigLast; -}; - - - /* * internal utility functions *******************************/ @@ -290,6 +279,10 @@ config_values_t *config_file_init (char *filename) { /* * $Log: configfile.c,v $ + * Revision 1.4 2001/07/26 11:12:26 f1rmb + * Updated doxy sections in xine.h.tmpl.in. Added man3. Removed french man page. Added API doc in html. Add new rpm package (doc). Fixes some little bugs in + * proto decl, etc... + * * Revision 1.3 2001/06/15 11:08:13 f1rmb * Check arguments in public functions. * diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index fc1b3c829..eb332afea 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.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: configfile.h,v 1.2 2001/07/18 21:38:17 f1rmb Exp $ + * $Id: configfile.h,v 1.3 2001/07/26 11:12:26 f1rmb Exp $ * * config file management * @@ -32,9 +32,18 @@ extern "C" { #include <inttypes.h> -typedef struct config_values_s config_values_t; -typedef struct cfg_data_s cfg_data_t; +typedef struct cfg_entry_s { + struct cfg_entry_s *next; + char *key; + char *value; +} cfg_entry_t; + +typedef struct { + cfg_entry_t *gConfig; + cfg_entry_t *gConfigLast; +} cfg_data_t; +typedef struct config_values_s config_values_t; struct config_values_s { /* * lookup config values @@ -87,6 +96,10 @@ config_values_t *config_file_init (char *filename); /* * $Log: configfile.h,v $ + * Revision 1.3 2001/07/26 11:12:26 f1rmb + * Updated doxy sections in xine.h.tmpl.in. Added man3. Removed french man page. Added API doc in html. Add new rpm package (doc). Fixes some little bugs in + * proto decl, etc... + * * Revision 1.2 2001/07/18 21:38:17 f1rmb * Split alsa drivers, more checks about versions. Made xine lib c++ compliant. * @@ -104,7 +117,3 @@ config_values_t *config_file_init (char *filename); * started touching demuxers * */ - - - - diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c index f2774168a..43768c631 100644 --- a/src/xine-engine/events.c +++ b/src/xine-engine/events.c @@ -29,7 +29,7 @@ #include "xine_internal.h" -int xine_register_event_listener(xine_t *this, event_listener_t *listener) { +int xine_register_event_listener(xine_t *this, event_listener_t listener) { /* Ensure the listener is non-NULL */ if(listener == NULL) { return 0; @@ -53,7 +53,7 @@ void xine_send_event(xine_t *this, event_t *event, void *data) { } } -int xine_remove_event_listener(xine_t *this, event_listener_t *listener) { +int xine_remove_event_listener(xine_t *this, event_listener_t listener) { uint16_t i, found; found = 1; i = 0; diff --git a/src/xine-engine/events.h b/src/xine-engine/events.h index 3eebe4b3d..19db8b618 100644 --- a/src/xine-engine/events.h +++ b/src/xine-engine/events.h @@ -37,7 +37,7 @@ extern "C" { /** * Generic Event type. */ -typedef struct event_s { +typedef struct { uint32_t type; /* The event type (determines remainder of struct) */ /* Event dependent data goes after this. */ @@ -47,7 +47,7 @@ typedef struct event_s { * Mouse event. */ #define XINE_MOUSE_EVENT 0x0001 -typedef struct mouse_event_s { +typedef struct { event_t event; uint8_t button; /* Generally 1 = left, 2 = mid, 3 = right */ uint16_t x,y; /* In Image space */ diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index cdb0f52b5..064f7754f 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.36 2001/07/25 23:26:14 richwareham Exp $ + * $Id: xine.c,v 1.37 2001/07/26 11:12:26 f1rmb Exp $ * * top-level xine functions * @@ -357,12 +357,12 @@ void xine_pause (xine_t *this) { pthread_mutex_unlock (&this->xine_lock); } -void event_handler(xine_t *xine, event_t *event, void *data) { +static void event_handler(xine_t *xine, event_t *event, void *data) { /* Check Xine handle/current input plugin is not NULL */ if((xine == NULL) || (xine->cur_input_plugin == NULL)) { return; } - + switch(event->type) { case XINE_MOUSE_EVENT: { @@ -372,7 +372,7 @@ void event_handler(xine_t *xine, event_t *event, void *data) { if(xine->cur_input_plugin->handle_input_event != NULL) { if(mevent->button != 0) { /* Click event. */ - xine->cur_input_plugin->handle_input_event(xine->cur_input_plugin, + xine->cur_input_plugin->handle_input_event(xine->cur_input_plugin, INPUT_EVENT_MOUSEBUTTON, 0, mevent->x, mevent->y); } else { @@ -474,7 +474,9 @@ xine_t *xine_init (vo_driver_t *vo, */ this->num_event_listeners = 0; /* Initially there are none */ - xine_register_event_listener(this, event_handler); + if((xine_register_event_listener(this, event_handler)) < 1) { + fprintf(stderr, "xine_register_event_listener() failed.\n"); + } return this; } diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 36914b64f..619b5b16d 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.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: xine_internal.h,v 1.34 2001/07/24 18:04:22 guenter Exp $ + * $Id: xine_internal.h,v 1.35 2001/07/26 11:12:26 f1rmb Exp $ * */ @@ -123,7 +123,8 @@ typedef void (*gui_stream_end_cb_t)(int nStatus); #define XINE_QUIT 3 typedef struct xine_s xine_t; -typedef void (*event_listener_t) (xine_t *xine, event_t *event, void *data); + +typedef void (*event_listener_t) (xine_t *, event_t *, void *); struct xine_s { @@ -444,20 +445,20 @@ ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, char *id) */ /** - * \fn xine_register_event_listener(event_listener_t *listener) + * \fn xine_register_event_listener(xine_t *this, event_listener_t listener) * \brief registers an event listener callback. * \return 0 if the listener was registerd, non-zero if it could not. */ -int xine_register_event_listener(xine_t *this, event_listener_t *listener); +int xine_register_event_listener(xine_t *this, event_listener_t listener); /** - * \fn xine_remove_event_listener(event_listener_t *listener) + * \fn xine_remove_event_listener(event_listener_t listener) * \brief Attempts to remove a registered event listener. * \return 0 if the listener was removes, non-zero if it wasn't (e.g. not found). */ -int xine_remove_event_listener(xine_t *this, event_listener_t *listener); +int xine_remove_event_listener(xine_t *this, event_listener_t listener); /** * \fn xine_send_event(event_t *event) |