Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/elation
Dir : e17/apps/elation/src/bin
Modified Files:
Elation.h elation_main.c elation_module.c
Log Message:
actually works as a dvd player.. now xine is screwed when it comes to
ejecting.. i cant shutdown the xine subsytem - it freezes inside a xine call.
all say YAY to threads! grrrr.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/bin/Elation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Elation.h 15 Jul 2004 09:47:00 -0000 1.1
+++ Elation.h 18 Jul 2004 08:04:21 -0000 1.2
@@ -47,7 +47,19 @@
ELATION_ACT_NEXT,
ELATION_ACT_PREV,
ELATION_ACT_SELECT,
- ELATION_ACT_EXIT
+ ELATION_ACT_EXIT,
+ ELATION_ACT_UP,
+ ELATION_ACT_DOWN,
+ ELATION_ACT_LEFT,
+ ELATION_ACT_RIGHT,
+ ELATION_ACT_MENU,
+ ELATION_ACT_INFO,
+ ELATION_ACT_INPUT,
+ ELATION_ACT_PLAY,
+ ELATION_ACT_PAUSE,
+ ELATION_ACT_STOP,
+ ELATION_ACT_REC,
+ ELATION_ACT_SKIP
};
Elation_Module *elation_module_open(Elation_Info *info, Elation_Module *parent, char
*name);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/bin/elation_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- elation_main.c 15 Jul 2004 09:47:00 -0000 1.1
+++ elation_main.c 18 Jul 2004 08:04:21 -0000 1.2
@@ -35,6 +35,7 @@
main_start(int argc, char **argv)
{
int mode = 0;
+ int fullscreen = 0;
if (!ecore_init()) return -1;
ecore_app_args_set(argc, (const char **)argv);
@@ -63,18 +64,28 @@
}
i++;
}
- else if (!strcmp(argv[i], "-gl"))
+ else if ((!strcmp(argv[i], "-gl")) ||
+ (!strcmp(argv[i], "-opengl")) ||
+ (!strcmp(argv[i], "--opengl")))
{
mode = 1;
}
- else if (!strcmp(argv[i], "-fb"))
+ else if ((!strcmp(argv[i], "-fb")) ||
+ (!strcmp(argv[i], "-framebuffer")) ||
+ (!strcmp(argv[i], "--framebuffer")))
{
mode = 2;
}
+ else if ((!strcmp(argv[i], "-f")) ||
+ (!strcmp(argv[i], "-fullscreen")) ||
+ (!strcmp(argv[i], "--fullscreen")))
+ {
+ fullscreen = 1;
+ }
}
}
if (mode == 0)
- ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, startw, starth);
+ ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, startw, starth);
else if (mode == 1)
ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
else if (mode == 2)
@@ -85,10 +96,12 @@
ecore_evas = ecore_evas_fb_new(NULL, 270, startw, starth);
#endif
if (!ecore_evas) return -1;
+ ecore_evas_title_set(ecore_evas, "Elation Media Manager");
+ ecore_evas_name_class_set(ecore_evas, "elation", "Elation");
+ if (fullscreen) ecore_evas_fullscreen_set(ecore_evas, 1);
ecore_evas_callback_delete_request_set(ecore_evas, main_delete_request);
ecore_evas_callback_resize_set(ecore_evas, main_resize);
- ecore_evas_title_set(ecore_evas, "Elation");
- ecore_evas_name_class_set(ecore_evas, "elation", "main");
+ ecore_evas_cursor_set(ecore_evas, "", 99999, 0, 0);
ecore_evas_show(ecore_evas);
evas = ecore_evas_get(ecore_evas);
evas_image_cache_set(evas, 8 * 1024 * 1024);
@@ -140,14 +153,17 @@
bg_setup(void)
{
Evas_Object *o;
+ Evas_Coord w, h;
o = edje_object_add(evas);
o_bg = o;
edje_object_file_set(o, PACKAGE_DATA_DIR"/data/theme.eet", "background");
evas_object_move(o, 0, 0);
- evas_object_resize(o, startw, starth);
evas_object_layer_set(o, -999);
evas_object_show(o);
+
+ evas_output_viewport_get(evas, NULL, NULL, &w, &h);
+ bg_resize(w, h);
}
void
@@ -162,14 +178,17 @@
menu_setup(void)
{
Elation_Module *em;
+ Evas_Coord w, h;
- em = elation_module_open(&elation_info, NULL, "menu");
+ em = elation_module_open(&elation_info, NULL, "dvd");
em_menu = em;
if (em)
{
em->show(em);
em->focus(em);
}
+ evas_output_viewport_get(evas, NULL, NULL, &w, &h);
+ menu_resize(w, h);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/bin/elation_module.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- elation_module.c 15 Jul 2004 09:47:00 -0000 1.1
+++ elation_module.c 18 Jul 2004 08:04:21 -0000 1.2
@@ -10,12 +10,19 @@
void *handle;
char buf[4096];
- snprintf(buf, sizeof(buf), "%s/%s.so", PACKAGE_LIB_DIR"/elation", name);
+ snprintf(buf, sizeof(buf), "%s/elation_%s.so", PACKAGE_LIB_DIR"/elation", name);
handle = dlopen(buf, RTLD_NOW | RTLD_LOCAL);
- if (!handle) return NULL;
+ if (!handle)
+ {
+ printf("ERROR loading: %s\n"
+ "ERROR:\n"
+ "%s\n", buf, dlerror());
+ return NULL;
+ }
init = dlsym(handle, "init");
if (!init)
{
+ printf("no init!\n");
dlclose(handle);
return NULL;
}
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
