Redesign the Capture Device panel

[vlc] / include / vlc_es_out.h

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index f5b2351ea14bd6dbd15e7809e5aad33c6b34a85d..06728092d6222508a29eacdc350ee756a6be6b72 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -21,10 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 #ifndef _VLC_ES_OUT_H
 #define _VLC_ES_OUT_H 1
 
@@ -44,9 +40,9 @@ enum es_out_mode_e
 enum es_out_query_e
 {
     /* activate apply of mode */
-    ES_OUT_SET_ACTIVE,  /* arg1= vlc_bool_t                     */
+    ES_OUT_SET_ACTIVE,  /* arg1= bool                     */
     /* see if mode is currently aplied or not */
-    ES_OUT_GET_ACTIVE,  /* arg1= vlc_bool_t*                    */
+    ES_OUT_GET_ACTIVE,  /* arg1= bool*                    */
 
     /* set/get mode */
     ES_OUT_SET_MODE,    /* arg1= int                            */
@@ -59,8 +55,8 @@ enum es_out_query_e
     ES_OUT_SET_DEFAULT, /* arg1= es_out_id_t*                   */
 
     /* force selection/unselection of the ES (bypass current mode)*/
-    ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t   */
-    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t*  */
+    ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=bool   */
+    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=bool*  */
 
     /* */
     ES_OUT_SET_GROUP,   /* arg1= int                            */
@@ -99,7 +95,7 @@ struct es_out_t
     int          (*pf_send)   ( es_out_t *, es_out_id_t *, block_t * );
     void         (*pf_del)    ( es_out_t *, es_out_id_t * );
     int          (*pf_control)( es_out_t *, int i_query, va_list );
-    vlc_bool_t      b_sout;
+    bool      b_sout;
 
     es_out_sys_t    *p_sys;
 };