# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <math.h>
#define CFG_PREFIX "puzzle-"
vlc_module_begin();
- set_description( _("Puzzle interactive game video filter") );
- set_shortname( _( "Puzzle" ));
+ set_description( N_("Puzzle interactive game video filter") );
+ set_shortname( N_( "Puzzle" ));
set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
add_integer_with_range( CFG_PREFIX "rows", 4, 1, 128, NULL,
- ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE );
+ ROWS_TEXT, ROWS_LONGTEXT, false );
add_integer_with_range( CFG_PREFIX "cols", 4, 1, 128, NULL,
- COLS_TEXT, COLS_LONGTEXT, VLC_FALSE );
+ COLS_TEXT, COLS_LONGTEXT, false );
add_bool( CFG_PREFIX "black-slot", 0, NULL,
- BLACKSLOT_TEXT, BLACKSLOT_LONGTEXT, VLC_FALSE );
+ BLACKSLOT_TEXT, BLACKSLOT_LONGTEXT, false );
set_callbacks( Create, Destroy );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"rows", "cols", "black-slot", NULL
};
int i_rows;
int *pi_order;
int i_selected;
- vlc_bool_t b_finished;
+ bool b_finished;
- vlc_bool_t b_blackslot;
+ bool b_blackslot;
};
/*****************************************************************************
/*****************************************************************************
* Misc stuff...
*****************************************************************************/
-static vlc_bool_t finished( vout_sys_t *p_sys )
+static bool finished( vout_sys_t *p_sys )
{
int i;
for( i = 0; i < p_sys->i_cols * p_sys->i_rows; i++ )
{
- if( i != p_sys->pi_order[i] ) return VLC_FALSE;
+ if( i != p_sys->pi_order[i] ) return false;
}
- return VLC_TRUE;
+ return true;
}
-static vlc_bool_t is_valid( vout_sys_t *p_sys )
+static bool is_valid( vout_sys_t *p_sys )
{
int i, j, d=0;
- if( p_sys->b_blackslot == VLC_FALSE ) return VLC_TRUE;
+ if( p_sys->b_blackslot == false ) return true;
for( i = 0; i < p_sys->i_cols * p_sys->i_rows; i++ )
{
if( p_sys->pi_order[i] == p_sys->i_cols * p_sys->i_rows - 1 )
if( p_sys->pi_order[i] > p_sys->pi_order[j] ) d++;
}
}
- if( d%2!=0 ) return VLC_FALSE;
- else return VLC_TRUE;
+ if( d%2!=0 ) return false;
+ else return true;
}
static void shuffle( vout_sys_t *p_sys )
{
}
}
p_sys->b_finished = finished( p_sys );
- } while( p_sys->b_finished == VLC_TRUE
- || is_valid( p_sys ) == VLC_FALSE );
+ } while( p_sys->b_finished == true
+ || is_valid( p_sys ) == false );
- if( p_sys->b_blackslot == VLC_TRUE )
+ if( p_sys->b_blackslot == true )
{
for( i = 0; i < p_sys->i_cols * p_sys->i_rows; i++ )
{
/* 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 );
{
int i_index;
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
+
+ DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+
/* Free the fake output buffers we allocated */
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
var_DelCallback( p_vout->p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
var_DelCallback( p_vout->p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
var_DelCallback( p_vout->p_sys->p_vout, "mouse-clicked", MouseEvent, p_vout);
+
+ vout_Destroy( p_vout->p_sys->p_vout );
}
#define SHUFFLE_WIDTH 81
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- if( p_vout->p_sys->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 );
- }
-
image_HandlerDelete( p_vout->p_sys->p_image );
free( p_vout->p_sys->pi_order );
- DEL_PARENT_CALLBACKS( SendEventsToChild );
-
free( p_vout->p_sys );
}
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;
}
i_row *= p_in->i_lines / i_rows;
i_last_row *= p_in->i_lines / i_rows;
- if( p_vout->p_sys->b_blackslot == VLC_TRUE
- && p_vout->p_sys->b_finished == VLC_FALSE
+ if( p_vout->p_sys->b_blackslot == true
+ && p_vout->p_sys->b_finished == false
&& i == p_vout->p_sys->i_selected )
{
uint8_t color = ( i_plane == Y_PLANE ? 0x0 : 0x80 );
for( ; i_row < i_last_row; i_row++, i_orow++ )
{
- p_vout->p_libvlc->
- pf_memset( p_out->p_pixels + i_row * i_pitch
+ vlc_memset( p_out->p_pixels + i_row * i_pitch
+ i_col * i_pitch / i_cols,
color, i_pitch / i_cols );
}
{
for( ; i_row < i_last_row; i_row++, i_orow++ )
{
- p_vout->p_libvlc->
- pf_memcpy( p_out->p_pixels + i_row * i_pitch
+ vlc_memcpy( p_out->p_pixels + i_row * i_pitch
+ i_col * i_pitch / i_cols,
p_in->p_pixels + i_orow * i_pitch
+ i_ocol * i_pitch / i_cols,
}
if( p_vout->p_sys->i_selected != -1
- && p_vout->p_sys->b_blackslot == VLC_FALSE )
+ && p_vout->p_sys->b_blackslot == false )
{
plane_t *p_in = p_pic->p+Y_PLANE;
plane_t *p_out = p_outpic->p+Y_PLANE;
int i_last_row = i_row + 1;
i_row *= p_in->i_lines / i_rows;
i_last_row *= p_in->i_lines / i_rows;
- p_vout->p_libvlc->
- pf_memset( p_out->p_pixels + i_row * i_pitch
+ vlc_memset( p_out->p_pixels + i_row * i_pitch
+ i_col * i_pitch / i_cols,
0xff, i_pitch / i_cols );
for( ; i_row < i_last_row; i_row++ )
+ (i_col+1) * i_pitch / i_cols - 1 ] = 0xff;
}
i_row--;
- p_vout->p_libvlc->
- pf_memset( p_out->p_pixels + i_row * i_pitch
+ vlc_memset( p_out->p_pixels + i_row * i_pitch
+ i_col * i_pitch / i_cols,
0xff, i_pitch / i_cols );
}
- if( p_vout->p_sys->b_finished == VLC_TRUE )
+ if( p_vout->p_sys->b_finished == true )
{
int i, j;
plane_t *p_out = p_outpic->p+Y_PLANE;
if( mouse & MOUSE_CLICKED )
{
i_pos = p_vout->p_sys->i_cols * ( ( p_vout->p_sys->i_rows * i_y ) / v_h ) + (p_vout->p_sys->i_cols * i_x ) / v_w;
- if( p_vout->p_sys->b_finished == VLC_TRUE
+ if( p_vout->p_sys->b_finished == true
&& i_x < SHUFFLE_WIDTH && i_y < SHUFFLE_HEIGHT )
{
shuffle( p_vout->p_sys );
p_vout->p_sys->i_selected = i_pos;
}
else if( p_vout->p_sys->i_selected == i_pos
- && p_vout->p_sys->b_blackslot == VLC_FALSE )
+ && p_vout->p_sys->b_blackslot == false )
{
p_vout->p_sys->i_selected = -1;
}
p_vout->p_sys->pi_order[ p_vout->p_sys->i_selected ] =
p_vout->p_sys->pi_order[ i_pos ];
p_vout->p_sys->pi_order[ i_pos ] = a;
- if( p_vout->p_sys->b_blackslot == VLC_TRUE )
+ if( p_vout->p_sys->b_blackslot == true )
p_vout->p_sys->i_selected = i_pos;
else
p_vout->p_sys->i_selected = -1;