[Mplayer-cvslog] CVS: main/libvo vosub_vidix.h,1.3,1.4 vosub_vidix.c,1.11,1.12
Alex Beregszaszi
alex at mplayer.dev.hu
Fri Jan 18 11:41:35 CET 2002
Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv17773
Modified Files:
vosub_vidix.h vosub_vidix.c
Log Message:
sorry, i really wanted to add vidix_start and stop as int, to detect if something went into the wrong way (also implement check in vo_xvidix)
Index: vosub_vidix.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vosub_vidix.h 16 Jan 2002 15:22:45 -0000 1.3
+++ vosub_vidix.h 18 Jan 2002 10:41:31 -0000 1.4
@@ -18,8 +18,8 @@
unsigned dest_x,unsigned dest_y,unsigned dst_width,
unsigned dst_height,unsigned format,unsigned dest_bpp,
unsigned vid_w,unsigned vid_h);
-void vidix_start(void);
-void vidix_stop(void);
+int vidix_start(void);
+int vidix_stop(void);
void vidix_term( void );
uint32_t vidix_query_fourcc(unsigned fourcc);
Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vosub_vidix.c 18 Jan 2002 09:25:56 -0000 1.11
+++ vosub_vidix.c 18 Jan 2002 10:41:31 -0000 1.12
@@ -164,7 +164,7 @@
vidix_video_eq_t vid_eq;
-void vidix_start(void)
+int vidix_start(void)
{
int err;
@@ -188,7 +188,7 @@
if((err=vdlPlaybackOn(vidix_handler))!=0)
{
printf("vosub_vidix: Can't start playback: %s\n",strerror(err));
- return;
+ return -1;
}
vid_eq.brightness = vo_gamma_brightness;
vid_eq.saturation = vo_gamma_saturation;
@@ -199,16 +199,18 @@
vid_eq.blue_intense = vo_gamma_blue_intense;
vid_eq.flags = VEQ_FLG_ITU_R_BT_601;
vdlPlaybackSetEq(vidix_handler,&vid_eq);
- return;
+ return 0;
}
-void vidix_stop(void)
+int vidix_stop(void)
{
int err;
if((err=vdlPlaybackOff(vidix_handler))!=0)
{
printf("vosub_vidix: Can't stop playback: %s\n",strerror(err));
+ return -1;
}
+ return 0;
}
void vidix_term( void )
More information about the MPlayer-cvslog
mailing list