[MPlayer-cvslog] r31388 - in trunk/stream: tv.h tvi_bsdbt848.c tvi_dshow.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c

[reimar]

Author: reimar
Date: Sun Jun 13 19:20:29 2010
New Revision: 31388

Log:
Fix function pointer types in tvi_functions struct
to be proper declarations.

Modified:
   trunk/stream/tv.h
   trunk/stream/tvi_bsdbt848.c
   trunk/stream/tvi_dshow.c
   trunk/stream/tvi_dummy.c
   trunk/stream/tvi_v4l.c
   trunk/stream/tvi_v4l2.c

Modified: trunk/stream/tv.h
==============================================================================
--- trunk/stream/tv.h	Sun Jun 13 19:18:48 2010	(r31387)
+++ trunk/stream/tv.h	Sun Jun 13 19:20:29 2010	(r31388)
@@ -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 {

Modified: trunk/stream/tvi_bsdbt848.c
==============================================================================
--- trunk/stream/tvi_bsdbt848.c	Sun Jun 13 19:18:48 2010	(r31387)
+++ trunk/stream/tvi_bsdbt848.c	Sun Jun 13 19:20:29 2010	(r31388)
@@ -101,7 +101,7 @@ typedef struct {
 } RBFRAME;
 
 /* private data's */
-typedef struct {
+typedef struct priv {
 
 /* Audio */
     char *dspdev;

Modified: trunk/stream/tvi_dshow.c
==============================================================================
--- trunk/stream/tvi_dshow.c	Sun Jun 13 19:18:48 2010	(r31387)
+++ trunk/stream/tvi_dshow.c	Sun Jun 13 19:20:29 2010	(r31388)
@@ -167,7 +167,7 @@ typedef struct {
     void** arStreamCaps;               ///< VIDEO_STREAM_CONFIG_CAPS or AUDIO_STREAM_CONFIG_CAPS
 } chain_t;
 
-typedef struct {
+typedef struct priv {
     int dev_index;              ///< capture device index in device list (defaul: 0, first available device)
     int adev_index;             ///< audio capture device index in device list (default: -1, not used)
     int immediate_mode;         ///< immediate mode (no sound capture)

Modified: trunk/stream/tvi_dummy.c
==============================================================================
--- trunk/stream/tvi_dummy.c	Sun Jun 13 19:18:48 2010	(r31387)
+++ trunk/stream/tvi_dummy.c	Sun Jun 13 19:20:29 2010	(r31388)
@@ -35,7 +35,7 @@ const tvi_info_t tvi_info_dummy = {
 };
 
 /* private data's */
-typedef struct {
+typedef struct priv {
     int width;
     int height;
 } priv_t;

Modified: trunk/stream/tvi_v4l.c
==============================================================================
--- trunk/stream/tvi_v4l.c	Sun Jun 13 19:18:48 2010	(r31387)
+++ trunk/stream/tvi_v4l.c	Sun Jun 13 19:20:29 2010	(r31388)
@@ -87,7 +87,7 @@ const tvi_info_t tvi_info_v4l = {
 #define VID_BUF_SIZE_IMMEDIATE   2
 #define VIDEO_AVG_BUFFER_SIZE  600
 
-typedef struct {
+typedef struct priv {
     /* general */
     char                        *video_device;
     int                         video_fd;

Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c	Sun Jun 13 19:18:48 2010	(r31387)
+++ trunk/stream/tvi_v4l2.c	Sun Jun 13 19:20:29 2010	(r31388)
@@ -85,7 +85,7 @@ typedef struct {
 } video_buffer_entry;
 
 /* private data */
-typedef struct {
+typedef struct priv {
     /* video */
     char                        *video_dev;
     int                         video_fd;