* network stream now work

[vlc] / include / interface.h

diff --git a/include/interface.h b/include/interface.h
index 2d463cb3950f9fbb6de50cedf4b5c869020ff07a..f2480169436fa359d8bc442cba1baeed7fa10401 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.29 2002/06/01 12:31:57 sam Exp $
+ * $Id: interface.h,v 1.40 2003/02/07 00:29:53 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -12,7 +12,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -26,10 +26,10 @@
 /*****************************************************************************
  * 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_s
+struct intf_thread_t
 {
     VLC_COMMON_MEMBERS
 
@@ -39,11 +39,9 @@ struct intf_thread_s
     /* Specific interfaces */
     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 */
@@ -55,14 +53,26 @@ struct intf_thread_s
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-intf_thread_t * intf_Create     ( vlc_object_t * );
-vlc_error_t     intf_RunThread  ( intf_thread_t * );
-void            intf_StopThread ( intf_thread_t * );
-void            intf_Destroy    ( intf_thread_t * );
-
-void            msg_Create      ( vlc_object_t * );
-void            msg_Destroy     ( vlc_object_t * );
-
-VLC_EXPORT( msg_subscription_t*, msg_Subscribe, ( vlc_object_t * ) );
-VLC_EXPORT( void, msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) );
+#define intf_Create(a,b) __intf_Create(VLC_OBJECT(a),b)
+VLC_EXPORT( intf_thread_t *, __intf_Create,     ( vlc_object_t *, const char * ) );
+VLC_EXPORT( int,               intf_RunThread,  ( intf_thread_t * ) );
+VLC_EXPORT( void,              intf_StopThread, ( intf_thread_t * ) );
+VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 
+/*****************************************************************************
+ * Macros
+ *****************************************************************************/
+#if defined( WIN32 ) && !defined( UNDER_CE )
+#    define CONSOLE_INTRO_MSG \
+         AllocConsole(); \
+         freopen( "CONOUT$", "w", stdout ); \
+         freopen( "CONOUT$", "w", stderr ); \
+         freopen( "CONIN$", "r", stdin ); \
+         msg_Info( p_intf, COPYRIGHT_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