* 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 15097570feb8b0eabae9af13fb0ae87475351426..ac2147b8888249288f62db431e97a39916753c6c 100644 (file)
--- a/include/interface.h
+++ b/include/interface.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: interface.h,v 1.32 2002/07/20 18:01:41 sam Exp $
+ * $Id: interface.h,v 1.35 2002/10/04 12:01:40 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -26,7 +26,7 @@
 /*****************************************************************************
  * 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.
  *****************************************************************************/
 struct intf_thread_t
@@ -40,25 +40,39 @@ struct intf_thread_t
     intf_console_t *    p_console;                                /* console */
     intf_sys_t *        p_sys;                           /* system interface */
     
-    /* Plugin used and shortcuts to access its capabilities */
+    /* Interface module */
     module_t *   p_module;
-    int       ( *pf_open )   ( intf_thread_t * );
-    void      ( *pf_close )  ( intf_thread_t * );
     void      ( *pf_run )    ( 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
  *****************************************************************************/
-#define intf_Create(a) __intf_Create(CAST_TO_VLC_OBJECT(a))
+#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