From 7bc5b0253f659bccb6cd4268832ace7f1796e4be Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 13 Jun 2010 17:20:29 +0000 Subject: tv.h: Change function pointer types to proper declarations git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31388 b3059339-0415-0410-9bf9-f77b7e298cf2 Note that the code is still questionable after this commit - the shared data structure has pointers to "struct priv", but different files use different incompatible definitions for that struct. --- stream/tv.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'stream/tv.h') diff --git a/stream/tv.h b/stream/tv.h index 48ff88ecc2..c2e8e05120 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -109,16 +109,19 @@ typedef struct tvi_info_s const char *comment; } tvi_info_t; + +struct priv; + typedef struct tvi_functions_s { - int (*init)(); - int (*uninit)(); - int (*control)(); - int (*start)(); - double (*grab_video_frame)(); - int (*get_video_framesize)(); - double (*grab_audio_frame)(); - int (*get_audio_framesize)(); + int (*init)(struct priv *priv); + int (*uninit)(struct priv *priv); + int (*control)(struct priv *priv, int cmd, void *arg); + int (*start)(struct priv *priv); + double (*grab_video_frame)(struct priv *priv, char *buffer, int len); + int (*get_video_framesize)(struct priv *priv); + double (*grab_audio_frame)(struct priv *priv, char *buffer, int len); + int (*get_audio_framesize)(struct priv *priv); } tvi_functions_t; typedef struct tvi_handle_s { -- cgit v1.2.3