summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-03 20:24:52 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-03 20:24:52 +0900
commit9db673784c7534cfce8b844ac26f1114db4b1b3a (patch)
treea9c1f78d81588122306e1da6b6676801edde65c1
parent21ba1c0dde5dd68403afcc52ee97c5ebaec2b374 (diff)
migrate to eo4
-rw-r--r--main.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/main.c b/main.c
index 814a25e..6332521 100644
--- a/main.c
+++ b/main.c
@@ -122,8 +122,8 @@ _image_set(int k, const char *path)
122 122
123 char buf[32]; 123 char buf[32];
124 sprintf(buf, "image%d", k + 1); 124 sprintf(buf, "image%d", k + 1);
125 eo_do(textview, efl_gfx_filter_source_set(buf, source)); 125 efl_gfx_filter_source_set(textview, buf, source);
126 eo_do(imageview, efl_gfx_filter_source_set(buf, source)); 126 efl_gfx_filter_source_set(imageview, buf, source);
127 127
128 _textblock_proxies_bind(); 128 _textblock_proxies_bind();
129} 129}
@@ -139,12 +139,10 @@ _emotion_started_cb(void *data EINA_UNUSED,
139 evas_object_resize(emotion_video, w, h); 139 evas_object_resize(emotion_video, w, h);
140 140
141 // booh 141 // booh
142 eo_do(textview, 142 efl_gfx_filter_source_set(textview, "emotion", NULL);
143 efl_gfx_filter_source_set("emotion", NULL), 143 efl_gfx_filter_source_set(textview, "emotion", emotion_video);
144 efl_gfx_filter_source_set("emotion", emotion_video)); 144 efl_gfx_filter_source_set(imageview, "emotion", NULL);
145 eo_do(imageview, 145 efl_gfx_filter_source_set(imageview, "emotion", emotion_video);
146 efl_gfx_filter_source_set("emotion", NULL),
147 efl_gfx_filter_source_set("emotion", emotion_video));
148} 146}
149 147
150static void 148static void
@@ -185,8 +183,8 @@ _video_set(const char *path)
185 evas_object_show(fsbuttons[VIDEO_PROXY_ID]); 183 evas_object_show(fsbuttons[VIDEO_PROXY_ID]);
186 } 184 }
187 185
188 eo_do(textview, efl_gfx_filter_source_set("emotion", source)); 186 efl_gfx_filter_source_set(textview, "emotion", source);
189 eo_do(imageview, efl_gfx_filter_source_set("emotion", source)); 187 efl_gfx_filter_source_set(imageview, "emotion", source);
190} 188}
191 189
192#ifdef HAS_FILTER_CHAIN_TB 190#ifdef HAS_FILTER_CHAIN_TB
@@ -564,7 +562,7 @@ _textblock_proxies_bind(void)
564 { 562 {
565 char buf[32]; 563 char buf[32];
566 sprintf(buf, "image%d", k + 1); 564 sprintf(buf, "image%d", k + 1);
567 eo_do(tb, evas_obj_textblock_filter_source_set(buf, proxies[k])); 565 evas_obj_textblock_filter_source_set(tb, buf, proxies[k]);
568 } 566 }
569#endif 567#endif
570} 568}
@@ -588,10 +586,10 @@ _style_apply(void)
588 586
589 // Evas Text and Image 587 // Evas Text and Image
590#ifdef HAS_FILTER_CHAIN_TXT 588#ifdef HAS_FILTER_CHAIN_TXT
591 eo_do(textview, efl_gfx_filter_program_set(stylestr_utf8, "textview")); 589 efl_gfx_filter_program_set(textview, stylestr_utf8, "textview");
592#endif 590#endif
593#ifdef HAS_FILTER_CHAIN_IMG 591#ifdef HAS_FILTER_CHAIN_IMG
594 eo_do(imageview, efl_gfx_filter_program_set(stylestr_utf8, "imageview")); 592 efl_gfx_filter_program_set(imageview, stylestr_utf8, "imageview");
595#endif 593#endif
596 for (int k = 0; k < IMAGE_COUNT; k++) 594 for (int k = 0; k < IMAGE_COUNT; k++)
597 { 595 {
@@ -601,10 +599,10 @@ _style_apply(void)
601 sprintf(buf, "image%d", k + 1); 599 sprintf(buf, "image%d", k + 1);
602 elm_image_file_get(proxyimages[k], &path, NULL); 600 elm_image_file_get(proxyimages[k], &path, NULL);
603#ifdef HAS_FILTER_CHAIN_TXT 601#ifdef HAS_FILTER_CHAIN_TXT
604 eo_do(textview, efl_gfx_filter_source_set(buf, (path && *path) ? proxies[k] : NULL)); 602 efl_gfx_filter_source_set(textview, buf, (path && *path) ? proxies[k] : NULL);
605#endif 603#endif
606#ifdef HAS_FILTER_CHAIN_IMG 604#ifdef HAS_FILTER_CHAIN_IMG
607 eo_do(imageview, efl_gfx_filter_source_set(buf, (path && *path) ? proxies[k] : NULL)); 605 efl_gfx_filter_source_set(imageview, buf, (path && *path) ? proxies[k] : NULL);
608#endif 606#endif
609 } 607 }
610 608
@@ -1101,7 +1099,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
1101 evas_object_image_source_set(o, emotion_video); 1099 evas_object_image_source_set(o, emotion_video);
1102 evas_object_image_source_visible_set(o, EINA_FALSE); 1100 evas_object_image_source_visible_set(o, EINA_FALSE);
1103 evas_object_image_source_clip_set(o, 0); 1101 evas_object_image_source_clip_set(o, 0);
1104 //eo_do(o, evas_obj_no_render_set(1)); 1102 //evas_obj_no_render_set(o, 1);
1105 elm_table_pack(tbl, o, 0, 0, 1, 1); 1103 elm_table_pack(tbl, o, 0, 0, 1, 1);
1106 evas_object_show(o); 1104 evas_object_show(o);
1107 proxypreviews[VIDEO_PROXY_ID] = o; 1105 proxypreviews[VIDEO_PROXY_ID] = o;
@@ -1301,7 +1299,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
1301 _style_apply(); 1299 _style_apply();
1302 1300
1303#ifdef EO_BASE_EVENT_ANY 1301#ifdef EO_BASE_EVENT_ANY
1304 eo_do(win, eo_event_callback_add(EO_BASE_EVENT_ANY, _win_any_cb, NULL)); 1302 eo_event_callback_add(win, EO_BASE_EVENT_ANY, _win_any_cb, NULL);
1305#endif 1303#endif
1306 1304
1307 //elm_win_alpha_set(win, 1); 1305 //elm_win_alpha_set(win, 1);