From 536096e93813b14b8911977a21dc712ffb8ada35 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 20 Jun 2008 20:07:36 +0000 Subject: cosmetic: give coherent indentation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27108 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/vidixlib.h | 89 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 45 deletions(-) (limited to 'vidix/vidixlib.h') diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index 08ca9639da..819e60db41 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -68,67 +68,66 @@ typedef struct VDXContext { /* might be filled in by much more info later on */ } VDXContext; -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). - cap - specifies driver capability (TYPE_* constants). - verbose - specifies verbose level - returns !0 if ok else NULL. - */ -VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose); - /* Closes stream and corresponded driver. */ -void vdlClose(VDL_HANDLE ctx); +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). + * cap - specifies driver capability (TYPE_* constants). + * verbose - specifies verbose level + * returns handle if ok else NULL. + */ +VDL_HANDLE vdlOpen (const char *name,unsigned cap,int verbose); - /* Queries driver capabilities. Return 0 if ok else errno */ -int vdlGetCapability(VDL_HANDLE, vidix_capability_t *); +/* Closes stream and corresponded driver. */ +void vdlClose (VDL_HANDLE ctx); - /* Queries support for given fourcc. Returns 0 if ok else errno */ -int vdlQueryFourcc(VDL_HANDLE,vidix_fourcc_t *); +/* Queries driver capabilities. Return 0 if ok else errno */ +int vdlGetCapability (VDL_HANDLE, vidix_capability_t *); - /* Returns 0 if ok else errno */ -int vdlConfigPlayback(VDL_HANDLE, vidix_playback_t *); +/* Queries support for given fourcc. Returns 0 if ok else errno */ +int vdlQueryFourcc (VDL_HANDLE, vidix_fourcc_t *); - /* Returns 0 if ok else errno */ -int vdlPlaybackOn(VDL_HANDLE); +/* Returns 0 if ok else errno */ +int vdlConfigPlayback (VDL_HANDLE, vidix_playback_t *); - /* Returns 0 if ok else errno */ -int vdlPlaybackOff(VDL_HANDLE); +/* Returns 0 if ok else errno */ +int vdlPlaybackOn (VDL_HANDLE); - /* Returns 0 if ok else errno */ -int vdlPlaybackFrameSelect(VDL_HANDLE, unsigned frame_idx ); +/* Returns 0 if ok else errno */ +int vdlPlaybackOff (VDL_HANDLE); - /* Returns 0 if ok else errno */ -int vdlGetGrKeys(VDL_HANDLE, vidix_grkey_t * ); +/* Returns 0 if ok else errno */ +int vdlPlaybackFrameSelect (VDL_HANDLE, unsigned frame_idx); - /* Returns 0 if ok else errno */ -int vdlSetGrKeys(VDL_HANDLE, const vidix_grkey_t * ); +/* Returns 0 if ok else errno */ +int vdlGetGrKeys (VDL_HANDLE, vidix_grkey_t *); - /* Returns 0 if ok else errno */ -int vdlPlaybackGetEq(VDL_HANDLE, vidix_video_eq_t * ); +/* Returns 0 if ok else errno */ +int vdlSetGrKeys (VDL_HANDLE, const vidix_grkey_t *); - /* Returns 0 if ok else errno */ -int vdlPlaybackSetEq(VDL_HANDLE, const vidix_video_eq_t * ); +/* Returns 0 if ok else errno */ +int vdlPlaybackGetEq (VDL_HANDLE, vidix_video_eq_t *); - /* Returns 0 if ok else errno */ -int vdlPlaybackGetDeint(VDL_HANDLE, vidix_deinterlace_t * ); +/* Returns 0 if ok else errno */ +int vdlPlaybackSetEq (VDL_HANDLE, const vidix_video_eq_t *); - /* Returns 0 if ok else errno */ -int vdlPlaybackSetDeint(VDL_HANDLE, const vidix_deinterlace_t * ); +/* Returns 0 if ok else errno */ +int vdlPlaybackGetDeint (VDL_HANDLE, vidix_deinterlace_t *); - /* Returns 0 if ok else errno */ -int vdlQueryNumOemEffects(VDL_HANDLE, unsigned * number ); +/* Returns 0 if ok else errno */ +int vdlPlaybackSetDeint (VDL_HANDLE, const vidix_deinterlace_t *); - /* Returns 0 if ok else errno */ -int vdlGetOemEffect(VDL_HANDLE, vidix_oem_fx_t * ); +/* Returns 0 if ok else errno */ +int vdlQueryNumOemEffects (VDL_HANDLE, unsigned *number); - /* Returns 0 if ok else errno */ -int vdlSetOemEffect(VDL_HANDLE, const vidix_oem_fx_t * ); +/* Returns 0 if ok else errno */ +int vdlGetOemEffect (VDL_HANDLE, vidix_oem_fx_t *); +/* Returns 0 if ok else errno */ +int vdlSetOemEffect (VDL_HANDLE, const vidix_oem_fx_t *); - /* Returns 0 if ok else errno */ -int vdlPlaybackCopyFrame(VDL_HANDLE, const vidix_dma_t * ); +/* Returns 0 if ok else errno */ +int vdlPlaybackCopyFrame (VDL_HANDLE, const vidix_dma_t *); #endif /* MPLAYER_VIDIXLIB_H */ -- cgit v1.2.3 From c29c9e905497744e6989d4264a4db2e5cbfb0a87 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 20 Jun 2008 20:09:54 +0000 Subject: move content of vidixlib.h into vidix.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27109 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/vidixlib.h | 92 -------------------------------------------------------- 1 file changed, 92 deletions(-) (limited to 'vidix/vidixlib.h') diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index 819e60db41..a02f9b1fb2 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -38,96 +38,4 @@ #include "vidix.h" -typedef struct VDXDriver { - const char *name; - struct VDXDriver *next; - int (* probe) (int verbose, int force); - int (* get_caps) (vidix_capability_t *cap); - int (*query_fourcc)(vidix_fourcc_t *); - int (*init)(void); - void (*destroy)(void); - int (*config_playback)(vidix_playback_t *); - int (*playback_on)( void ); - int (*playback_off)( void ); - /* Functions below can be missed in driver ;) */ - int (*frame_sel)( unsigned frame_idx ); - int (*get_eq)( vidix_video_eq_t * ); - int (*set_eq)( const vidix_video_eq_t * ); - int (*get_deint)( vidix_deinterlace_t * ); - int (*set_deint)( const vidix_deinterlace_t * ); - int (*copy_frame)( const vidix_dma_t * ); - int (*get_gkey)( vidix_grkey_t * ); - int (*set_gkey)( const vidix_grkey_t * ); - int (*get_num_fx)( unsigned * ); - int (*get_fx)( vidix_oem_fx_t * ); - int (*set_fx)( const vidix_oem_fx_t * ); -} VDXDriver; - -typedef struct VDXContext { - VDXDriver *drv; - /* might be filled in by much more info later on */ -} VDXContext; - -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). - * cap - specifies driver capability (TYPE_* constants). - * verbose - specifies verbose level - * returns handle if ok else NULL. - */ -VDL_HANDLE vdlOpen (const char *name,unsigned cap,int verbose); - -/* Closes stream and corresponded driver. */ -void vdlClose (VDL_HANDLE ctx); - -/* Queries driver capabilities. Return 0 if ok else errno */ -int vdlGetCapability (VDL_HANDLE, vidix_capability_t *); - -/* Queries support for given fourcc. Returns 0 if ok else errno */ -int vdlQueryFourcc (VDL_HANDLE, vidix_fourcc_t *); - -/* Returns 0 if ok else errno */ -int vdlConfigPlayback (VDL_HANDLE, vidix_playback_t *); - -/* Returns 0 if ok else errno */ -int vdlPlaybackOn (VDL_HANDLE); - -/* Returns 0 if ok else errno */ -int vdlPlaybackOff (VDL_HANDLE); - -/* Returns 0 if ok else errno */ -int vdlPlaybackFrameSelect (VDL_HANDLE, unsigned frame_idx); - -/* Returns 0 if ok else errno */ -int vdlGetGrKeys (VDL_HANDLE, vidix_grkey_t *); - -/* Returns 0 if ok else errno */ -int vdlSetGrKeys (VDL_HANDLE, const vidix_grkey_t *); - -/* Returns 0 if ok else errno */ -int vdlPlaybackGetEq (VDL_HANDLE, vidix_video_eq_t *); - -/* Returns 0 if ok else errno */ -int vdlPlaybackSetEq (VDL_HANDLE, const vidix_video_eq_t *); - -/* Returns 0 if ok else errno */ -int vdlPlaybackGetDeint (VDL_HANDLE, vidix_deinterlace_t *); - -/* Returns 0 if ok else errno */ -int vdlPlaybackSetDeint (VDL_HANDLE, const vidix_deinterlace_t *); - -/* Returns 0 if ok else errno */ -int vdlQueryNumOemEffects (VDL_HANDLE, unsigned *number); - -/* Returns 0 if ok else errno */ -int vdlGetOemEffect (VDL_HANDLE, vidix_oem_fx_t *); - -/* Returns 0 if ok else errno */ -int vdlSetOemEffect (VDL_HANDLE, const vidix_oem_fx_t *); - -/* Returns 0 if ok else errno */ -int vdlPlaybackCopyFrame (VDL_HANDLE, const vidix_dma_t *); - #endif /* MPLAYER_VIDIXLIB_H */ -- cgit v1.2.3 From 144b0d05cdd58f45a1876cfa704f59c2653d23bc Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 20 Jun 2008 20:16:34 +0000 Subject: remove now useless vidixlib.h file git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27111 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/vidixlib.h | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 vidix/vidixlib.h (limited to 'vidix/vidixlib.h') diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h deleted file mode 100644 index a02f9b1fb2..0000000000 --- a/vidix/vidixlib.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * VIDIX - VIDeo Interface for *niX. - * - * This interface is introduced as universal one to MPEG decoder, - * Back End Scaler (BES) and YUV2RGB hw accelerators. - * - * In the future it may be expanded up to capturing and audio things. - * Main goal of this this interface imlpementation is providing DGA - * everywhere where it's possible (unlike X11 and other). - * - * This interface is based on v4l2, fbvid.h, mga_vid.h projects - * and personally my ideas. - * - * NOTE: This interface is introduced as driver interface. - * - * Copyright (C) 2002 Nick Kurshev - * Copyright (C) 2007 Benjamin Zores - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_VIDIXLIB_H -#define MPLAYER_VIDIXLIB_H - -#include "vidix.h" - -#endif /* MPLAYER_VIDIXLIB_H */ -- cgit v1.2.3