summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-02-23 11:35:29 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-02-23 11:35:29 +0100
commit93333ede152082c434e79e44b77d7d816b5305ea (patch)
treee1c5f108409e8ee1416070116f965992658ab2ee /src
parentda3f60546314bbb5d91d9fa8668acc0a0c348bf8 (diff)
evas: refactor shutdown.
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/common/evas_draw_main.c2
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.c3
-rw-r--r--src/modules/evas/engines/drm/evas_engine.c3
-rw-r--r--src/modules/evas/engines/fb/evas_engine.c6
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.c3
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c3
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c3
-rw-r--r--src/modules/evas/engines/psl1ght/evas_engine.c3
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_engine.c3
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.c3
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c3
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c3
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c3
13 files changed, 15 insertions, 26 deletions
diff --git a/src/lib/evas/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c
index 5eae8fb672..76328fff08 100644
--- a/src/lib/evas/common/evas_draw_main.c
+++ b/src/lib/evas/common/evas_draw_main.c
@@ -54,6 +54,8 @@ EAPI void
54evas_common_shutdown(void) 54evas_common_shutdown(void)
55{ 55{
56 evas_font_dir_cache_free(); 56 evas_font_dir_cache_free();
57 evas_common_font_shutdown();
58 evas_common_image_shutdown();
57 evas_common_image_cache_free(); 59 evas_common_image_cache_free();
58 evas_common_scale_sample_shutdown(); 60 evas_common_scale_sample_shutdown();
59} 61}
diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c
index 27f8806f9d..e12381b00e 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -173,8 +173,7 @@ eng_output_free(void *data)
173 evas_render_engine_software_generic_clean(&re->generic); 173 evas_render_engine_software_generic_clean(&re->generic);
174 free(re); 174 free(re);
175 175
176 evas_common_font_shutdown(); 176 evas_common_shutdown();
177 evas_common_image_shutdown();
178} 177}
179 178
180static Eina_Bool 179static Eina_Bool
diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c
index ba9cebd1b3..2a7bbfe9ee 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -149,8 +149,7 @@ eng_output_free(void *data)
149 evas_render_engine_software_generic_clean(&re->generic); 149 evas_render_engine_software_generic_clean(&re->generic);
150 free(re); 150 free(re);
151 151
152 evas_common_font_shutdown(); 152 evas_common_shutdown();
153 evas_common_image_shutdown();
154} 153}
155 154
156/* module api functions */ 155/* module api functions */
diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c
index b4822d9764..21e124b867 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -64,8 +64,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh)
64 on_error: 64 on_error:
65 if (ob) evas_fb_outbuf_fb_free(ob); 65 if (ob) evas_fb_outbuf_fb_free(ob);
66 free(re); 66 free(re);
67 evas_common_font_shutdown(); 67 evas_common_shutdown();
68 evas_common_image_shutdown();
69 return NULL; 68 return NULL;
70} 69}
71 70
@@ -120,8 +119,7 @@ eng_output_free(void *data)
120 evas_render_engine_software_generic_clean(&re->generic); 119 evas_render_engine_software_generic_clean(&re->generic);
121 free(re); 120 free(re);
122 121
123 evas_common_font_shutdown(); 122 evas_common_shutdown();
124 evas_common_image_shutdown();
125} 123}
126 124
127static Eina_Bool 125static Eina_Bool
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 2273ec4de2..ea6dcf6428 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -142,8 +142,7 @@ eng_output_free(void *data)
142 eng_window_free(re->win); 142 eng_window_free(re->win);
143 free(re); 143 free(re);
144 144
145 evas_common_font_shutdown(); 145 evas_common_shutdown();
146 evas_common_image_shutdown();
147} 146}
148 147
149static void 148static void
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index 0599e9826c..6e4b119f99 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -805,8 +805,7 @@ eng_output_free(void *data)
805 if ((initted == EINA_TRUE) && (gl_wins == 0)) 805 if ((initted == EINA_TRUE) && (gl_wins == 0))
806 { 806 {
807 glsym_evas_gl_preload_shutdown(); 807 glsym_evas_gl_preload_shutdown();
808 evas_common_image_shutdown(); 808 evas_common_shutdown();
809 evas_common_font_shutdown();
810 initted = EINA_FALSE; 809 initted = EINA_FALSE;
811 } 810 }
812} 811}
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index faeee6d866..08c39a89cb 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1709,8 +1709,7 @@ eng_output_free(void *data)
1709 if ((initted == 1) && (gl_wins == 0)) 1709 if ((initted == 1) && (gl_wins == 0))
1710 { 1710 {
1711 glsym_evas_gl_preload_shutdown(); 1711 glsym_evas_gl_preload_shutdown();
1712 evas_common_image_shutdown(); 1712 evas_common_shutdown();
1713 evas_common_font_shutdown();
1714 initted = 0; 1713 initted = 0;
1715 } 1714 }
1716} 1715}
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c
index 56ed5f8a36..b87cf46d08 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.c
+++ b/src/modules/evas/engines/psl1ght/evas_engine.c
@@ -202,8 +202,7 @@ eng_output_free(void *data)
202 202
203 free(re); 203 free(re);
204 204
205 evas_common_font_shutdown(); 205 evas_common_shutdown();
206 evas_common_image_shutdown();
207} 206}
208 207
209static void 208static void
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c
index dd1982c62d..91b36d8494 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -143,8 +143,7 @@ eng_output_free(void *data)
143 evas_render_engine_software_generic_clean(&re->generic); 143 evas_render_engine_software_generic_clean(&re->generic);
144 free(re); 144 free(re);
145 145
146 evas_common_font_shutdown(); 146 evas_common_shutdown();
147 evas_common_image_shutdown();
148} 147}
149 148
150static Eina_Bool 149static Eina_Bool
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c
index b7216e7d2d..e80a62903a 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -151,8 +151,7 @@ eng_output_free(void *data)
151 evas_render_engine_software_generic_clean(&re->generic); 151 evas_render_engine_software_generic_clean(&re->generic);
152 free(re); 152 free(re);
153 153
154 evas_common_font_shutdown(); 154 evas_common_shutdown();
155 evas_common_image_shutdown();
156} 155}
157 156
158static Eina_Bool 157static Eina_Bool
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index ddbbfdc2fa..2361226d09 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -596,8 +596,7 @@ eng_output_free(void *data)
596 free(re); 596 free(re);
597 } 597 }
598 598
599 evas_common_font_shutdown(); 599 evas_common_shutdown();
600 evas_common_image_shutdown();
601} 600}
602 601
603static Eina_Bool 602static Eina_Bool
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 596e696a38..3841211c14 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -750,8 +750,7 @@ eng_output_free(void *data)
750 if ((initted == EINA_TRUE) && (gl_wins == 0)) 750 if ((initted == EINA_TRUE) && (gl_wins == 0))
751 { 751 {
752 glsym_evas_gl_preload_shutdown(); 752 glsym_evas_gl_preload_shutdown();
753 evas_common_image_shutdown(); 753 evas_common_shutdown();
754 evas_common_font_shutdown();
755 initted = EINA_FALSE; 754 initted = EINA_FALSE;
756 } 755 }
757} 756}
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index e94e603501..21f4ef33b2 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -186,8 +186,7 @@ eng_output_free(void *data)
186 evas_render_engine_software_generic_clean(&re->generic); 186 evas_render_engine_software_generic_clean(&re->generic);
187 free(re); 187 free(re);
188 188
189 evas_common_font_shutdown(); 189 evas_common_shutdown();
190 evas_common_image_shutdown();
191} 190}
192 191
193static void 192static void