summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/bin
diff options
context:
space:
mode:
authordoursse <doursse>2007-10-31 19:34:39 +0000
committerdoursse <doursse@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2007-10-31 19:34:39 +0000
commit4649e92bb8b330f9f87836555b9bc73f535d56e5 (patch)
tree0437475699ba13b54a5ab6b71dfea28aa4d76e52 /legacy/emotion/src/bin
parent5f684ac5123092624e81b9799c3d53e35e3e1795 (diff)
* Use ecore_plugin instead of dlfcn
* the modules names are now "xine" and "gstreamer" (it's useless to add the extension, as ecore_plugin do not need it). I'll fix eclair, etk_extra and ewl. * look for the modules in path that is pointed by the env variable EMOTION_MODULES_DIR first. * fix a leak in the gstreamer module * remove some trailing spaces SVN revision: 32261
Diffstat (limited to 'legacy/emotion/src/bin')
-rw-r--r--legacy/emotion/src/bin/emotion_test_main.c116
1 files changed, 58 insertions, 58 deletions
diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c
index b044e7e4e1..805fd51af5 100644
--- a/legacy/emotion/src/bin/emotion_test_main.c
+++ b/legacy/emotion/src/bin/emotion_test_main.c
@@ -51,13 +51,13 @@ static int
51main_start(int argc, char **argv) 51main_start(int argc, char **argv)
52{ 52{
53 int mode = 0; 53 int mode = 0;
54 54
55 start_time = ecore_time_get(); 55 start_time = ecore_time_get();
56 if (!ecore_init()) return -1; 56 if (!ecore_init()) return -1;
57 ecore_app_args_set(argc, (const char **)argv); 57 ecore_app_args_set(argc, (const char **)argv);
58 ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL); 58 ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL);
59 if (!ecore_evas_init()) return -1; 59 if (!ecore_evas_init()) return -1;
60#ifndef FB_ONLY 60#ifndef FB_ONLY
61 { 61 {
62 int i; 62 int i;
63 63
@@ -69,7 +69,7 @@ main_start(int argc, char **argv)
69 { 69 {
70 int n, w, h; 70 int n, w, h;
71 char buf[16], buf2[16]; 71 char buf[16], buf2[16];
72 72
73 n = sscanf(argv[i +1], "%10[^x]x%10s", buf, buf2); 73 n = sscanf(argv[i +1], "%10[^x]x%10s", buf, buf2);
74 if (n == 2) 74 if (n == 2)
75 { 75 {
@@ -97,7 +97,7 @@ main_start(int argc, char **argv)
97#if HAVE_ECORE_EVAS_X 97#if HAVE_ECORE_EVAS_X
98 if (mode == 0) 98 if (mode == 0)
99 ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, startw, starth); 99 ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, startw, starth);
100#endif 100#endif
101#if HAVE_ECORE_EVAS_GL 101#if HAVE_ECORE_EVAS_GL
102 if (mode == 1) 102 if (mode == 1)
103 ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth); 103 ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
@@ -108,7 +108,7 @@ main_start(int argc, char **argv)
108#endif 108#endif
109 if (mode == 3) 109 if (mode == 3)
110 ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth); 110 ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth);
111 111
112#else 112#else
113 startw = 240; 113 startw = 240;
114 starth = 320; 114 starth = 320;
@@ -124,7 +124,7 @@ main_start(int argc, char **argv)
124 evas_image_cache_set(evas, 8 * 1024 * 1024); 124 evas_image_cache_set(evas, 8 * 1024 * 1024);
125 evas_font_cache_set(evas, 1 * 1024 * 1024); 125 evas_font_cache_set(evas, 1 * 1024 * 1024);
126 evas_font_path_append(evas, PACKAGE_DATA_DIR"/data/fonts"); 126 evas_font_path_append(evas, PACKAGE_DATA_DIR"/data/fonts");
127 127
128 edje_init(); 128 edje_init();
129 edje_frametime_set(1.0 / 30.0); 129 edje_frametime_set(1.0 / 30.0);
130 return 1; 130 return 1;
@@ -141,7 +141,7 @@ static void
141main_resize(Ecore_Evas *ee) 141main_resize(Ecore_Evas *ee)
142{ 142{
143 Evas_Coord w, h; 143 Evas_Coord w, h;
144 144
145 evas_output_viewport_get(evas, NULL, NULL, &w, &h); 145 evas_output_viewport_get(evas, NULL, NULL, &w, &h);
146 bg_resize(w, h); 146 bg_resize(w, h);
147} 147}
@@ -176,7 +176,7 @@ bg_setup(void)
176 evas_object_move(o, 0, 0); 176 evas_object_move(o, 0, 0);
177 evas_object_resize(o, startw, starth); 177 evas_object_resize(o, startw, starth);
178 evas_object_layer_set(o, -999); 178 evas_object_layer_set(o, -999);
179 evas_object_show(o); 179 evas_object_show(o);
180 evas_object_focus_set(o, 1); 180 evas_object_focus_set(o, 1);
181 evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, bg_key_down, NULL); 181 evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, bg_key_down, NULL);
182 o_bg = o; 182 o_bg = o;
@@ -192,11 +192,11 @@ static void
192broadcast_event(Emotion_Event ev) 192broadcast_event(Emotion_Event ev)
193{ 193{
194 Evas_List *l; 194 Evas_List *l;
195 195
196 for (l = video_objs; l; l = l->next) 196 for (l = video_objs; l; l = l->next)
197 { 197 {
198 Evas_Object *obj; 198 Evas_Object *obj;
199 199
200 obj = l->data; 200 obj = l->data;
201 emotion_object_event_simple_send(obj, ev); 201 emotion_object_event_simple_send(obj, ev);
202 } 202 }
@@ -206,7 +206,7 @@ static void
206bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info) 206bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
207{ 207{
208 Evas_Event_Key_Down *ev; 208 Evas_Event_Key_Down *ev;
209 209
210 ev = (Evas_Event_Key_Down *)event_info; 210 ev = (Evas_Event_Key_Down *)event_info;
211 if (!strcmp(ev->keyname, "Escape")) 211 if (!strcmp(ev->keyname, "Escape"))
212 ecore_main_loop_quit(); 212 ecore_main_loop_quit();
@@ -251,11 +251,11 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
251 else if (!strcmp(ev->keyname, "bracketleft")) 251 else if (!strcmp(ev->keyname, "bracketleft"))
252 { 252 {
253 Evas_List *l; 253 Evas_List *l;
254 254
255 for (l = video_objs; l; l = l->next) 255 for (l = video_objs; l; l = l->next)
256 { 256 {
257 Evas_Object *obj; 257 Evas_Object *obj;
258 258
259 obj = l->data; 259 obj = l->data;
260 emotion_object_audio_volume_set(obj, emotion_object_audio_volume_get(obj) - 0.1); 260 emotion_object_audio_volume_set(obj, emotion_object_audio_volume_get(obj) - 0.1);
261 } 261 }
@@ -263,11 +263,11 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
263 else if (!strcmp(ev->keyname, "bracketright")) 263 else if (!strcmp(ev->keyname, "bracketright"))
264 { 264 {
265 Evas_List *l; 265 Evas_List *l;
266 266
267 for (l = video_objs; l; l = l->next) 267 for (l = video_objs; l; l = l->next)
268 { 268 {
269 Evas_Object *obj; 269 Evas_Object *obj;
270 270
271 obj = l->data; 271 obj = l->data;
272 emotion_object_audio_volume_set(obj, emotion_object_audio_volume_get(obj) + 0.1); 272 emotion_object_audio_volume_set(obj, emotion_object_audio_volume_get(obj) + 0.1);
273 } 273 }
@@ -275,11 +275,11 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
275 else if (!strcmp(ev->keyname, "v")) 275 else if (!strcmp(ev->keyname, "v"))
276 { 276 {
277 Evas_List *l; 277 Evas_List *l;
278 278
279 for (l = video_objs; l; l = l->next) 279 for (l = video_objs; l; l = l->next)
280 { 280 {
281 Evas_Object *obj; 281 Evas_Object *obj;
282 282
283 obj = l->data; 283 obj = l->data;
284 if (emotion_object_video_mute_get(obj)) 284 if (emotion_object_video_mute_get(obj))
285 emotion_object_video_mute_set(obj, 0); 285 emotion_object_video_mute_set(obj, 0);
@@ -290,11 +290,11 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
290 else if (!strcmp(ev->keyname, "a")) 290 else if (!strcmp(ev->keyname, "a"))
291 { 291 {
292 Evas_List *l; 292 Evas_List *l;
293 293
294 for (l = video_objs; l; l = l->next) 294 for (l = video_objs; l; l = l->next)
295 { 295 {
296 Evas_Object *obj; 296 Evas_Object *obj;
297 297
298 obj = l->data; 298 obj = l->data;
299 if (emotion_object_audio_mute_get(obj)) 299 if (emotion_object_audio_mute_get(obj))
300 { 300 {
@@ -311,11 +311,11 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
311 else if (!strcmp(ev->keyname, "i")) 311 else if (!strcmp(ev->keyname, "i"))
312 { 312 {
313 Evas_List *l; 313 Evas_List *l;
314 314
315 for (l = video_objs; l; l = l->next) 315 for (l = video_objs; l; l = l->next)
316 { 316 {
317 Evas_Object *obj; 317 Evas_Object *obj;
318 318
319 obj = l->data; 319 obj = l->data;
320 printf("audio channels: %i\n", emotion_object_audio_channel_count(obj)); 320 printf("audio channels: %i\n", emotion_object_audio_channel_count(obj));
321 printf("video channels: %i\n", emotion_object_video_channel_count(obj)); 321 printf("video channels: %i\n", emotion_object_video_channel_count(obj));
@@ -390,7 +390,7 @@ static void
390video_obj_down_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info) 390video_obj_down_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
391{ 391{
392 Evas_Event_Mouse_Down *e; 392 Evas_Event_Mouse_Down *e;
393 393
394 e = event_info; 394 e = event_info;
395 evas_object_color_set(obj, 200, 50, 40, 200); 395 evas_object_color_set(obj, 200, 50, 40, 200);
396 evas_object_raise(obj); 396 evas_object_raise(obj);
@@ -400,7 +400,7 @@ static void
400video_obj_up_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info) 400video_obj_up_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
401{ 401{
402 Evas_Event_Mouse_Up *e; 402 Evas_Event_Mouse_Up *e;
403 403
404 e = event_info; 404 e = event_info;
405 evas_object_color_set(obj, 100, 100, 100, 100); 405 evas_object_color_set(obj, 100, 100, 100, 100);
406} 406}
@@ -409,12 +409,12 @@ static void
409video_obj_move_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info) 409video_obj_move_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
410{ 410{
411 Evas_Event_Mouse_Move *e; 411 Evas_Event_Mouse_Move *e;
412 412
413 e = event_info; 413 e = event_info;
414 if (e->buttons & 0x1) 414 if (e->buttons & 0x1)
415 { 415 {
416 Evas_Coord x, y; 416 Evas_Coord x, y;
417 417
418 evas_object_geometry_get(obj, &x, &y, NULL, NULL); 418 evas_object_geometry_get(obj, &x, &y, NULL, NULL);
419 x += e->cur.canvas.x - e->prev.canvas.x; 419 x += e->cur.canvas.x - e->prev.canvas.x;
420 y += e->cur.canvas.y - e->prev.canvas.y; 420 y += e->cur.canvas.y - e->prev.canvas.y;
@@ -423,7 +423,7 @@ video_obj_move_cb(void *data, Evas *ev, Evas_Object *obj, void *event_info)
423 else if (e->buttons & 0x4) 423 else if (e->buttons & 0x4)
424 { 424 {
425 Evas_Coord w, h; 425 Evas_Coord w, h;
426 426
427 evas_object_geometry_get(obj, NULL, NULL, &w, &h); 427 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
428 w += e->cur.canvas.x - e->prev.canvas.x; 428 w += e->cur.canvas.x - e->prev.canvas.x;
429 h += e->cur.canvas.y - e->prev.canvas.y; 429 h += e->cur.canvas.y - e->prev.canvas.y;
@@ -454,7 +454,7 @@ video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info)
454 snprintf(buf, sizeof(buf), "%i:%02i:%02i.%02i / %i:%02i:%02i", 454 snprintf(buf, sizeof(buf), "%i:%02i:%02i.%02i / %i:%02i:%02i",
455 ph, pm, ps, pf, lh, lm, ls); 455 ph, pm, ps, pf, lh, lm, ls);
456 edje_object_part_text_set(oe, "video_progress_txt", buf); 456 edje_object_part_text_set(oe, "video_progress_txt", buf);
457 457
458 if (0) 458 if (0)
459 { 459 {
460 double t; 460 double t;
@@ -548,7 +548,7 @@ video_obj_progress_cb(void *data, Evas_Object *obj, void *event_info)
548 Evas_Object *oe; 548 Evas_Object *oe;
549 549
550 oe = data; 550 oe = data;
551 printf("progress: \"%s\" %3.3f\n", 551 printf("progress: \"%s\" %3.3f\n",
552 emotion_object_progress_info_get(obj), 552 emotion_object_progress_info_get(obj),
553 emotion_object_progress_status_get(obj)); 553 emotion_object_progress_status_get(obj));
554} 554}
@@ -590,7 +590,7 @@ static void
590video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission, const char *source) 590video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission, const char *source)
591{ 591{
592 Evas_Object *ov; 592 Evas_Object *ov;
593 593
594 ov = data; 594 ov = data;
595 emotion_object_play_set(ov, 1); 595 emotion_object_play_set(ov, 1);
596 edje_object_signal_emit(o, "video_state", "play"); 596 edje_object_signal_emit(o, "video_state", "play");
@@ -600,7 +600,7 @@ static void
600video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission, const char *source) 600video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission, const char *source)
601{ 601{
602 Evas_Object *ov; 602 Evas_Object *ov;
603 603
604 ov = data; 604 ov = data;
605 emotion_object_play_set(ov, 0); 605 emotion_object_play_set(ov, 0);
606 edje_object_signal_emit(o, "video_state", "pause"); 606 edje_object_signal_emit(o, "video_state", "pause");
@@ -610,7 +610,7 @@ static void
610video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source) 610video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source)
611{ 611{
612 Evas_Object *ov; 612 Evas_Object *ov;
613 613
614 ov = data; 614 ov = data;
615 emotion_object_play_set(ov, 0); 615 emotion_object_play_set(ov, 0);
616 emotion_object_position_set(ov, 0); 616 emotion_object_position_set(ov, 0);
@@ -623,7 +623,7 @@ video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission, const
623 Evas_Object *ov; 623 Evas_Object *ov;
624 double len; 624 double len;
625 double x, y; 625 double x, y;
626 626
627 ov = data; 627 ov = data;
628 edje_object_part_drag_value_get(o, source, &x, &y); 628 edje_object_part_drag_value_get(o, source, &x, &y);
629 len = emotion_object_play_length_get(ov); 629 len = emotion_object_play_length_get(ov);
@@ -637,7 +637,7 @@ video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission, cons
637 double spd; 637 double spd;
638 double x, y; 638 double x, y;
639 char buf[256]; 639 char buf[256];
640 640
641 ov = data; 641 ov = data;
642 edje_object_part_drag_value_get(o, source, &x, &y); 642 edje_object_part_drag_value_get(o, source, &x, &y);
643 spd = 255 * y; 643 spd = 255 * y;
@@ -651,7 +651,7 @@ video_obj_signal_frame_move_start_cb(void *data, Evas_Object *o, const char *emi
651{ 651{
652 Frame_Data *fd; 652 Frame_Data *fd;
653 Evas_Coord x, y; 653 Evas_Coord x, y;
654 654
655 fd = evas_object_data_get(o, "frame_data"); 655 fd = evas_object_data_get(o, "frame_data");
656 fd->moving = 1; 656 fd->moving = 1;
657 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 657 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
@@ -664,7 +664,7 @@ static void
664video_obj_signal_frame_move_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source) 664video_obj_signal_frame_move_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source)
665{ 665{
666 Frame_Data *fd; 666 Frame_Data *fd;
667 667
668 fd = evas_object_data_get(o, "frame_data"); 668 fd = evas_object_data_get(o, "frame_data");
669 fd->moving = 0; 669 fd->moving = 0;
670} 670}
@@ -674,7 +674,7 @@ video_obj_signal_frame_resize_start_cb(void *data, Evas_Object *o, const char *e
674{ 674{
675 Frame_Data *fd; 675 Frame_Data *fd;
676 Evas_Coord x, y; 676 Evas_Coord x, y;
677 677
678 fd = evas_object_data_get(o, "frame_data"); 678 fd = evas_object_data_get(o, "frame_data");
679 fd->resizing = 1; 679 fd->resizing = 1;
680 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 680 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
@@ -687,7 +687,7 @@ static void
687video_obj_signal_frame_resize_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source) 687video_obj_signal_frame_resize_stop_cb(void *data, Evas_Object *o, const char *emission, const char *source)
688{ 688{
689 Frame_Data *fd; 689 Frame_Data *fd;
690 690
691 fd = evas_object_data_get(o, "frame_data"); 691 fd = evas_object_data_get(o, "frame_data");
692 fd->resizing = 0; 692 fd->resizing = 0;
693} 693}
@@ -696,12 +696,12 @@ static void
696video_obj_signal_frame_move_cb(void *data, Evas_Object *o, const char *emission, const char *source) 696video_obj_signal_frame_move_cb(void *data, Evas_Object *o, const char *emission, const char *source)
697{ 697{
698 Frame_Data *fd; 698 Frame_Data *fd;
699 699
700 fd = evas_object_data_get(o, "frame_data"); 700 fd = evas_object_data_get(o, "frame_data");
701 if (fd->moving) 701 if (fd->moving)
702 { 702 {
703 Evas_Coord x, y, ox, oy; 703 Evas_Coord x, y, ox, oy;
704 704
705 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 705 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
706 evas_object_geometry_get(o, &ox, &oy, NULL, NULL); 706 evas_object_geometry_get(o, &ox, &oy, NULL, NULL);
707 evas_object_move(o, ox + (x - fd->x), oy + (y - fd->y)); 707 evas_object_move(o, ox + (x - fd->x), oy + (y - fd->y));
@@ -711,7 +711,7 @@ video_obj_signal_frame_move_cb(void *data, Evas_Object *o, const char *emission,
711 else if (fd->resizing) 711 else if (fd->resizing)
712 { 712 {
713 Evas_Coord x, y, ow, oh; 713 Evas_Coord x, y, ow, oh;
714 714
715 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 715 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
716 evas_object_geometry_get(o, NULL, NULL, &ow, &oh); 716 evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
717 evas_object_resize(o, ow + (x - fd->x), oh + (y - fd->y)); 717 evas_object_resize(o, ow + (x - fd->x), oh + (y - fd->y));
@@ -729,11 +729,11 @@ init_video_object(char *module_filename, char *filename)
729 Evas_Coord w, h; 729 Evas_Coord w, h;
730 Frame_Data *fd; 730 Frame_Data *fd;
731 731
732 732
733/* basic video object setup */ 733/* basic video object setup */
734 o = emotion_object_add(evas); 734 o = emotion_object_add(evas);
735 if (!emotion_object_init(o, module_filename)) 735 if (!emotion_object_init(o, module_filename))
736 return; 736 return;
737 emotion_object_file_set(o, filename); 737 emotion_object_file_set(o, filename);
738 emotion_object_play_set(o, 1); 738 emotion_object_play_set(o, 1);
739 evas_object_move(o, 0, 0); 739 evas_object_move(o, 0, 0);
@@ -742,14 +742,14 @@ init_video_object(char *module_filename, char *filename)
742 evas_object_show(o); 742 evas_object_show(o);
743/* end basic video setup. all the rest here is just to be fancy */ 743/* end basic video setup. all the rest here is just to be fancy */
744 744
745 745
746 video_objs = evas_list_append(video_objs, o); 746 video_objs = evas_list_append(video_objs, o);
747 747
748 emotion_object_size_get(o, &iw, &ih); 748 emotion_object_size_get(o, &iw, &ih);
749 w = iw; h = ih; 749 w = iw; h = ih;
750 750
751 fd = calloc(1, sizeof(Frame_Data)); 751 fd = calloc(1, sizeof(Frame_Data));
752 752
753 oe = edje_object_add(evas); 753 oe = edje_object_add(evas);
754 evas_object_data_set(oe, "frame_data", fd); 754 evas_object_data_set(oe, "frame_data", fd);
755 edje_object_file_set(oe, PACKAGE_DATA_DIR"/data/theme.edj", "video_controller"); 755 edje_object_file_set(oe, PACKAGE_DATA_DIR"/data/theme.edj", "video_controller");
@@ -761,7 +761,7 @@ init_video_object(char *module_filename, char *filename)
761 evas_object_resize(oe, w, h); 761 evas_object_resize(oe, w, h);
762 edje_extern_object_min_size_set(o, 0, 0); 762 edje_extern_object_min_size_set(o, 0, 0);
763 edje_object_part_swallow(oe, "video_swallow", o); 763 edje_object_part_swallow(oe, "video_swallow", o);
764 764
765 evas_object_smart_callback_add(o, "frame_decode", video_obj_frame_decode_cb, oe); 765 evas_object_smart_callback_add(o, "frame_decode", video_obj_frame_decode_cb, oe);
766 evas_object_smart_callback_add(o, "frame_resize", video_obj_frame_resize_cb, oe); 766 evas_object_smart_callback_add(o, "frame_resize", video_obj_frame_resize_cb, oe);
767 evas_object_smart_callback_add(o, "length_change", video_obj_length_change_cb, oe); 767 evas_object_smart_callback_add(o, "length_change", video_obj_length_change_cb, oe);
@@ -773,7 +773,7 @@ init_video_object(char *module_filename, char *filename)
773 evas_object_smart_callback_add(o, "ref_change", video_obj_ref_cb, oe); 773 evas_object_smart_callback_add(o, "ref_change", video_obj_ref_cb, oe);
774 evas_object_smart_callback_add(o, "button_num_change", video_obj_button_num_cb, oe); 774 evas_object_smart_callback_add(o, "button_num_change", video_obj_button_num_cb, oe);
775 evas_object_smart_callback_add(o, "button_change", video_obj_button_cb, oe); 775 evas_object_smart_callback_add(o, "button_change", video_obj_button_cb, oe);
776 776
777 edje_object_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o); 777 edje_object_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o);
778 edje_object_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); 778 edje_object_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o);
779 edje_object_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o); 779 edje_object_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o);
@@ -785,12 +785,12 @@ init_video_object(char *module_filename, char *filename)
785 edje_object_signal_callback_add(oe, "frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe); 785 edje_object_signal_callback_add(oe, "frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe);
786 edje_object_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe); 786 edje_object_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe);
787 edje_object_signal_callback_add(oe, "mouse,move", "*", video_obj_signal_frame_move_cb, oe); 787 edje_object_signal_callback_add(oe, "mouse,move", "*", video_obj_signal_frame_move_cb, oe);
788 788
789 edje_object_part_drag_value_set(oe, "video_speed", 0.0, 1.0); 789 edje_object_part_drag_value_set(oe, "video_speed", 0.0, 1.0);
790 edje_object_part_text_set(oe, "video_speed_txt", "1.0"); 790 edje_object_part_text_set(oe, "video_speed_txt", "1.0");
791 791
792 edje_object_signal_emit(o, "video_state", "play"); 792 edje_object_signal_emit(o, "video_state", "play");
793 793
794 evas_object_show(oe); 794 evas_object_show(oe);
795} 795}
796 796
@@ -800,7 +800,7 @@ enter_idle(void *data)
800 double t; 800 double t;
801 static double pt = 0.0; 801 static double pt = 0.0;
802 static int frames = 0; 802 static int frames = 0;
803 803
804 t = ecore_time_get(); 804 t = ecore_time_get();
805 if (frames == 0) pt = t; 805 if (frames == 0) pt = t;
806 frames++; 806 frames++;
@@ -817,11 +817,11 @@ main(int argc, char **argv)
817{ 817{
818 char *module_filename; 818 char *module_filename;
819 int i; 819 int i;
820 820
821 if (main_start(argc, argv) < 1) return -1; 821 if (main_start(argc, argv) < 1) return -1;
822 bg_setup(); 822 bg_setup();
823 823
824 module_filename = "emotion_decoder_xine.so"; 824 module_filename = "xine";
825 825
826 for (i = 1; i < argc; i++) 826 for (i = 1; i < argc; i++)
827 { 827 {
@@ -848,11 +848,11 @@ main(int argc, char **argv)
848 } 848 }
849 else if (!strcmp(argv[i], "-xine")) 849 else if (!strcmp(argv[i], "-xine"))
850 { 850 {
851 module_filename = "emotion_decoder_xine.so"; 851 module_filename = "xine";
852 } 852 }
853 else if (!strcmp(argv[i], "-gstreamer")) 853 else if (!strcmp(argv[i], "-gstreamer"))
854 { 854 {
855 module_filename = "emotion_decoder_gstreamer.so"; 855 module_filename = "gstreamer";
856 } 856 }
857 else 857 else
858 { 858 {
@@ -860,7 +860,7 @@ main(int argc, char **argv)
860 init_video_object(module_filename, argv[i]); 860 init_video_object(module_filename, argv[i]);
861 } 861 }
862 } 862 }
863 863
864 ecore_idle_enterer_add(enter_idle, NULL); 864 ecore_idle_enterer_add(enter_idle, NULL);
865 865
866 ecore_main_loop_begin(); 866 ecore_main_loop_begin();