summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-12-30 13:24:30 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-12-30 13:24:30 +0000
commitaee164d97c46c81ebba403d64f6a3c1f6a58b7be (patch)
tree3d224e25717184dfd596691c8f3bb1c3de339462 /legacy/emotion
parentdafc9d3aec9d379f25069fdd3d1449db7133e380 (diff)
warning--
SVN revision: 66691
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine.c7
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine_vo_out.c6
2 files changed, 8 insertions, 5 deletions
diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c
index 4ca951e4d3..4108e73064 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine.c
@@ -366,7 +366,7 @@ _em_slave_event(void *data, int type, void *arg)
366 new_ev->xine_event = arg; 366 new_ev->xine_event = arg;
367 buf[0] = data; 367 buf[0] = data;
368 buf[1] = new_ev; 368 buf[1] = new_ev;
369 write(ev->fd_slave_write, buf, sizeof(buf)); 369 if (write(ev->fd_slave_write, buf, sizeof(buf)) < 0) perror("write");
370} 370}
371 371
372static unsigned char 372static unsigned char
@@ -1189,6 +1189,7 @@ _em_fd_active(void *data, Ecore_Fd_Handler *fdh)
1189 } 1189 }
1190 } 1190 }
1191 return EINA_TRUE; 1191 return EINA_TRUE;
1192 data = NULL;
1192} 1193}
1193 1194
1194static void 1195static void
@@ -1215,7 +1216,7 @@ _em_event(void *data, const xine_event_t *event)
1215 } 1216 }
1216 buf[0] = data; 1217 buf[0] = data;
1217 buf[1] = new_ev; 1218 buf[1] = new_ev;
1218 write(ev->fd_ev_write, buf, sizeof(buf)); 1219 if (write(ev->fd_ev_write, buf, sizeof(buf)) < 0) perror("write");
1219} 1220}
1220 1221
1221static void 1222static void
@@ -1232,7 +1233,7 @@ _em_module_event(void *data, int type)
1232 new_ev->type = -1; 1233 new_ev->type = -1;
1233 buf[0] = data; 1234 buf[0] = data;
1234 buf[1] = new_ev; 1235 buf[1] = new_ev;
1235 write(ev->fd_ev_write, buf, sizeof(buf)); 1236 if (write(ev->fd_ev_write, buf, sizeof(buf)) < 0) perror("write");
1236} 1237}
1237 1238
1238static Eina_Bool 1239static Eina_Bool
diff --git a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
index 883ab23ec4..e0502f6311 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
@@ -69,6 +69,8 @@ struct _Emotion_Lut
69 uint8_t foo : 8; 69 uint8_t foo : 8;
70} __attribute__ ((packed)); 70} __attribute__ ((packed));
71 71
72typedef void (*done_func_type)(void *data);
73
72/***************************************************************************/ 74/***************************************************************************/
73static void *_emotion_class_init (xine_t *xine, void *visual); 75static void *_emotion_class_init (xine_t *xine, void *visual);
74static void _emotion_class_dispose (video_driver_class_t *driver_class); 76static void _emotion_class_dispose (video_driver_class_t *driver_class);
@@ -442,10 +444,10 @@ _emotion_frame_display(vo_driver_t *vo_driver, vo_frame_t *vo_frame)
442 444
443 buf = &(fr->frame); 445 buf = &(fr->frame);
444 fr->frame.timestamp = (double)fr->vo_frame.vpts / 90000.0; 446 fr->frame.timestamp = (double)fr->vo_frame.vpts / 90000.0;
445 fr->frame.done_func = _emotion_frame_data_unlock; 447 fr->frame.done_func = (done_func_type)_emotion_frame_data_unlock;
446 fr->frame.done_data = fr; 448 fr->frame.done_data = fr;
447// DBG("FRAME FOR %p", dv->ev); 449// DBG("FRAME FOR %p", dv->ev);
448 write(dv->ev->fd_write, &buf, sizeof(void *)); 450 if (write(dv->ev->fd_write, &buf, sizeof(void *)) < 0) perror("write");
449// DBG("-- FRAME DEC %p == %i", fr->frame.obj, ret); 451// DBG("-- FRAME DEC %p == %i", fr->frame.obj, ret);
450 fr->in_use = 1; 452 fr->in_use = 1;
451 dv->ev->fq++; 453 dv->ev->fq++;