[Mplayer-cvslog] CVS: main/libmpcodecs ad.h,1.1,1.2

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mplayer:/var/tmp.root/cvs-serv27303

Modified Files:
	ad.h 
Log Message:
changed to be more-or-less compatible with Nick's stuff

Index: ad.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad.h	25 Mar 2002 02:39:58 -0000	1.1
+++ ad.h	25 Mar 2002 19:53:41 -0000	1.2
@@ -6,21 +6,21 @@
 typedef struct ad_functions_s
 {
 	ad_info_t *info;
+        int (*preinit)(sh_audio_t *sh);
         int (*init)(sh_audio_t *sh);
-        int (*start)(sh_audio_t *sh);
         void (*uninit)(sh_audio_t *sh);
         int (*control)(sh_audio_t *sh,int cmd,void* arg, ...);
-        int (*decode)(sh_audio_t *sh,unsigned char* buffer,int minlen,int maxlen,int flags);
+        int (*decode_audio)(sh_audio_t *sh,unsigned char* buffer,int minlen,int maxlen);
 } ad_functions_t;
 
 // NULL terminated array of all drivers
 extern ad_functions_t* mpcodecs_ad_drivers[];
 
 // fallback if ADCTRL_RESYNC not implemented: sh_audio->a_in_buffer_len=0;
-#define ADCTRL_RESYNC 1       /* resync, called after seeking! */
+#define ADCTRL_RESYNC_STREAM 1       /* resync, called after seeking! */
 
 // fallback if ADCTRL_SKIP not implemented: ds_fill_buffer(sh_audio->ds);
-#define ADCTRL_SKIP 2         /* skip block/frame, called while seeking! */
+#define ADCTRL_SKIP_FRAME 2         /* skip block/frame, called while seeking! */
 
 // fallback if ADCTRL_QUERY_FORMAT not implemented: sh_audio->sample_format
 #define ADCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */