* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
+ * $Id: interface.h,v 1.22 2001/03/21 13:42:33 sam Exp $
*
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/*****************************************************************************
* Required headers:
- * <sys/uio.h>
* <X11/Xlib.h>
* <X11/extensions/XShm.h>
* "config.h"
* This structe describes all interface-specific data of the main (interface)
* thread.
*****************************************************************************/
-typedef int ( intf_sys_create_t ) ( p_intf_thread_t p_intf );
-typedef void ( intf_sys_destroy_t ) ( p_intf_thread_t p_intf );
-typedef void ( intf_sys_manage_t ) ( p_intf_thread_t p_intf );
-
-
typedef struct _keyparam
{
int key;
p_intf_sys_t p_sys; /* system interface */
p_intf_key p_keys;
- /* Plugin */
- intf_sys_create_t * p_sys_create; /* create interface thread */
- intf_sys_manage_t * p_sys_manage; /* main loop */
- intf_sys_destroy_t * p_sys_destroy; /* destroy interface */
+ /* Plugin used and shortcuts to access its capabilities */
+ struct module_s * p_module;
+ int ( *pf_open ) ( struct intf_thread_s * );
+ void ( *pf_close ) ( struct intf_thread_s * );
+ void ( *pf_run ) ( struct intf_thread_s * );
+
+ /* Interface callback */
+ void ( *pf_manage ) ( struct intf_thread_s * );
/* XXX: Channels array - new API */
//p_intf_channel_t * p_channel[INTF_MAX_CHANNELS];/* channel descriptions */
p_intf_channel_t p_channel; /* description of channels */
/* Main threads - NULL if not active */
- p_vout_thread_t p_vout;
p_input_thread_t p_input;
/* Specific functions */
- keyparm (*p_intf_getKey)(struct intf_thread_s *p_intf, int r_key) ;
+ keyparm (*p_intf_get_key)(struct intf_thread_s *p_intf, int r_key) ;
+
+ /* XXX: new message passing stuff will go here */
+ vlc_mutex_t change_lock;
+ boolean_t b_menu_change;
+ boolean_t b_menu;
} intf_thread_t;
* Prototypes
*****************************************************************************/
intf_thread_t * intf_Create ( void );
-void intf_Run ( intf_thread_t * p_intf );
void intf_Destroy ( intf_thread_t * p_intf );
-int intf_SelectChannel ( intf_thread_t * p_intf, int i_channel );
int intf_ProcessKey ( intf_thread_t * p_intf, int i_key );
void intf_AssignKey( intf_thread_t *p_intf, int r_key, int f_key, int param);
-
-void intf_AssignSKey( intf_thread_t *p_intf, int r_key, int f_key);
-
-keyparm intf_getKey( intf_thread_t *p_intf, int r_key);
-
+keyparm intf_GetKey( intf_thread_t *p_intf, int r_key);
void intf_AssignNormalKeys( intf_thread_t *p_intf);