* ALL: changed "struct foo_s" into "struct foo_t" to make greppers happy.

[vlc] / include / interface.h

diff --git a/include/interface.h b/include/interface.h
index 99e98b7684b8220a67ec795f0acb4d9d91f6d5dc..15097570feb8b0eabae9af13fb0ae87475351426 100644 (file)
--- a/include/interface.h
+++ b/include/interface.h
@@ -4,8 +4,9 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: interface.h,v 1.32 2002/07/20 18:01:41 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
@@ -22,80 +23,42 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * Required headers:
- *  <sys/uio.h>
- *  <X11/Xlib.h>
- *  <X11/extensions/XShm.h>
- *  "config.h"
- *  "common.h"
- *  "mtime.h"
- *  "threads.h"
- *  "input.h"
- *  "video.h"
- *  "video_output.h"
- *  "audio_output.h"
- *  "xconsole.h"
- *****************************************************************************/
-
 /*****************************************************************************
  * intf_thread_t: describe an interface thread
  *****************************************************************************
  * 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 _key
+struct intf_thread_t
 {
-    int received_key;
-    int forwarded_key;
-    struct _key *  next;
-} intf_key;
-
-typedef intf_key * p_intf_key;
+    VLC_COMMON_MEMBERS
 
-typedef struct intf_thread_s
-{
-    boolean_t           b_die;                                 /* `die' flag */
+    /* Thread properties and locks */
+    vlc_bool_t          b_block;
 
     /* Specific interfaces */
-    p_intf_console_t    p_console;                                /* console */
-    p_intf_sys_t        p_sys;                           /* system interface */
-    p_intf_key          p_keys;
+    intf_console_t *    p_console;                                /* console */
+    intf_sys_t *        p_sys;                           /* system interface */
     
-    /* 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 */
+    module_t *   p_module;
+    int       ( *pf_open )   ( intf_thread_t * );
+    void      ( *pf_close )  ( intf_thread_t * );
+    void      ( *pf_run )    ( intf_thread_t * );
 
-    /* XXX: Channels array - new API */
-  //p_intf_channel_t *  p_channel[INTF_MAX_CHANNELS];/* channel descriptions */
+    /* XXX: new message passing stuff will go here */
+    vlc_mutex_t  change_lock;
+    vlc_bool_t   b_menu_change;
+    vlc_bool_t   b_menu;
 
-    /* Channels array - NULL if not used */
-    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;
-
-} 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 intf_getKey( intf_thread_t *p_intf, int r_key);
-
-void intf_AssignNormalKeys( intf_thread_t *p_intf);
+#define intf_Create(a) __intf_Create(CAST_TO_VLC_OBJECT(a))
+VLC_EXPORT( intf_thread_t *, __intf_Create,     ( vlc_object_t * ) );
+VLC_EXPORT( vlc_error_t,       intf_RunThread,  ( intf_thread_t * ) );
+VLC_EXPORT( void,              intf_StopThread, ( intf_thread_t * ) );
+VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );