char *psz_parser, *psz_string;
const char *psz_filter_type;
- module_t *p_obj = module_find( psz_name );
+ /* FIXME temporary hack */
+ const char *psz_module_name = psz_name;
+ if( !strcmp( psz_name, "magnify" ) ||
+ !strcmp( psz_name, "puzzle" ) ||
+ !strcmp( psz_name, "logo" ) ||
+ !strcmp( psz_name, "wall" ) ||
+ !strcmp( psz_name, "clone" ) )
+ psz_module_name = "video_filter_wrapper";
+
+ module_t *p_obj = module_find( psz_module_name );
if( !p_obj )
{
msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
return;
}
- if( module_provides( p_obj, "video filter2" ) )
+ if( module_provides( p_obj, "video filter" ) )
{
- psz_filter_type = "video-filter";
+ psz_filter_type = "vout-filter";
}
- else if( module_provides( p_obj, "video filter" ) )
+ else if( module_provides( p_obj, "video filter2" ) )
{
- psz_filter_type = "vout-filter";
+ psz_filter_type = "video-filter";
}
else if( module_provides( p_obj, "sub filter" ) )
{
if( p_vout )
{
if( !strcmp( psz_filter_type, "sub-filter" ) )
- var_SetString( p_vout->p_spu, psz_filter_type, psz_string );
+ var_SetString( vout_GetSpu( p_vout ), psz_filter_type, psz_string );
else
var_SetString( p_vout, psz_filter_type, psz_string );
vlc_object_release( p_vout );
char * Equalizer::createValuesFromPreset( int i_preset )
{
- char *psz_values;
QString values;
/* Create the QString in Qt */
values += QString( " %1" ).arg( eqz_preset_10b[i_preset]->f_amp[i] );
/* Convert it to char * */
- if( !asprintf( &psz_values, "%s", values.toAscii().constData() ) )
- return NULL;
-
- return psz_values;
+ return strdup( values.toAscii().constData() );
}
void Equalizer::setCorePreset( int i_preset )
QLabel *subSpeedLabel = new QLabel;
subSpeedLabel->setText( qtr( "Speed of the subtitles:" ) );
- subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 3 );
+ subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 1 );
subSpeedSpin = new QDoubleSpinBox;
subSpeedSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );