[MPlayer-cvslog] r27116 - in trunk: libvo/vosub_vidix.c vidix/vidix.c vidix/vidix.h
ben
subversion at mplayerhq.hu
Fri Jun 20 22:28:51 CEST 2008
Author: ben
Date: Fri Jun 20 22:28:50 2008
New Revision: 27116
Log:
remove useless typedef againstfor VDXContext
Modified:
trunk/libvo/vosub_vidix.c
trunk/vidix/vidix.c
trunk/vidix/vidix.h
Modified: trunk/libvo/vosub_vidix.c
==============================================================================
--- trunk/libvo/vosub_vidix.c (original)
+++ trunk/libvo/vosub_vidix.c Fri Jun 20 22:28:50 2008
@@ -39,7 +39,7 @@
#define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
-static VDL_HANDLE vidix_handler = NULL;
+static VDXContext *vidix_handler = NULL;
static uint8_t *vidix_mem = NULL;
static uint8_t next_frame;
static unsigned image_Bpp,image_height,image_width,src_format,forced_fourcc=0;
Modified: trunk/vidix/vidix.c
==============================================================================
--- trunk/vidix/vidix.c (original)
+++ trunk/vidix/vidix.c Fri Jun 20 22:28:50 2008
@@ -44,7 +44,7 @@
#include "libavutil/common.h"
#include "mpbswap.h"
-VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose)
+VDXContext *vdlOpen(const char *name,unsigned cap,int verbose)
{
VDXContext *ctx;
@@ -90,7 +90,7 @@ VDL_HANDLE vdlOpen(const char *name,unsi
return ctx;
}
-void vdlClose(VDL_HANDLE ctx)
+void vdlClose(VDXContext *ctx)
{
if (ctx->drv->destroy)
ctx->drv->destroy ();
@@ -99,7 +99,7 @@ void vdlClose(VDL_HANDLE ctx)
free (ctx);
}
-int vdlGetCapability(VDL_HANDLE ctx, vidix_capability_t *cap)
+int vdlGetCapability(VDXContext *ctx, vidix_capability_t *cap)
{
return ctx->drv->get_caps (cap);
}
@@ -116,64 +116,64 @@ static uint32_t normalize_fourcc (uint32
return fourcc;
}
-int vdlQueryFourcc(VDL_HANDLE ctx, vidix_fourcc_t *f)
+int vdlQueryFourcc(VDXContext *ctx, vidix_fourcc_t *f)
{
f->fourcc = normalize_fourcc(f->fourcc);
return ctx->drv->query_fourcc (f);
}
-int vdlConfigPlayback (VDL_HANDLE ctx, vidix_playback_t *p)
+int vdlConfigPlayback (VDXContext *ctx, vidix_playback_t *p)
{
p->fourcc = normalize_fourcc(p->fourcc);
return ctx->drv->config_playback (p);
}
-int vdlPlaybackOn (VDL_HANDLE ctx)
+int vdlPlaybackOn (VDXContext *ctx)
{
return ctx->drv->playback_on ();
}
-int vdlPlaybackOff (VDL_HANDLE ctx)
+int vdlPlaybackOff (VDXContext *ctx)
{
return ctx->drv->playback_off ();
}
-int vdlPlaybackFrameSelect (VDL_HANDLE ctx, unsigned frame_idx)
+int vdlPlaybackFrameSelect (VDXContext *ctx, unsigned frame_idx)
{
return ctx->drv->frame_sel ? ctx->drv->frame_sel (frame_idx) : ENOSYS;
}
-int vdlPlaybackGetEq (VDL_HANDLE ctx, vidix_video_eq_t *e)
+int vdlPlaybackGetEq (VDXContext *ctx, vidix_video_eq_t *e)
{
return ctx->drv->get_eq ? ctx->drv->get_eq (e) : ENOSYS;
}
-int vdlPlaybackSetEq (VDL_HANDLE ctx, const vidix_video_eq_t *e)
+int vdlPlaybackSetEq (VDXContext *ctx, const vidix_video_eq_t *e)
{
return ctx->drv->set_eq ? ctx->drv->set_eq (e) : ENOSYS;
}
-int vdlPlaybackCopyFrame (VDL_HANDLE ctx, const vidix_dma_t *f)
+int vdlPlaybackCopyFrame (VDXContext *ctx, const vidix_dma_t *f)
{
return ctx->drv->copy_frame ? ctx->drv->copy_frame (f) : ENOSYS;
}
-int vdlGetGrKeys (VDL_HANDLE ctx, vidix_grkey_t *k)
+int vdlGetGrKeys (VDXContext *ctx, vidix_grkey_t *k)
{
return ctx->drv->get_gkey ? ctx->drv->get_gkey (k) : ENOSYS;
}
-int vdlSetGrKeys (VDL_HANDLE ctx, const vidix_grkey_t *k)
+int vdlSetGrKeys (VDXContext *ctx, const vidix_grkey_t *k)
{
return ctx->drv->set_gkey ? ctx->drv->set_gkey (k) : ENOSYS;
}
-int vdlPlaybackGetDeint (VDL_HANDLE ctx, vidix_deinterlace_t *d)
+int vdlPlaybackGetDeint (VDXContext *ctx, vidix_deinterlace_t *d)
{
return ctx->drv->get_deint ? ctx->drv->get_deint (d) : ENOSYS;
}
-int vdlPlaybackSetDeint (VDL_HANDLE ctx, const vidix_deinterlace_t *d)
+int vdlPlaybackSetDeint (VDXContext *ctx, const vidix_deinterlace_t *d)
{
return ctx->drv->set_deint ? ctx->drv->set_deint (d) : ENOSYS;
}
Modified: trunk/vidix/vidix.h
==============================================================================
--- trunk/vidix/vidix.h (original)
+++ trunk/vidix/vidix.h Fri Jun 20 22:28:50 2008
@@ -336,8 +336,6 @@ typedef struct VDXContext {
/* PUBLIC API */
/***************************************************************************/
-typedef VDXContext *VDL_HANDLE;
-
/* Opens corresponded video driver and returns handle of associated stream.
* path - specifies path where drivers are located.
* name - specifies prefered driver name (can be NULL).
@@ -345,48 +343,48 @@ typedef VDXContext *VDL_HANDLE;
* verbose - specifies verbose level
* returns handle if ok else NULL.
*/
-VDL_HANDLE vdlOpen (const char *name,unsigned cap,int verbose);
+VDXContext *vdlOpen (const char *name,unsigned cap,int verbose);
/* Closes stream and corresponded driver. */
-void vdlClose (VDL_HANDLE ctx);
+void vdlClose (VDXContext *ctx);
/* Queries driver capabilities. Return 0 if ok else errno */
-int vdlGetCapability (VDL_HANDLE, vidix_capability_t *);
+int vdlGetCapability (VDXContext *, vidix_capability_t *);
/* Queries support for given fourcc. Returns 0 if ok else errno */
-int vdlQueryFourcc (VDL_HANDLE, vidix_fourcc_t *);
+int vdlQueryFourcc (VDXContext *, vidix_fourcc_t *);
/* Returns 0 if ok else errno */
-int vdlConfigPlayback (VDL_HANDLE, vidix_playback_t *);
+int vdlConfigPlayback (VDXContext *, vidix_playback_t *);
/* Returns 0 if ok else errno */
-int vdlPlaybackOn (VDL_HANDLE);
+int vdlPlaybackOn (VDXContext *);
/* Returns 0 if ok else errno */
-int vdlPlaybackOff (VDL_HANDLE);
+int vdlPlaybackOff (VDXContext *);
/* Returns 0 if ok else errno */
-int vdlPlaybackFrameSelect (VDL_HANDLE, unsigned frame_idx);
+int vdlPlaybackFrameSelect (VDXContext *, unsigned frame_idx);
/* Returns 0 if ok else errno */
-int vdlGetGrKeys (VDL_HANDLE, vidix_grkey_t *);
+int vdlGetGrKeys (VDXContext *, vidix_grkey_t *);
/* Returns 0 if ok else errno */
-int vdlSetGrKeys (VDL_HANDLE, const vidix_grkey_t *);
+int vdlSetGrKeys (VDXContext *, const vidix_grkey_t *);
/* Returns 0 if ok else errno */
-int vdlPlaybackGetEq (VDL_HANDLE, vidix_video_eq_t *);
+int vdlPlaybackGetEq (VDXContext *, vidix_video_eq_t *);
/* Returns 0 if ok else errno */
-int vdlPlaybackSetEq (VDL_HANDLE, const vidix_video_eq_t *);
+int vdlPlaybackSetEq (VDXContext *, const vidix_video_eq_t *);
/* Returns 0 if ok else errno */
-int vdlPlaybackGetDeint (VDL_HANDLE, vidix_deinterlace_t *);
+int vdlPlaybackGetDeint (VDXContext *, vidix_deinterlace_t *);
/* Returns 0 if ok else errno */
-int vdlPlaybackSetDeint (VDL_HANDLE, const vidix_deinterlace_t *);
+int vdlPlaybackSetDeint (VDXContext *, const vidix_deinterlace_t *);
/* Returns 0 if ok else errno */
-int vdlQueryNumOemEffects (VDL_HANDLE, unsigned *number);
+int vdlQueryNumOemEffects (VDXContext *, unsigned *number);
#endif /* MPLAYER_VIDIX_H */
More information about the MPlayer-cvslog
mailing list