/*****************************************************************************
* caca.c: Color ASCII Art video output plugin using libcaca
*****************************************************************************
- * Copyright (C) 2003, 2004 the VideoLAN team
+ * Copyright (C) 2003-2009 the VideoLAN team
* $Id$
*
* Authors: Sam Hocevar <sam@zoy.org>
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
+ {
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ FreeConsole();
+#endif
return VLC_ENOMEM;
+ }
p_vout->p_sys->p_cv = cucul_create_canvas(0, 0);
if( !p_vout->p_sys->p_cv )
{
msg_Err( p_vout, "cannot initialize libcucul" );
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ FreeConsole();
+#endif
free( p_vout->p_sys );
return VLC_EGENERIC;
}
{
msg_Err( p_vout, "cannot initialize libcaca" );
cucul_free_canvas( p_vout->p_sys->p_cv );
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ FreeConsole();
+#endif
free( p_vout->p_sys );
return VLC_EGENERIC;
}
* p_vout->render.i_height
/ cucul_get_canvas_height( p_vout->p_sys->p_cv );
var_Set( p_vout, "mouse-y", val );
- val.b_bool = true;
- var_Set( p_vout, "mouse-moved", val );
+ var_SetBool( p_vout, "mouse-moved", true );
break;
case CACA_EVENT_MOUSE_RELEASE:
- val.b_bool = true;
- var_Set( p_vout, "mouse-clicked", val );
+ var_SetBool( p_vout, "mouse-clicked", true );
break;
case CACA_EVENT_QUIT:
{
playlist_Stop( p_playlist );
pl_Release( p_vout );
}
- vlc_object_kill( p_vout->p_libvlc );
+ libvlc_Quit( p_vout->p_libvlc );
break;
}
#endif