* src/misc/threads.c, src/misc/win32_specific.c, include/interface.h: fixed typos.

[vlc] / include / interface.h

diff --git a/include/interface.h b/include/interface.h
index 296806d388e1d9d4cc2612cf92f15baa1a960a42..ac2147b8888249288f62db431e97a39916753c6c 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.35 2002/10/04 12:01:40 gbazin 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,68 +23,56 @@
  * 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)
+ * This struct 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 intf_thread_s
+struct intf_thread_t
 {
-    boolean_t           b_die;                                 /* `die' flag */
-
-    /* Specific interfaces */
-    p_intf_console_t    p_console;                                /* console */
-    p_intf_sys_t        p_sys;                           /* system interface */
+    VLC_COMMON_MEMBERS
 
-    /* Plugin */
-    plugin_id_t             intf_plugin;                 /* 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 */
+    /* Thread properties and locks */
+    vlc_bool_t          b_block;
 
-    /* XXX: Channels array - new API */
-    //p_intf_channel_t *  p_channel[INTF_MAX_CHANNELS];/* channel descriptions */
-    /* file list - quick hack */
-    char **p_playlist;
-    int i_list_index;
-
-    /* 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;
+    /* Specific interfaces */
+    intf_console_t *    p_console;                                /* console */
+    intf_sys_t *        p_sys;                           /* system interface */
+    
+    /* Interface module */
+    module_t *   p_module;
+    void      ( *pf_run )    ( intf_thread_t * );
 
-} intf_thread_t;
+    /* XXX: new message passing stuff will go here */
+    vlc_mutex_t  change_lock;
+    vlc_bool_t   b_menu_change;
+    vlc_bool_t   b_menu;
+};
 
 /*****************************************************************************
  * 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 );
+#define intf_Create(a) __intf_Create(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 * ) );
 
+/*****************************************************************************
+ * Macros
+ *****************************************************************************/
+#ifdef WIN32
+#    define CONSOLE_INTRO_MSG \
+         AllocConsole(); \
+         freopen( "CONOUT$", "w", stdout ); \
+         freopen( "CONOUT$", "w", stderr ); \
+         freopen( "CONIN$", "r", stdin ); \
+         msg_Info( p_intf, VERSION_MESSAGE ); \
+         msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
+                             "anymore, open a dos command box, go to the " \
+                             "directory where you installed VLC and run " \
+                             "\"vlc -I win32\"\n") )
+#else
+#    define CONSOLE_INTRO_MSG
+#endif