Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/bin
Modified Files:
emotion_test_main.c
Log Message:
emotion can use gstreamer, now
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emotion_test_main.c 5 Sep 2005 16:30:09 -0000 1.10
+++ emotion_test_main.c 2 Oct 2005 07:34:36 -0000 1.11
@@ -715,7 +715,7 @@
static void
-init_video_object(char *file)
+init_video_object(char *module_filename, char *filename)
{
Evas_Object *o, *oe;
int iw, ih;
@@ -724,8 +724,10 @@
/* basic video object setup */
- o = emotion_object_add(evas);
- emotion_object_file_set(o, file);
+ o = emotion_object_add(evas);
+ if (!emotion_object_init(o, module_filename))
+ return;
+ emotion_object_file_set(o, filename);
emotion_object_play_set(o, 1);
evas_object_move(o, 0, 0);
evas_object_resize(o, 320, 240);
@@ -806,11 +808,14 @@
int
main(int argc, char **argv)
{
+ char *module_filename;
int i;
if (main_start(argc, argv) < 1) return -1;
bg_setup();
+ module_filename = "emotion_decoder_xine.so";
+
for (i = 1; i < argc; i++)
{
if (((!strcmp(argv[i], "-g")) ||
@@ -822,7 +827,7 @@
(!strcmp(argv[i], "--help"))))
{
printf("Usage:\n");
- printf(" %s [-gl] [-g WxH] \n", argv[0]);
+ printf(" %s [-gl] [-g WxH] [-xine] [-gstreamer] filename\n",
argv[0]);
exit(-1);
}
else if (!strcmp(argv[i], "-gl"))
@@ -831,9 +836,18 @@
else if (!strcmp(argv[i], "-fb"))
{
}
- else
+ else if (!strcmp(argv[i], "-xine"))
+ {
+ module_filename = "emotion_decoder_xine.so";
+ }
+ else if (!strcmp(argv[i], "-gstreamer"))
+ {
+ module_filename = "emotion_decoder_gstreamer.so";
+ }
+ else
{
- init_video_object(argv[i]);
+ printf ("module : %s\n", module_filename);
+ init_video_object(module_filename, argv[i]);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
