* cmml: fix for loading non-file:// URLs on win32

[vlc] / include / vlc_interface.h

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 8ab8aa5f54efa7f99b17edc35b7de77ba1eae3db..e2af220641e46f3428da3a19394a8644a262ef78 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.10 2004/03/01 18:31:12 gbazin Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -50,6 +50,7 @@ struct intf_thread_t
 
     /* Thread properties and locks */
     vlc_bool_t          b_block;
+    vlc_bool_t          b_play;
 
     /* Specific interfaces */
     intf_console_t *    p_console;                               /** console */
@@ -63,6 +64,13 @@ struct intf_thread_t
     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;
@@ -133,14 +141,17 @@ 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_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