Options as infos were bad in several ways: it broke PLAYLIST_GO, used

[vlc] / include / osd.h

diff --git a/include/osd.h b/include/osd.h
index c5d3828a87854f10615497be7a46e85442f1d939..7d0bc60063beeefeb6389a75fef6558d7c12ad82 100644 (file)
--- a/include/osd.h
+++ b/include/osd.h
@@ -2,7 +2,7 @@
  * osd.h : Constants for use with osd modules
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: osd.h,v 1.2 2003/07/14 21:32:58 sigmunau Exp $
+ * $Id: osd.h,v 1.6 2003/12/08 17:48:13 yoann Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -21,10 +21,20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define OSD_ALIGN_LEFT 0
-#define OSD_ALIGN_RIGHT 0x1
-#define OSD_ALIGN_TOP 0
-#define OSD_ALIGN_BOTTOM 0x2
+/**
+ * \file
+ * Stucts and function prototypes to place text on the video
+ */
+
+#define OSD_ALIGN_LEFT 0x1
+#define OSD_ALIGN_RIGHT 0x2
+#define OSD_ALIGN_TOP 0x4
+#define OSD_ALIGN_BOTTOM 0x8
+
+/**
+ * Text style information.
+ * This struct is currently ignored
+ */
 struct text_style_t
 {
     int i_size;
@@ -35,5 +45,6 @@ struct text_style_t
 };
 static const text_style_t default_text_style = { 22, 0xffffff, VLC_FALSE, VLC_FALSE, VLC_FALSE };
 
-VLC_EXPORT( void, vout_ShowTextRelative, ( vout_thread_t *, char *, text_style_t *, int, int, int, mtime_t ) );
+VLC_EXPORT( subpicture_t *, vout_ShowTextRelative, ( vout_thread_t *, char *, text_style_t *, int, int, int, mtime_t ) );
 VLC_EXPORT( void,  vout_ShowTextAbsolute, ( vout_thread_t *, char *, text_style_t *, int, int, int, mtime_t, mtime_t ) );
+VLC_EXPORT( void,  vout_OSDMessage, ( vlc_object_t *, char * ) );