summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/bin
diff options
context:
space:
mode:
authordoursse <doursse>2005-10-02 07:34:36 +0000
committerdoursse <doursse@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2005-10-02 07:34:36 +0000
commitbad4d6e848af68f23d207b55d1fd5d4c741336ac (patch)
treec33956c097a4c070700db976017b969b4741db52 /legacy/emotion/src/bin
parentdc5e3e07afcc52d47b8d80f40ef06c95c819a4a3 (diff)
emotion can use gstreamer, now
SVN revision: 17103
Diffstat (limited to 'legacy/emotion/src/bin')
-rw-r--r--legacy/emotion/src/bin/emotion_test_main.c26
1 files changed, 20 insertions, 6 deletions
diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c
index d35ca808ca..2a137eac06 100644
--- a/legacy/emotion/src/bin/emotion_test_main.c
+++ b/legacy/emotion/src/bin/emotion_test_main.c
@@ -715,7 +715,7 @@ video_obj_signal_frame_move_cb(void *data, Evas_Object *o, const char *emission,
715 715
716 716
717static void 717static void
718init_video_object(char *file) 718init_video_object(char *module_filename, char *filename)
719{ 719{
720 Evas_Object *o, *oe; 720 Evas_Object *o, *oe;
721 int iw, ih; 721 int iw, ih;
@@ -724,8 +724,10 @@ init_video_object(char *file)
724 724
725 725
726/* basic video object setup */ 726/* basic video object setup */
727 o = emotion_object_add(evas); 727 o = emotion_object_add(evas);
728 emotion_object_file_set(o, file); 728 if (!emotion_object_init(o, module_filename))
729 return;
730 emotion_object_file_set(o, filename);
729 emotion_object_play_set(o, 1); 731 emotion_object_play_set(o, 1);
730 evas_object_move(o, 0, 0); 732 evas_object_move(o, 0, 0);
731 evas_object_resize(o, 320, 240); 733 evas_object_resize(o, 320, 240);
@@ -806,11 +808,14 @@ enter_idle(void *data)
806int 808int
807main(int argc, char **argv) 809main(int argc, char **argv)
808{ 810{
811 char *module_filename;
809 int i; 812 int i;
810 813
811 if (main_start(argc, argv) < 1) return -1; 814 if (main_start(argc, argv) < 1) return -1;
812 bg_setup(); 815 bg_setup();
813 816
817 module_filename = "emotion_decoder_xine.so";
818
814 for (i = 1; i < argc; i++) 819 for (i = 1; i < argc; i++)
815 { 820 {
816 if (((!strcmp(argv[i], "-g")) || 821 if (((!strcmp(argv[i], "-g")) ||
@@ -822,7 +827,7 @@ main(int argc, char **argv)
822 (!strcmp(argv[i], "--help")))) 827 (!strcmp(argv[i], "--help"))))
823 { 828 {
824 printf("Usage:\n"); 829 printf("Usage:\n");
825 printf(" %s [-gl] [-g WxH] \n", argv[0]); 830 printf(" %s [-gl] [-g WxH] [-xine] [-gstreamer] filename\n", argv[0]);
826 exit(-1); 831 exit(-1);
827 } 832 }
828 else if (!strcmp(argv[i], "-gl")) 833 else if (!strcmp(argv[i], "-gl"))
@@ -831,9 +836,18 @@ main(int argc, char **argv)
831 else if (!strcmp(argv[i], "-fb")) 836 else if (!strcmp(argv[i], "-fb"))
832 { 837 {
833 } 838 }
834 else 839 else if (!strcmp(argv[i], "-xine"))
840 {
841 module_filename = "emotion_decoder_xine.so";
842 }
843 else if (!strcmp(argv[i], "-gstreamer"))
844 {
845 module_filename = "emotion_decoder_gstreamer.so";
846 }
847 else
835 { 848 {
836 init_video_object(argv[i]); 849 printf ("module : %s\n", module_filename);
850 init_video_object(module_filename, argv[i]);
837 } 851 }
838 } 852 }
839 853