#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#include <time.h>
-
#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#include <vlc_vout.h>
#include "vlc_filter.h"
#include "vlc_block.h"
#include "vlc_osd.h"
-#include "vlc_playlist.h"
-#include "vlc_meta.h"
-#include "vlc_input.h"
-#include <vlc/aout.h>
+
+#include "vlc_strings.h"
/*****************************************************************************
* Local prototypes
0x00FFFFFF, 0x00800000, 0x00FF0000, 0x00FF00FF, 0x00FFFF00,
0x00808000, 0x00008000, 0x00008080, 0x0000FF00, 0x00800080,
0x00000080, 0x000000FF, 0x0000FFFF};
-static char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"),
+static const char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"),
N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"), N_("Red"),
N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"),
N_("Teal"), N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"),
"also use combinations of these values, eg 6 = top-right).")
static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static char *ppsz_pos_descriptions[] =
+static const char *ppsz_pos_descriptions[] =
{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
add_integer( CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
add_integer( CFG_PREFIX "position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
set_section( N_("Font"), NULL );
/* 5 sets the default to top [1] left [4] */
- change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL,
OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
p_filter->p_cfg );
#define CREATE_VAR( stor, type, var ) \
- p_sys->stor = var_CreateGet##type( p_filter, var ); \
+ p_sys->stor = var_CreateGet##type##Command( p_filter, var ); \
var_AddCallback( p_filter, var, MarqueeCallback, p_sys );
CREATE_VAR( i_xoff, Integer, "marq-x" );
if( p_sys->p_style ) free( p_sys->p_style );
if( p_sys->psz_marquee ) free( p_sys->psz_marquee );
- free( p_sys );
/* Delete the marquee variables */
#define DEL_VAR(var) \
DEL_VAR( "marq-color" );
DEL_VAR( "marq-opacity" );
DEL_VAR( "marq-size" );
-}
-/****************************************************************************
- * String formating functions
- ****************************************************************************/
-static char *FormatTime(char *tformat )
-{
- char buffer[255];
- time_t curtime;
-#if defined(HAVE_LOCALTIME_R)
- struct tm loctime;
-#else
- struct tm *loctime;
-#endif
-
- /* Get the current time. */
- curtime = time( NULL );
-
- /* Convert it to local time representation. */
-#if defined(HAVE_LOCALTIME_R)
- localtime_r( &curtime, &loctime );
- strftime( buffer, 255, tformat, &loctime );
-#else
- loctime = localtime( &curtime );
- strftime( buffer, 255, tformat, loctime );
-#endif
- return strdup( buffer );
-}
-
-#define INSERT_STRING( check, string ) \
- if( check && string ) \
- { \
- int len = strlen( string ); \
- dst = realloc( dst, \
- i_size = i_size + len + 1 ); \
- strncpy( d, string, len+1 ); \
- d += len; \
- } \
- else \
- { \
- *d = '-'; \
- d++; \
- }
-char *FormatMeta( vlc_object_t *p_object, char *string )
-{
- char *s = string;
- char *dst = malloc( 1000 );
- char *d = dst;
- int b_is_format = 0;
- char buf[10];
- int i_size = strlen( string );
-
- playlist_t *p_playlist = pl_Yield( p_object );
- input_thread_t *p_input = p_playlist->p_input;
- input_item_t *p_item = NULL;
- pl_Release( p_object );
- if( p_input )
- {
- vlc_object_yield( p_input );
- p_item = p_input->input.p_item;
- if( p_item )
- vlc_mutex_lock( &p_item->lock );
- }
-
- sprintf( dst, string );
-
- while( *s )
- {
- if( b_is_format )
- {
- switch( *s )
- {
- case 'a':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_artist );
- break;
- case 'b':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_album );
- break;
- case 'c':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_copyright );
- break;
- case 'd':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_description );
- break;
- case 'e':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_encodedby );
- break;
- case 'g':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_genre );
- break;
- case 'l':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_language );
- break;
- case 'n':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_tracknum );
- break;
- case 'p':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_nowplaying );
- break;
- case 'r':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_rating );
- break;
- case 's':
- {
- char *lang;
- if( p_input )
- {
- lang = var_GetString( p_input, "sub-language" );
- }
- else
- {
- lang = strdup( "-" );
- }
- INSERT_STRING( 1, lang );
- free( lang );
- break;
- }
- case 't':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_title );
- break;
- case 'u':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_url );
- break;
- case 'A':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_date );
- break;
- case 'B':
- if( p_input )
- {
- snprintf( buf, 10, "%d",
- var_GetInteger( p_input, "bit-rate" )/1000 );
- }
- else
- {
- sprintf( buf, "-" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'C':
- if( p_input )
- {
- snprintf( buf, 10, "%d",
- var_GetInteger( p_input, "chapter" ) );
- }
- else
- {
- sprintf( buf, "-" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'D':
- if( p_item )
- {
- sprintf( buf, "%02d:%02d:%02d",
- (int)(p_item->i_duration/(3600000000)),
- (int)((p_item->i_duration/(60000000))%60),
- (int)((p_item->i_duration/1000000)%60) );
- }
- else
- {
- sprintf( buf, "--:--:--" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'F':
- INSERT_STRING( p_item, p_item->psz_uri );
- break;
- case 'I':
- if( p_input )
- {
- snprintf( buf, 10, "%d",
- var_GetInteger( p_input, "title" ) );
- }
- else
- {
- sprintf( buf, "-" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'L':
- if( p_item && p_input )
- {
- sprintf( buf, "%02d:%02d:%02d",
- (int)((p_item->i_duration-p_input->i_time)/(3600000000)),
- (int)(((p_item->i_duration-p_input->i_time)/(60000000))%60),
- (int)(((p_item->i_duration-p_input->i_time)/1000000)%60) );
- }
- else
- {
- sprintf( buf, "--:--:--" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'N':
- INSERT_STRING( p_item, p_item->psz_name );
- break;
- case 'O':
- {
- char *lang;
- if( p_input )
- {
- lang = var_GetString( p_input, "audio-language" );
- }
- else
- {
- lang = strdup( "-" );
- }
- INSERT_STRING( 1, lang );
- free( lang );
- break;
- }
- case 'P':
- if( p_input )
- {
- snprintf( buf, 10, "%2.1lf",
- var_GetFloat( p_input, "position" ) * 100. );
- }
- else
- {
- sprintf( buf, "--.-%%" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'R':
- if( p_input )
- {
- int r = var_GetInteger( p_input, "rate" );
- snprintf( buf, 10, "%d.%d", r/1000, r%1000 );
- }
- else
- {
- sprintf( buf, "-" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'S':
- if( p_input )
- {
- int r = var_GetInteger( p_input, "sample-rate" );
- snprintf( buf, 10, "%d.%d", r/1000, (r/100)%10 );
- }
- else
- {
- sprintf( buf, "-" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'T':
- if( p_input )
- {
- sprintf( buf, "%02d:%02d:%02d",
- (int)(p_input->i_time/(3600000000)),
- (int)((p_input->i_time/(60000000))%60),
- (int)((p_input->i_time/1000000)%60) );
- }
- else
- {
- sprintf( buf, "--:--:--" );
- }
- INSERT_STRING( 1, buf );
- break;
- case 'U':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_publisher );
- break;
- case 'V':
- {
- audio_volume_t volume;
- aout_VolumeGet( p_object, &volume );
- snprintf( buf, 10, "%d", volume );
- INSERT_STRING( 1, buf );
- break;
- }
- case '_':
- *d = '\n';
- d++;
- break;
-
- default:
- *d = *s;
- d++;
- break;
- }
- b_is_format = 0;
- }
- else if( *s == '$' )
- {
- b_is_format = 1;
- }
- else
- {
- *d = *s;
- d++;
- }
- s++;
- }
- *d = '\0';
-
- if( p_input )
- {
- vlc_object_release( p_input );
- if( p_item )
- vlc_mutex_unlock( &p_item->lock );
- }
-
- return dst;
+ free( p_sys );
}
/****************************************************************************
subpicture_t *p_spu;
video_format_t fmt;
time_t t;
- char *buf;
if( p_sys->last_time == time( NULL ) )
{
{
p_sys->b_need_update = VLC_FALSE;
}
- buf = FormatTime( p_sys->psz_marquee );
- p_spu->p_region->psz_text = FormatMeta( VLC_OBJECT( p_filter ), buf );
- free( buf );
+ p_spu->p_region->psz_text = str_format( p_filter, p_sys->psz_marquee );
p_spu->i_start = date;
p_spu->i_stop = p_sys->i_timeout == 0 ? 0 : date + p_sys->i_timeout * 1000;
p_spu->b_ephemer = VLC_TRUE;
/* where to locate the string: */
if( p_sys->i_xoff < 0 || p_sys->i_yoff < 0 )
{ /* set to one of the 9 relative locations */
- p_spu->i_flags = p_sys->i_pos;
+ p_spu->p_region->i_align = p_sys->i_pos;
p_spu->i_x = 0;
p_spu->i_y = 0;
p_spu->b_absolute = VLC_FALSE;
}
else
{ /* set to an absolute xy, referenced to upper left corner */
- p_spu->i_flags = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+ p_spu->p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
p_spu->i_x = p_sys->i_xoff;
p_spu->i_y = p_sys->i_yoff;
p_spu->b_absolute = VLC_TRUE;
projects / vlc / blobdiff