forked from enlightenment/efl
parent
dafc9d3aec
commit
aee164d97c
|
@ -366,7 +366,7 @@ _em_slave_event(void *data, int type, void *arg)
|
||||||
new_ev->xine_event = arg;
|
new_ev->xine_event = arg;
|
||||||
buf[0] = data;
|
buf[0] = data;
|
||||||
buf[1] = new_ev;
|
buf[1] = new_ev;
|
||||||
write(ev->fd_slave_write, buf, sizeof(buf));
|
if (write(ev->fd_slave_write, buf, sizeof(buf)) < 0) perror("write");
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned char
|
static unsigned char
|
||||||
|
@ -1189,6 +1189,7 @@ _em_fd_active(void *data, Ecore_Fd_Handler *fdh)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
data = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1215,7 +1216,7 @@ _em_event(void *data, const xine_event_t *event)
|
||||||
}
|
}
|
||||||
buf[0] = data;
|
buf[0] = data;
|
||||||
buf[1] = new_ev;
|
buf[1] = new_ev;
|
||||||
write(ev->fd_ev_write, buf, sizeof(buf));
|
if (write(ev->fd_ev_write, buf, sizeof(buf)) < 0) perror("write");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1232,7 +1233,7 @@ _em_module_event(void *data, int type)
|
||||||
new_ev->type = -1;
|
new_ev->type = -1;
|
||||||
buf[0] = data;
|
buf[0] = data;
|
||||||
buf[1] = new_ev;
|
buf[1] = new_ev;
|
||||||
write(ev->fd_ev_write, buf, sizeof(buf));
|
if (write(ev->fd_ev_write, buf, sizeof(buf)) < 0) perror("write");
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
|
|
@ -69,6 +69,8 @@ struct _Emotion_Lut
|
||||||
uint8_t foo : 8;
|
uint8_t foo : 8;
|
||||||
} __attribute__ ((packed));
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
|
typedef void (*done_func_type)(void *data);
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
static void *_emotion_class_init (xine_t *xine, void *visual);
|
static void *_emotion_class_init (xine_t *xine, void *visual);
|
||||||
static void _emotion_class_dispose (video_driver_class_t *driver_class);
|
static 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)
|
||||||
|
|
||||||
buf = &(fr->frame);
|
buf = &(fr->frame);
|
||||||
fr->frame.timestamp = (double)fr->vo_frame.vpts / 90000.0;
|
fr->frame.timestamp = (double)fr->vo_frame.vpts / 90000.0;
|
||||||
fr->frame.done_func = _emotion_frame_data_unlock;
|
fr->frame.done_func = (done_func_type)_emotion_frame_data_unlock;
|
||||||
fr->frame.done_data = fr;
|
fr->frame.done_data = fr;
|
||||||
// DBG("FRAME FOR %p", dv->ev);
|
// DBG("FRAME FOR %p", dv->ev);
|
||||||
write(dv->ev->fd_write, &buf, sizeof(void *));
|
if (write(dv->ev->fd_write, &buf, sizeof(void *)) < 0) perror("write");
|
||||||
// DBG("-- FRAME DEC %p == %i", fr->frame.obj, ret);
|
// DBG("-- FRAME DEC %p == %i", fr->frame.obj, ret);
|
||||||
fr->in_use = 1;
|
fr->in_use = 1;
|
||||||
dv->ev->fq++;
|
dv->ev->fq++;
|
||||||
|
|
Loading…
Reference in New Issue