* network stream now work

[vlc] / include / interface.h

diff --git a/include/interface.h b/include/interface.h
index 3791abb631e45f5b2c13962564fb6c9ae19d03e6..f2480169436fa359d8bc442cba1baeed7fa10401 100644 (file)
--- a/include/interface.h
+++ b/include/interface.h
@@ -1,54 +1,78 @@
-/******************************************************************************
+/*****************************************************************************
  * interface.h: interface access for other threads
- * (c)1999 VideoLAN
- ******************************************************************************
  * This library provides basic functions for threads to interact with user
  * interface, such as message output.
- ******************************************************************************
- * Required headers:
- *  <sys/uio.h>
- *  <X11/Xlib.h>
- *  <X11/extensions/XShm.h>
- *  "config.h"
- *  "common.h"
- *  "mtime.h"
- *  "vlc_thread.h"
- *  "input.h"
- *  "video.h"
- *  "video_output.h"
- *  "audio_output.h"
- *  "xconsole.h"
- ******************************************************************************/
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: interface.h,v 1.40 2003/02/07 00:29:53 sam Exp $
+ *
+ * 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
+ * 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
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
 
-/******************************************************************************
+/*****************************************************************************
  * 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 struct intf_thread_s
+ *****************************************************************************/
+struct intf_thread_t
 {
-    boolean_t           b_die;                                  /* `die' flag */
+    VLC_COMMON_MEMBERS
 
-    /* Specific interfaces */     
-    p_intf_console_t    p_console;                                 /* console */
-    p_intf_sys_t        p_sys;                            /* system interface */
+    /* Thread properties and locks */
+    vlc_bool_t          b_block;
 
-    /* Channels array - NULL if not used */
-    p_intf_channel_t    p_channel;                 /* description of channels */    
+    /* Specific interfaces */
+    intf_console_t *    p_console;                                /* console */
+    intf_sys_t *        p_sys;                           /* system interface */
 
-    /* Main threads - NULL if not active */
-    p_vout_thread_t     p_vout;
-    p_input_thread_t    p_input;        
-} intf_thread_t;
+    /* Interface module */
+    module_t *   p_module;
+    void      ( *pf_run )    ( 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 );
+    /* XXX: new message passing stuff will go here */
+    vlc_mutex_t  change_lock;
+    vlc_bool_t   b_menu_change;
+    vlc_bool_t   b_menu;
+};
 
-int             intf_SelectChannel      ( intf_thread_t * p_intf, int i_channel );
-int             intf_ProcessKey         ( intf_thread_t * p_intf, int i_key );
+/*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+#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