Some heavy changes today:

[vlc] / include / interface.h

diff --git a/include/interface.h b/include/interface.h
index 3adfa92da9fb8aa3f54b6ae6c6c73ec4d42d633e..65eeb855cc56e5567aa5301d114363aed6248014 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.25 2001/12/30 07:09:54 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,48 +23,12 @@
  * 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 _keyparam
-{
-    int key;
-    int param;
-} keyparm;
-
-typedef struct _key
-{
-    int received_key;
-    keyparm forwarded;
-    struct _key *  next;
-} intf_key;
-
-typedef intf_key * p_intf_key;
-
 typedef struct intf_thread_s
 {
     boolean_t           b_die;                                 /* `die' flag */
@@ -71,25 +36,23 @@ typedef struct intf_thread_s
     /* Specific interfaces */
     p_intf_console_t    p_console;                                /* console */
     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 * );
 
-    /* XXX: Channels array - new API */
-  //p_intf_channel_t *  p_channel[INTF_MAX_CHANNELS];/* channel descriptions */
+    /* Interface callback */
+    void             ( *pf_manage ) ( struct intf_thread_s * );
 
-    /* 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;
+    /* Input thread - NULL if not active */
     p_input_thread_t    p_input;
 
-    /* Specific functions */
-    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;
 
@@ -97,13 +60,5 @@ typedef struct intf_thread_s
  * 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);
-keyparm intf_GetKey( intf_thread_t *p_intf, int r_key);
-void intf_AssignNormalKeys( intf_thread_t *p_intf);
-