* backport of the most important changes from [11379]

[vlc] / include / vlc_interface.h

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 90b69fbf19d19d9abd60ed5b6ef4c63537881e56..2626cb5773e9180c72d55515d97eb77750461688 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vlc_interface.h,v 1.5 2003/08/30 13:59:15 gbazin Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -25,35 +25,59 @@
 
 typedef struct intf_dialog_args_t intf_dialog_args_t;
 
+/**
+ * \file
+ * This file contains structures and function prototypes for
+ * interface management in vlc
+ */
+
+
 /*****************************************************************************
  * intf_thread_t: describe an interface thread
  *****************************************************************************
  * This struct describes all interface-specific data of the main (interface)
  * thread.
  *****************************************************************************/
+
+/**
+ * \defgroup vlc_interface Interface
+ * These functions and structures are for interface management
+ * @{
+ */
 struct intf_thread_t
 {
     VLC_COMMON_MEMBERS
 
     /* Thread properties and locks */
     vlc_bool_t          b_block;
+    vlc_bool_t          b_play;
 
     /* Specific interfaces */
-    intf_console_t *    p_console;                                /* console */
-    intf_sys_t *        p_sys;                           /* system interface */
+    intf_console_t *    p_console;                               /** console */
+    intf_sys_t *        p_sys;                          /** system interface */
 
-    /* Interface module */
+    /** Interface module */
     module_t *   p_module;
-    void      ( *pf_run )    ( intf_thread_t * );
+    void      ( *pf_run )    ( intf_thread_t * ); /** Run function */
 
-    /* Specific for dialogs providers */
+    /** Specific for dialogs providers */
     void ( *pf_show_dialog ) ( intf_thread_t *, int, int,
                                intf_dialog_args_t * );
 
+    /** Video window callbacks */
+    void * ( *pf_request_window ) ( intf_thread_t *, vout_thread_t *,
+                                    int *, int *,
+                                    unsigned int *, unsigned int * );
+    void   ( *pf_release_window ) ( intf_thread_t *, void * );
+    int    ( *pf_control_window ) ( intf_thread_t *, void *, int, va_list );
+
     /* XXX: new message passing stuff will go here */
     vlc_mutex_t  change_lock;
     vlc_bool_t   b_menu_change;
     vlc_bool_t   b_menu;
+
+    /* Provides the ability to switch an interface on the fly */
+    char *psz_switch_intf;
 };
 
 /*****************************************************************************
@@ -66,11 +90,6 @@ struct intf_dialog_args_t
 {
     char *psz_title;
 
-    vlc_bool_t  b_blocking;
-    vlc_bool_t  b_ready;
-    vlc_mutex_t lock;
-    vlc_cond_t  wait;
-
     char **psz_results;
     int  i_results;
 
@@ -92,15 +111,20 @@ 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 \
+         if( !getenv( "PWD" ) || !getenv( "PS1" ) ) /* detect cygwin shell */ \
+         { \
          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 " \
@@ -115,12 +139,19 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_FILE        2
 #define INTF_DIALOG_DISC        3
 #define INTF_DIALOG_NET         4
-#define INTF_DIALOG_SAT         5
+#define INTF_DIALOG_CAPTURE     5
+#define INTF_DIALOG_SAT         6
+
+#define INTF_DIALOG_DIRECTORY   7
+
+#define INTF_DIALOG_STREAMWIZARD 8
+#define INTF_DIALOG_WIZARD 9
 
 #define INTF_DIALOG_PLAYLIST   10
 #define INTF_DIALOG_MESSAGES   11
 #define INTF_DIALOG_FILEINFO   12
 #define INTF_DIALOG_PREFS      13
+#define INTF_DIALOG_BOOKMARKS  14
 
 #define INTF_DIALOG_POPUPMENU  20
 
@@ -132,9 +163,9 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_ABOUT_MSG \
     _( "VLC is an open-source and cross-platform multimedia " \
        "player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, " \
-       "DivX, mp3, Ogg, ...) as well as DVDs, VCDs, CD audio, and various " \
+       "DivX, mp3, Ogg, etc.) as well as DVDs, VCDs, CD audio, and various " \
        "streaming protocols.\n\n" \
        "VLC is also a streaming server with transcoding capabilities " \
-       "(UDP unicast and multicast, HTTP, ...) mainly designed for " \
+       "(UDP unicast and multicast, HTTP, etc.) mainly designed for " \
        "high-bandwidth networks.\n\n"\
        "For more information, have a look at the web site." )