From: cedric Date: Thu, 7 Jan 2010 10:06:32 +0000 (+0000) Subject: * emotion_test: Let ecore_evas do the work. X-Git-Tag: submit/2.0alpha-wayland/20121127.222018~326 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcd4435b869950f64e2f40018d44f6abf6ec559a;p=profile%2Fivi%2Femotion.git * emotion_test: Let ecore_evas do the work. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@44944 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/bin/emotion_test_main.c b/src/bin/emotion_test_main.c index 73418e5..e8b4c00 100644 --- a/src/bin/emotion_test_main.c +++ b/src/bin/emotion_test_main.c @@ -3,15 +3,8 @@ #include #include -#if defined(EMOTION_HAVE_ECORE_X) || defined(EMOTION_HAVE_ECORE_FB) - #include #include -#ifdef EMOTION_HAVE_ECORE_X -# include -#else -# include -#endif #include #include @@ -64,7 +57,6 @@ main_start(int argc, char **argv) edje_frametime_set(1.0 / 30.0); if (!ecore_evas_init()) return -1; -#ifdef EMOTION_HAVE_ECORE_X { int i; @@ -121,11 +113,7 @@ main_start(int argc, char **argv) if (mode == 3) ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth); -#else - startw = 240; - starth = 320; - ecore_evas = ecore_evas_fb_new(NULL, 270, startw, starth); -#endif + if (!ecore_evas) return -1; ecore_evas_callback_delete_request_set(ecore_evas, main_delete_request); ecore_evas_callback_resize_set(ecore_evas, main_resize); @@ -894,12 +882,3 @@ main(int argc, char **argv) main_stop(); return 0; } - -#else -# warning "EMOTION_HAVE_ECORE_X and EMOTION_HAVE_ECORE_FB not defined !" -int main() -{ - puts("Could not find Ecore_X.h or Ecore_Fb.h so test is disabled"); - return 0; -} -#endif