From: <enl...@li...> - 2005-07-08 20:29:28
|
Enlightenment CVS committal Author : moom16 Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: emotion_xine.c emotion_xine.h Log Message: * Cancel last changes since it seems there are some license problems. Sorry guys, I didn't think GPLv2 was so "contaminating" =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- emotion_xine.c 8 Jul 2005 19:56:47 -0000 1.22 +++ emotion_xine.c 8 Jul 2005 20:28:50 -0000 1.23 @@ -16,10 +16,8 @@ static double em_ratio_get(void *ef); static int em_seekable(void *ef); static void em_frame_done(void *ef); -static Emotion_Format em_format_get(void *ef); -static void em_video_data_size_get(void *ef, int *w, int *h); +static void em_yuv_size_get(void *ef, int *w, int *h); static int em_yuv_rows_get(void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows); -static int em_bgra_data_get(void *ef, unsigned char **bgra_data); static void em_event_feed(void *ef, int event); static void em_event_mouse_button_feed(void *ef, int button, int x, int y); static void em_event_mouse_move_feed(void *ef, int x, int y); @@ -546,21 +544,8 @@ } } -static Emotion_Format em_format_get(void *ef) -{ - Emotion_Xine_Video *ev; - Emotion_Xine_Video_Frame *fr; - - ev = (Emotion_Xine_Video *)ef; - fr = ev->cur_frame; - - if (fr) - return fr->format; - return EMOTION_YV12; -} - static void -em_video_data_size_get(void *ef, int *w, int *h) +em_yuv_size_get(void *ef, int *w, int *h) { Emotion_Xine_Video *ev; Emotion_Xine_Video_Frame *fr; @@ -598,23 +583,6 @@ return 0; } -static int -em_bgra_data_get(void *ef, unsigned char **bgra_data) -{ - Emotion_Xine_Video *ev; - Emotion_Xine_Video_Frame *fr; - - ev = (Emotion_Xine_Video *)ef; - fr = ev->cur_frame; - if (!fr) return 0; - if (fr->bgra_data) - { - *bgra_data = fr->bgra_data; - return 1; - } - return 0; -} - static void em_event_feed(void *ef, int event) { @@ -1369,10 +1337,8 @@ em_audio_handled, /* audio_handled */ em_seekable, /* seekable */ em_frame_done, /* frame_done */ - em_format_get, /* format_get */ - em_video_data_size_get, /* video_data_size_get */ + em_yuv_size_get, /* yuv_size_get */ em_yuv_rows_get, /* yuv_rows_get */ - em_bgra_data_get, /* bgra_data_get */ em_event_feed, /* event_feed */ em_event_mouse_button_feed, /* event_mouse_button_feed */ em_event_mouse_move_feed, /* event_mouse_move_feed */ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- emotion_xine.h 8 Jul 2005 19:56:47 -0000 1.9 +++ emotion_xine.h 8 Jul 2005 20:28:50 -0000 1.10 @@ -57,9 +57,7 @@ { int w, h; double ratio; - Emotion_Format format; unsigned char *y, *u, *v; - unsigned char *bgra_data; int y_stride, u_stride, v_stride; Evas_Object *obj; double timestamp; |