# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <math.h>
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("Magnify/Zoom interactive video filter") );
- set_shortname( _( "Magnify" ));
+ set_description( N_("Magnify/Zoom interactive video filter") );
+ set_shortname( N_( "Magnify" ));
set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
- }
p_vout->p_sys->p_image = image_HandlerCreate( p_vout );
{
DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
vlc_object_detach( p_vout->p_sys->p_vout );
- vout_Destroy( p_vout->p_sys->p_vout );
+ vlc_object_release( p_vout->p_sys->p_vout );
}
image_HandlerDelete( p_vout->p_sys->p_image );
while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
== NULL )
{
- if( p_vout->b_die || p_vout->b_error )
+ if( !vlc_object_alive (p_vout) || p_vout->b_error )
{
return;
}
{
int width = v_h + 90 - y;
width = (width*width)/160;
- if( (80 - y + v_h)*10 < o_zoom )
+ if( (80 - y + v_h)*ZOOM_FACTOR/10 < o_zoom )
{
vlc_memset( p_oyp->p_pixels + y*p_oyp->i_pitch, 0xff, width );
}