/*****************************************************************************
* 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>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
-#include <stdlib.h> /* free() */
-#include <string.h> /* strerror() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_vout.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_keys.h>
#include <caca.h>
#ifndef CACA_API_VERSION_1
/* Upward compatibility macros */
- typedef cucul_canvas_t char
- typedef cucul_dither_t struct caca_bitmap
- typedef caca_display_t char
+ typedef char cucul_canvas_t;
+ typedef struct caca_bitmap cucul_dither_t;
+ typedef char caca_display_t;
# define CUCUL_COLOR_DEFAULT CACA_COLOR_LIGHTGRAY
# define CUCUL_COLOR_BLACK CACA_COLOR_BLACK
# define cucul_clear_canvas(x) caca_clear()
# define caca_set_display_title(x,y) caca_set_window_title(y)
#endif
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
-#include <vlc_keys.h>
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_shortname( "Caca" );
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VOUT );
- set_description( _("Color ASCII art video output") );
- set_capability( "video output", 12 );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "Caca" )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VOUT )
+ set_description( N_("Color ASCII art video output") )
+ set_capability( "video output", 12 )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
/*****************************************************************************
* vout_sys_t: libcaca video output method descriptor
return VLC_EGENERIC;
}
- HANDLE hstdout =
+ hstdout =
CreateConsoleScreenBuffer( GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, CONSOLE_TEXTMODE_BUFFER, NULL );
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
{
- msg_Err( p_vout, "out of memory" );
+#if defined( WIN32 ) && !defined( UNDER_CE )
+ FreeConsole();
+#endif
return VLC_ENOMEM;
}
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;
}
#else
int ev;
#endif
- vlc_value_t val;
- while( caca_get_event(p_vout->p_sys->p_dp,
- CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE, &ev, 0) )
+ while( caca_get_event(p_vout->p_sys->p_dp, CACA_EVENT_ANY, &ev, 0) )
{
- /* Acknowledge the resize */
+ playlist_t *p_playlist;
+ vlc_value_t val;
+
#ifdef CACA_API_VERSION_1
- if( ev.type == CACA_EVENT_RESIZE )
+#ifdef CACA_EVENT_OPAQUE
+ switch( caca_get_event_type( &ev ) )
+#else
+ switch( ev.type )
+#endif /* CACA_EVENT_OPAQUE */
#else
- if( ev == CACA_EVENT_RESIZE )
+ switch( ev )
#endif
{
- caca_refresh_display( p_vout->p_sys->p_dp );
- continue;
- }
-
+ case CACA_EVENT_KEY_RELEASE:
#ifdef CACA_API_VERSION_1
- switch( ev.data.key.ch )
+#ifdef CACA_EVENT_OPAQUE
+ switch( caca_get_event_key_ch( &ev ) )
#else
- switch( ev & 0x00ffffff )
+ switch( ev.data.key.ch )
+#endif /* CACA_EVENT_OPAQUE */
+#else
+ switch( ev & 0x00ffffff )
#endif
- {
- case 'q':
- val.i_int = KEY_MODIFIER_CTRL | 'q';
+ {
+ case 'q':
+ val.i_int = KEY_MODIFIER_CTRL | 'q';
+ break;
+ case ' ':
+ val.i_int = KEY_SPACE;
+ break;
+ default:
+ continue;
+ }
+
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
break;
- case ' ':
- val.i_int = KEY_SPACE;
+ case CACA_EVENT_RESIZE:
+ /* Acknowledge the resize */
+ caca_refresh_display( p_vout->p_sys->p_dp );
break;
+#ifdef CACA_API_VERSION_1
+ case CACA_EVENT_MOUSE_MOTION:
+ val.i_int =
+#ifdef CACA_EVENT_OPAQUE
+ caca_get_event_mouse_x( &ev )
+#else
+ ev.data.mouse.x
+#endif /* CACA_EVENT_OPAQUE */
+ * p_vout->render.i_width
+ / cucul_get_canvas_width( p_vout->p_sys->p_cv );
+ var_Set( p_vout, "mouse-x", val );
+ val.i_int =
+#ifdef CACA_EVENT_OPAQUE
+ caca_get_event_mouse_y( &ev )
+#else
+ ev.data.mouse.y
+#endif /* CACA_EVENT_OPAQUE */
+ * p_vout->render.i_height
+ / cucul_get_canvas_height( p_vout->p_sys->p_cv );
+ var_Set( p_vout, "mouse-y", val );
+ var_SetBool( p_vout, "mouse-moved", true );
+ break;
+ case CACA_EVENT_MOUSE_RELEASE:
+ var_SetBool( p_vout, "mouse-clicked", true );
+ break;
+ case CACA_EVENT_QUIT:
+ {
+ p_playlist = pl_Hold( p_vout );
+ if( p_playlist )
+ {
+ playlist_Stop( p_playlist );
+ pl_Release( p_vout );
+ }
+ libvlc_Quit( p_vout->p_libvlc );
+ break;
+ }
+#endif
default:
- continue;
+ break;
}
-
- var_Set( p_vout->p_vlc, "key-pressed", val );
}
return VLC_SUCCESS;
*****************************************************************************/
static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{
- cucul_set_color( p_vout->p_sys->p_cv,
+ cucul_set_color_ansi( p_vout->p_sys->p_cv,
CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK );
cucul_clear_canvas( p_vout->p_sys->p_cv );
cucul_dither_bitmap( p_vout->p_sys->p_cv, 0, 0,
*****************************************************************************/
static void Display( vout_thread_t *p_vout, picture_t *p_pic )
{
+ VLC_UNUSED(p_pic);
caca_refresh_display( p_vout->p_sys->p_dp );
}
projects / vlc / blobdiff