comparison libvo/vo_dxr3.c @ 16171:fd51fd1ff231

Fix the return types of all (six) libvo API functions. Used to be uint32_t, but return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's changed to int now.
author ivo
date Fri, 05 Aug 2005 01:24:37 +0000
parents 05aa13cdf92f
children aff6d5831e25
comparison
equal deleted inserted replaced
16170:7c5d6c82e5ed 16171:fd51fd1ff231
268 268
269 269
270 /* Functions for working with the em8300's internal clock */ 270 /* Functions for working with the em8300's internal clock */
271 /* End of internal clock functions */ 271 /* End of internal clock functions */
272 272
273 static uint32_t control(uint32_t request, void *data, ...) 273 static int control(uint32_t request, void *data, ...)
274 { 274 {
275 switch (request) { 275 switch (request) {
276 case VOCTRL_GUISUPPORT: 276 case VOCTRL_GUISUPPORT:
277 return VO_TRUE; 277 return VO_TRUE;
278 case VOCTRL_GUI_NOWINDOW: 278 case VOCTRL_GUI_NOWINDOW:
416 (*prec)++; 416 (*prec)++;
417 mask >>= 1; 417 mask >>= 1;
418 } 418 }
419 } 419 }
420 420
421 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) 421 static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
422 { 422 {
423 int tmp1, tmp2, size; 423 int tmp1, tmp2, size;
424 em8300_register_t reg; 424 em8300_register_t reg;
425 extern float monitor_aspect; 425 extern float monitor_aspect;
426 426
749 disposd++; 749 disposd++;
750 #endif 750 #endif
751 } 751 }
752 752
753 753
754 static uint32_t draw_frame(uint8_t * src[]) 754 static int draw_frame(uint8_t * src[])
755 { 755 {
756 vo_mpegpes_t *p = (vo_mpegpes_t *) src[0]; 756 vo_mpegpes_t *p = (vo_mpegpes_t *) src[0];
757 757
758 #ifdef SPU_SUPPORT 758 #ifdef SPU_SUPPORT
759 if (p->id == 0x20) { 759 if (p->id == 0x20) {
810 ioctl(fd_spu, EM8300_IOCTL_SPU_SETPTS, &vo_pts); 810 ioctl(fd_spu, EM8300_IOCTL_SPU_SETPTS, &vo_pts);
811 ioctl(fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts); 811 ioctl(fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts);
812 } 812 }
813 } 813 }
814 814
815 static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0) 815 static int draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0)
816 { 816 {
817 return -1; 817 return -1;
818 } 818 }
819 819
820 static void uninit(void) 820 static void uninit(void)
862 862
863 static void check_events(void) 863 static void check_events(void)
864 { 864 {
865 } 865 }
866 866
867 static uint32_t preinit(const char *arg) 867 static int preinit(const char *arg)
868 { 868 {
869 char devname[MAX_STR_SIZE]; 869 char devname[MAX_STR_SIZE];
870 int fdflags = O_WRONLY; 870 int fdflags = O_WRONLY;
871 871
872 /* Parse commandline */ 872 /* Parse commandline */