# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <math.h>
{
position_auto = 0, position_fixed = 1, position_offsets = 2
};
-static int pi_pos_values[] = { 0, 1, 2 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2 };
+static const char *const ppsz_pos_descriptions[] =
{ N_("auto"), N_("fixed"), N_("offsets") };
-static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_align_descriptions[] =
+static const int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_align_descriptions[] =
{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
#define CFG_PREFIX "mosaic-"
vlc_module_begin();
- set_description( _("Mosaic video sub filter") );
- set_shortname( _("Mosaic") );
+ set_description( N_("Mosaic video sub filter") );
+ set_shortname( N_("Mosaic") );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC);
set_capability( "sub filter", 0 );
false );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"alpha", "height", "width", "align", "xoffset", "yoffset",
"borderw", "borderh", "position", "rows", "cols",
"keep-aspect-ratio", "keep-picture", "order", "offsets",
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
vlc_object_t *p_libvlc = VLC_OBJECT( p_filter->p_libvlc );
- char *psz_order;
+ char *psz_order, *_psz_order;
char *psz_offsets;
int i_index;
vlc_value_t val;
p_sys->i_order_length = 0;
p_sys->ppsz_order = NULL;
psz_order = var_CreateGetStringCommand( p_filter, CFG_PREFIX "order" );
+ _psz_order = psz_order;
var_AddCallback( p_filter, CFG_PREFIX "order", MosaicCallback, p_sys );
if( *psz_order )
p_sys->i_order_length = i_index;
}
+ free( _psz_order );
+
/* Manage specific offsets for substreams */
psz_offsets = var_CreateGetStringCommand( p_filter, CFG_PREFIX "offsets" );
p_sys->i_offsets_length = 0;
p_sys->pi_x_offsets = NULL;
p_sys->pi_y_offsets = NULL;
mosaic_ParseSetOffsets( p_filter, p_sys, psz_offsets );
+ free( psz_offsets );
var_AddCallback( p_filter, CFG_PREFIX "offsets", MosaicCallback, p_sys );
vlc_mutex_unlock( &p_sys->lock );