Commit c06e3ed9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove most nested headers from <vlc_filter.h>

parent 24dddc30
......@@ -26,9 +26,6 @@
#define VLC_FILTER_H 1
#include <vlc_es.h>
#include <vlc_picture.h>
#include <vlc_subpicture.h>
#include <vlc_mouse.h>
/**
* \defgroup filter Filters
......@@ -58,6 +55,7 @@ typedef struct filter_owner_t
};
} filter_owner_t;
struct vlc_mouse_t;
/** Structure describing a filter
* @warning BIG FAT WARNING : the code relies on the first 4 members of
......@@ -127,12 +125,12 @@ struct filter_t
* - Otherwise, the mouse change is not propagated.
* If NULL, the mouse state is considered unchanged and will be
* propagated. */
int (*pf_video_mouse)( filter_t *, vlc_mouse_t *,
const vlc_mouse_t *p_old,
const vlc_mouse_t *p_new );
int (*pf_sub_mouse)( filter_t *, const vlc_mouse_t *p_old,
const vlc_mouse_t *p_new,
const video_format_t * );
int (*pf_video_mouse)( filter_t *, struct vlc_mouse_t *,
const struct vlc_mouse_t *p_old,
const struct vlc_mouse_t *p_new );
int (*pf_sub_mouse)( filter_t *, const struct vlc_mouse_t *p_old,
const struct vlc_mouse_t *p_new,
const video_format_t * );
};
/* Input attachments
......@@ -412,14 +410,17 @@ VLC_API subpicture_t *filter_chain_SubFilter(filter_chain_t *chain,
*
* The vlc_mouse_t* pointers may be the same.
*/
VLC_API int filter_chain_MouseFilter( filter_chain_t *, vlc_mouse_t *, const vlc_mouse_t * );
VLC_API int filter_chain_MouseFilter( filter_chain_t *, struct vlc_mouse_t *,
const struct vlc_mouse_t * );
/**
* Inform the filter chain of mouse state.
*
* It makes sense only for a sub source chain.
*/
VLC_API int filter_chain_MouseEvent( filter_chain_t *, const vlc_mouse_t *, const video_format_t * );
VLC_API int filter_chain_MouseEvent( filter_chain_t *,
const struct vlc_mouse_t *,
const video_format_t * );
int filter_chain_ForEach( filter_chain_t *chain,
int (*cb)( filter_t *, void * ), void *opaque );
......
......@@ -42,7 +42,7 @@ enum
/**
* Mouse state
*/
typedef struct
typedef struct vlc_mouse_t
{
/* Coordinate */
int i_x;
......
......@@ -29,6 +29,7 @@
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_atomic.h>
#include <vlc_picture.h>
#include "vlc_vdpau.h"
struct filter_sys_t
......
......@@ -29,6 +29,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "vlc_vdpau.h"
/* Picture history as recommended by VDPAU documentation */
......
......@@ -28,6 +28,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "vlc_vdpau.h"
struct filter_sys_t
......
......@@ -27,6 +27,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_atomic.h>
#include "vlc_vdpau.h"
......
......@@ -39,6 +39,7 @@
#include <vlc_plugin.h>
#include <vlc_input.h> /* vlc_input_attachment_* */
#include <vlc_filter.h> /* filter_sys_t */
#include <vlc_subpicture.h>
#include <vlc_text_style.h> /* text_style_t*/
#include <vlc_charset.h>
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_subpicture.h>
#import <Cocoa/Cocoa.h>
......
......@@ -36,6 +36,7 @@
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_charset.h>
#include <vlc_subpicture.h>
#define INITGUID
......
......@@ -33,6 +33,7 @@
#include <vlc_plugin.h>
#include <vlc_fs.h>
#include <vlc_filter.h>
#include <vlc_subpicture.h>
#include <sys/types.h>
#include <unistd.h>
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
/*****************************************************************************
* Module descriptor
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "copy.h"
struct picture_sys_t {
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "copy.h"
#include "dxgi_fmt.h"
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "copy.h"
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#define SRC_FOURCC "GREY"
#define DEST_FOURCC "I420,YUY2"
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "copy.h"
/*****************************************************************************
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "copy.h"
/*****************************************************************************
......
......@@ -35,6 +35,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#include "i420_rgb.h"
......
......@@ -28,6 +28,7 @@
#include <vlc_common.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#include "i420_rgb.h"
......
......@@ -28,6 +28,7 @@
#include <vlc_common.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#include "i420_rgb.h"
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "i420_rgb.h"
#include "i420_rgb_c.h"
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#if defined (MODULE_NAME_IS_i420_yuy2_altivec) && defined(HAVE_ALTIVEC_H)
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#define SRC_FOURCC "I422,J422"
#define DEST_FOURCC "I420,IYUV,J420,YV12,YUVA"
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#include "i422_yuy2.h"
......
......@@ -25,6 +25,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <omxtypes.h>
#include <omxIP.h>
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
/****************************************************************************
* Local prototypes
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#include <libswscale/swscale.h>
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <assert.h>
/* TODO:
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#define SRC_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
#define DEST_FOURCC "I420"
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#define SRC_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422"
#define DEST_FOURCC "I422"
......
......@@ -35,8 +35,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
#include "adjust_sat_hue.h"
......
......@@ -28,6 +28,7 @@
#include <assert.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
#include "adjust_sat_hue.h"
......
......@@ -34,6 +34,7 @@
#include <vlc_image.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_url.h>
#define ALPHAMASK_HELP N_( \
......
......@@ -27,8 +27,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
static int Create(vlc_object_t *);
......
......@@ -33,6 +33,7 @@
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_atomic.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -34,7 +34,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_subpicture.h>
#include <vlc_image.h>
/*****************************************************************************
......
......@@ -38,10 +38,10 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include "vlc_filter.h"
#include <vlc_picture.h>
#include <vlc_filter.h>
#include "filter_picture.h"
#include "vlc_image.h"
#include <vlc_image.h>
enum { RED, GREEN, BLUE, WHITE };
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -35,6 +35,7 @@
#include <vlc_modules.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_image.h>
/*****************************************************************************
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#define BLUESCREEN_HELP N_( \
"This effect, also known as \"greenscreen\" or \"chroma key\" blends " \
......
......@@ -34,6 +34,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
/*****************************************************************************
* Local and extern prototypes.
......
......@@ -37,6 +37,7 @@
#include <vlc_sout.h>
#include <vlc_atomic.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/****************************************************************************
......
......@@ -39,6 +39,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#include <vlc_mouse.h>
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
/*****************************************************************************
* Module descriptor
......
......@@ -33,8 +33,8 @@
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_image.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_url.h>
#include "filter_picture.h"
......
......@@ -29,14 +29,14 @@
# include "config.h"
#endif
#include <math.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
#include "math.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......
......@@ -31,6 +31,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
static int Open( vlc_object_t *p_this);
static void Close( vlc_object_t *p_this);
......
......@@ -32,7 +32,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_mouse.h>
#include <vlc_picture.h>
#include "filter_picture.h"
#ifndef MOD
......
......@@ -32,8 +32,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_memory.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
#include <math.h> /* exp(), sqrt() */
......
......@@ -35,6 +35,7 @@
#include <vlc_plugin.h>
#include <vlc_cpu.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
/*****************************************************************************
* Module descriptor
......
......@@ -35,8 +35,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
enum { GRADIENT, EDGE, HOUGH };
......
......@@ -35,7 +35,7 @@
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_cpu.h>
#include <vlc_picture.h>
#include <vlc_rand.h>
/*****************************************************************************
......
......@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
......
......@@ -31,8 +31,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -34,8 +34,9 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_mouse.h>
#include <vlc_subpicture.h>
#include <vlc_url.h>
#include <vlc_image.h>
#ifdef LoadImage
......
......@@ -35,6 +35,8 @@
#include <vlc_plugin.h>
#include <vlc_image.h>
#include <vlc_filter.h>
#include <vlc_mouse.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -39,6 +39,7 @@
#include <vlc_block.h>
#include <vlc_fs.h>
#include <vlc_strings.h>
#include <vlc_subpicture.h>
/*****************************************************************************
* Local prototypes
......
......@@ -35,6 +35,7 @@
#include <vlc_plugin.h>
#include <vlc_atomic.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -29,14 +29,14 @@
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <math.h>
#include <limits.h> /* INT_MAX */
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_image.h>
#include <vlc_subpicture.h>
#include "mosaic.h"
......
......@@ -35,6 +35,7 @@
#include <vlc_sout.h>
#include <vlc_filter.h>
#include <vlc_atomic.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -32,8 +32,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -34,6 +34,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_rand.h>
#include <vlc_mtime.h>
......
......@@ -35,6 +35,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_vout.h>
#include <vlc_image.h>
#include "filter_event_info.h"
......
......@@ -34,7 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <vlc_modules.h>
#include <vlc_picture.h>
#include <vlc_filter.h>
#include <vlc_image.h>
#include "filter_picture.h"
......
......@@ -35,6 +35,7 @@
#include <vlc_plugin.h>
#include <vlc_atomic.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include "filter_picture.h"
/*****************************************************************************
......
......@@ -38,6 +38,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
#include "filter_picture.h"
......
......@@ -34,8 +34,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_image.h>
#include "filter_picture.h"
......
......@@ -35,6 +35,8 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_mouse.h>
#include <vlc_picture.h>
#include <vlc_rand.h>
#include "filter_picture.h"
......
......@@ -71,8 +71,11 @@ struct filter_sys_t {
point_t **ps_bezier_pts_H;
};
struct vlc_mouse_t;
picture_t *Filter( filter_t *, picture_t * );
int puzzle_Callback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * );
int puzzle_mouse( filter_t *, vlc_mouse_t *, const vlc_mouse_t *, const vlc_mouse_t * );
int puzzle_mouse( filter_t *, struct vlc_mouse_t *, const struct vlc_mouse_t *,
const struct vlc_mouse_t * );
#endif
......@@ -35,6 +35,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_rand.h>
#include "filter_picture.h"
......
......@@ -35,6 +35,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_rand.h>
#include "filter_picture.h"
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>