From: <enl...@li...> - 2002-06-19 19:33:08
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : libs/evas2 Dir : e17/libs/evas2/src/bin Modified Files: Tag: SPLIT Makefile.am evas_directfb_main.c evas_directfb_window.c Log Message: start cleaning up the dfb backend, port to the new init stuff, yadda yadda =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/bin/Attic/Makefile.am,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -3 -r1.1.2.14 -r1.1.2.15 --- Makefile.am 18 Jun 2002 07:16:48 -0000 1.1.2.14 +++ Makefile.am 19 Jun 2002 19:32:35 -0000 1.1.2.15 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = \ --I. -I$(top_srcdir)/src/lib -I$(includedir) -I$(top_srcdir) +-I. -I$(top_srcdir)/src/lib -I$(includedir) -I$(top_srcdir) @DIRECTFB_CFLAGS@ bin_PROGRAMS = \ @ENGINE_SOFTWARE_X11_PRG@ \ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/bin/Attic/evas_directfb_main.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -3 -r1.1.2.1 -r1.1.2.2 --- evas_directfb_main.c 18 Jun 2002 01:54:20 -0000 1.1.2.1 +++ evas_directfb_main.c 19 Jun 2002 19:32:35 -0000 1.1.2.2 @@ -4,9 +4,10 @@ #include <math.h> #include <sys/time.h> +#include <directfb.h> #include "Evas.h" +#include "Evas_Engine_DirectFB.h" -#include <directfb.h> inline static double get_time(void) @@ -122,8 +123,14 @@ evas_output_method_set(evas, evas_render_method_lookup("directfb")); evas_output_size_set(evas, win_w, win_h); evas_output_viewport_set(evas, 0, 0, win_w, win_h); - evas_engine_directfb_setup(evas, dfb, primary); - + { + Evas_Engine_Info_DirectFB *einfo; + einfo = (Evas_Engine_Info_DirectFB *)evas_engine_info_get(evas); + + einfo->info.dfb = dfb; + einfo->info.surface = primary; + evas_engine_info_set(evas, (Evas_Engine_Info *)einfo); + } { Evas_Object *ob; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/bin/Attic/evas_directfb_window.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -3 -r1.1.2.1 -r1.1.2.2 --- evas_directfb_window.c 18 Jun 2002 01:54:20 -0000 1.1.2.1 +++ evas_directfb_window.c 19 Jun 2002 19:32:35 -0000 1.1.2.2 @@ -4,10 +4,11 @@ #include <math.h> #include <sys/time.h> +#include <directfb.h> #include "Evas.h" +#include "Evas_Engine_DirectFB.h" #include "../../config.h" -#include <directfb.h> inline static double get_time(void) { @@ -74,7 +75,7 @@ DFBCHECK(dfb->CreateSurface(dfb, &desc, &bgsurface)); DFBCHECK(dfb->CreateImageProvider(dfb, - PACKAGE_DATA_DIR"/data/ebg.png", &provider)); + "../../data/ebg.png", &provider)); if(provider) { provider->RenderTo(provider, bgsurface, NULL); @@ -124,7 +125,15 @@ evas_output_method_set(evas, evas_render_method_lookup("directfb")); evas_output_size_set(evas, win_w, win_h); evas_output_viewport_set(evas, 0, 0, win_w, win_h); - evas_engine_directfb_setup(evas, dfb, win1_surface); + { + Evas_Engine_Info_DirectFB *einfo; + einfo = (Evas_Engine_Info_DirectFB *)evas_engine_info_get(evas); + + einfo->info.dfb = dfb; + einfo->info.surface = win1_surface; + evas_engine_info_set(evas, (Evas_Engine_Info *)einfo); + } + /* set up evas objects */ { |