* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_vout.h>
#include <vlc_block.h>
#include <vlc_filter.h>
* \param p_spu pointer to the subpicture queue the text is to be showed on
* \param i_channel Subpicture channel
* \param psz_string The text to be shown
- * \param p_style Pointer to a struct with text style info
+ * \param p_style Pointer to a struct with text style info (it is duplicated)
* \param i_flags flags for alignment and such
* \param i_hmargin horizontal margin in pixels
* \param i_vmargin vertical margin in pixels
* \param i_duration Amount of time the text is to be shown.
*/
int osd_ShowTextRelative( spu_t *p_spu, int i_channel,
- char *psz_string, text_style_t *p_style,
+ const char *psz_string, const text_style_t *p_style,
int i_flags, int i_hmargin, int i_vmargin,
mtime_t i_duration )
{
* \param p_spu pointer to the subpicture queue the text is to be showed on
* \param i_channel Subpicture channel
* \param psz_string The text to be shown
- * \param p_style Pointer to a struct with text style info
+ * \param p_style Pointer to a struct with text style info (it is duplicated)
* \param i_flags flags for alignment and such
* \param i_hmargin horizontal margin in pixels
* \param i_vmargin vertical margin in pixels
* is about to be shown
*/
int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
- char *psz_string, text_style_t *p_style,
+ const char *psz_string, const text_style_t *p_style,
int i_flags, int i_hmargin, int i_vmargin,
mtime_t i_start, mtime_t i_stop )
{
if( !psz_string ) return VLC_EGENERIC;
- p_spu = spu_CreateSubpicture( p_spu_channel );
- if( !p_spu ) return VLC_EGENERIC;
+ p_spu = subpicture_New( NULL );
+ if( !p_spu )
+ return VLC_EGENERIC;
+
+ p_spu->i_channel = i_channel;
+ p_spu->i_start = i_start;
+ p_spu->i_stop = i_stop;
+ p_spu->b_ephemer = true;
+ p_spu->b_absolute = false;
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('T','E','X','T');
- fmt.i_aspect = 0;
+ fmt.i_chroma = VLC_CODEC_TEXT;
fmt.i_width = fmt.i_height = 0;
fmt.i_x_offset = fmt.i_y_offset = 0;
- p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_spu_channel), &fmt );
+ p_spu->p_region = subpicture_region_New( &fmt );
if( !p_spu->p_region )
{
msg_Err( p_spu_channel, "cannot allocate SPU region" );
- spu_DestroySubpicture( p_spu_channel, p_spu );
+ subpicture_Delete( p_spu );
return VLC_EGENERIC;
}
p_spu->p_region->psz_text = strdup( psz_string );
- p_spu->i_start = i_start;
- p_spu->i_stop = i_stop;
- p_spu->b_ephemer = VLC_TRUE;
- p_spu->b_absolute = VLC_FALSE;
-
- p_spu->i_x = i_hmargin;
- p_spu->i_y = i_vmargin;
- p_spu->i_flags = i_flags;
- p_spu->i_channel = i_channel;
+ p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK;
+ p_spu->p_region->i_x = i_hmargin;
+ p_spu->p_region->i_y = i_vmargin;
spu_DisplaySubpicture( p_spu_channel, p_spu );
void osd_Message( spu_t *p_spu, int i_channel,
char *psz_format, ... )
{
- char *psz_string;
va_list args;
if( p_spu )
{
+ char *psz_string;
va_start( args, psz_format );
- vasprintf( &psz_string, psz_format, args );
-
- osd_ShowTextRelative( p_spu, i_channel, psz_string, NULL,
- OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, 30,20,1000000 );
+ if( vasprintf( &psz_string, psz_format, args ) != -1 )
+ {
+ osd_ShowTextRelative( p_spu, i_channel, psz_string, NULL,
+ SUBPICTURE_ALIGN_TOP|SUBPICTURE_ALIGN_RIGHT, 30,20,1000000 );
- free( psz_string );
+ free( psz_string );
+ }
va_end( args );
}
}