else
return VLC_EGENERIC;
}
+
static inline int spu_Control( spu_t *p_spu, int i_query, ... )
{
va_list args;
int i_background_alpha;/**< The transparency of the background.
0x00 is fully opaque,
0xFF fully transparent */
+ int i_karaoke_background_color;/**< Background color for karaoke 0xRRGGBB */
+ int i_karaoke_background_alpha;/**< The transparency of the karaoke bg.
+ 0x00 is fully opaque,
+ 0xFF fully transparent */
int i_outline_width; /**< The width of the outline in pixels */
int i_shadow_width; /**< The width of the shadow in pixels */
int i_spacing; /**< The spaceing between glyphs in pixels */
- int i_text_align; /**< An alignment hint for the text */
};
/* Style flags for \ref text_style_t */
#define STYLE_STRIKEOUT 64
static const text_style_t default_text_style = { NULL, 22, 0xffffff, 0xff, STYLE_OUTLINE,
- 0x000000, 0xff, 0x000000, 0xff, 0xffffff, 0x80, 1, 0, -1, 0 };
-
-
+ 0x000000, 0xff, 0x000000, 0xff, 0xffffff, 0x80, 0xffffff, 0xff, 1, 0, -1 };
/**
* OSD menu button states
#define OSD_BUTTON_SELECT 1
#define OSD_BUTTON_PRESSED 2
+static const char *ppsz_button_states[] = { "unselect", "select", "pressed" };
+
/**
* OSD State object
*
/* quick link in the linked list. */
osd_button_t *p_last_button; /*< pointer to last button in the list */
+
+ /* misc parser */
+ module_t *p_parser; /*< pointer to parser module */
+ char *psz_file; /*< Config file name */
+ image_handler_t *p_image; /*< handler to image loading and conversion libraries */
};
/**
*/
VLC_EXPORT( int, osd_ShowTextRelative, ( spu_t *, int, char *, text_style_t *, int, int, int, mtime_t ) );
VLC_EXPORT( int, osd_ShowTextAbsolute, ( spu_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t ) );
-VLC_EXPORT( void,osd_Message, ( spu_t *, int, char *, ... ) );
+VLC_EXPORT( void,osd_Message, ( spu_t *, int, char *, ... ) ATTRIBUTE_FORMAT( 3, 4 ) );
/**
* Default feedback images
VLC_EXPORT( int, osd_Slider, ( vlc_object_t *, spu_t *, int, int, int, int, int, int, short ) );
VLC_EXPORT( int, osd_Icon, ( vlc_object_t *, spu_t *, int, int, int, int, int, short ) );
-/**
- * Loading and parse the OSD Configuration file
- *
- * These functions load/unload the OSD menu configuration file and
- * create/destroy the themable OSD menu structure on the OSD object.
- */
-VLC_EXPORT( int, osd_ConfigLoader, ( vlc_object_t *, const char *, osd_menu_t ** ) );
-VLC_EXPORT( void, osd_ConfigUnload, ( vlc_object_t *, osd_menu_t ** ) );
-
/** @} */
/**********************************************************************
* \param i_channel Subpicture channel
* \param psz_format printf style formatting
**/
-VLC_EXPORT( void, __vout_OSDMessage, ( vlc_object_t *, int, const char *, ... ) );
+VLC_EXPORT( void, __vout_OSDMessage, ( vlc_object_t *, int, const char *, ... ) ATTRIBUTE_FORMAT( 3, 4 ) );
/**
* Same as __vlc_OSDMessage() but with automatic casting