# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <vlc_interface.h>
#define CACHE_LONGTEXT N_( "Snapshot cache size (number of images to keep)." )
-vlc_module_begin( );
- set_description( _( "Snapshot module" ) );
- set_shortname( _("Snapshot") );
+vlc_module_begin ()
+ set_description( N_( "Snapshot module" ) )
+ set_shortname( N_("Snapshot") )
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VOUT );
- set_capability( "video output", 1 );
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VOUT )
+ set_capability( "video output", 1 )
- add_integer( "snapshot-width", 320, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, false );
- add_integer( "snapshot-height", 200, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, false );
- add_string( "snapshot-chroma", "RV32", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true );
- add_integer( "snapshot-cache-size", 50, NULL, CACHE_TEXT, CACHE_LONGTEXT, true );
+ add_integer( "snapshot-width", 320, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, false )
+ add_integer( "snapshot-height", 200, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
+ add_string( "snapshot-chroma", "RV32", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
+ add_integer( "snapshot-cache-size", 50, NULL, CACHE_TEXT, CACHE_LONGTEXT, true )
- set_callbacks( Create, Destroy );
-vlc_module_end();
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
/*****************************************************************************
* vout_sys_t: video output descriptor
p_snapshot->date = 0;
p_snapshot->p_data = ( char* ) malloc( i_datasize );
if( p_snapshot->p_data == NULL )
+ {
+ free( p_snapshot );
return VLC_ENOMEM;
+ }
p_vout->p_sys->p_list[i_index] = p_snapshot;
}
if( var_Create( p_vout->p_sys->p_input, "snapshot-id", VLC_VAR_INTEGER ) )
{
- msg_Err( p_vout, "Cannot create snapshot-id variable in p_input (%d).",
- p_vout->p_sys->p_input->i_object_id );
+ msg_Err( p_vout, "Cannot create snapshot-id variable in p_input(%p).",
+ p_vout->p_sys->p_input );
return VLC_EGENERIC;
}
/* Register the snapshot vout module at the input level */
- val.i_int = p_vout->i_object_id;
+ val.p_address = p_vout;
if( var_Set( p_vout->p_sys->p_input, "snapshot-id", val ) )
{
- msg_Err( p_vout, "Cannot register snapshot-id in p_input (%d).",
- p_vout->p_sys->p_input->i_object_id );
+ msg_Err( p_vout, "Cannot register snapshot-id in p_input(%p).",
+ p_vout->p_sys->p_input );
return VLC_EGENERIC;
}