summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/lib/emotion_smart.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2004-07-18 08:25:45 +0000
committerCarsten Haitzler <raster@rasterman.com>2004-07-18 08:25:45 +0000
commit7ed4bd13cde555dadbc6767ba14f8fbe7baaada9 (patch)
tree7cae208e131bf17fc7b2a896ee0e57440eda9849 /legacy/emotion/src/lib/emotion_smart.c
parentad7ff874ab8704f24b04148a3bbe65d0fd5ff910 (diff)
remove seek job... let the seek request thread do it all now
SVN revision: 10898
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index 89ca196fb0..f7192751f9 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -42,8 +42,6 @@ struct _Smart_Data
42 double seek_pos; 42 double seek_pos;
43 double len; 43 double len;
44 44
45 Ecore_Job *job;
46
47 unsigned char play : 1; 45 unsigned char play : 1;
48 unsigned char seek : 1; 46 unsigned char seek : 1;
49 47
@@ -64,7 +62,6 @@ struct _Smart_Data
64 62
65static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info); 63static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info);
66static void _mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info); 64static void _mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info);
67static void _pos_set_job(void *data);
68static void _pixels_get(void *data, Evas_Object *obj); 65static void _pixels_get(void *data, Evas_Object *obj);
69 66
70static void _smart_init(void); 67static void _smart_init(void);
@@ -241,10 +238,7 @@ emotion_object_position_set(Evas_Object *obj, double sec)
241 if (!sd->module) return; 238 if (!sd->module) return;
242 if (!sd->video) return; 239 if (!sd->video) return;
243 sd->seek_pos = sec; 240 sd->seek_pos = sec;
244 sd->seek = 1; 241 sd->module->pos_set(sd->video, sd->seek_pos);
245 sd->pos = sd->seek_pos;
246 if (sd->job) ecore_job_del(sd->job);
247 sd->job = ecore_job_add(_pos_set_job, obj);
248} 242}
249 243
250double 244double
@@ -880,22 +874,6 @@ _mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info)
880 sd->module->event_mouse_button_feed(sd->video, 1, x, y); 874 sd->module->event_mouse_button_feed(sd->video, 1, x, y);
881} 875}
882 876
883static void
884_pos_set_job(void *data)
885{
886 Evas_Object *obj;
887 Smart_Data *sd;
888
889 obj = data;
890 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
891 sd->job = NULL;
892 if (sd->seek)
893 {
894 sd->module->pos_set(sd->video, sd->seek_pos);
895 sd->seek = 0;
896 }
897}
898
899/* called by evas when it needs pixels for the image object */ 877/* called by evas when it needs pixels for the image object */
900static void 878static void
901_pixels_get(void *data, Evas_Object *obj) 879_pixels_get(void *data, Evas_Object *obj)
@@ -993,7 +971,6 @@ _smart_del(Evas_Object * obj)
993 if (sd->module) _emotion_module_close(sd->module); 971 if (sd->module) _emotion_module_close(sd->module);
994 evas_object_del(sd->obj); 972 evas_object_del(sd->obj);
995 if (sd->file) free(sd->file); 973 if (sd->file) free(sd->file);
996 if (sd->job) ecore_job_del(sd->job);
997 if (sd->progress.info) free(sd->progress.info); 974 if (sd->progress.info) free(sd->progress.info);
998 if (sd->ref.file) free(sd->ref.file); 975 if (sd->ref.file) free(sd->ref.file);
999 free(sd); 976 free(sd);