summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-03 20:23:26 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-03 20:23:26 +0900
commit21ba1c0dde5dd68403afcc52ee97c5ebaec2b374 (patch)
tree5f242c348fd6f23f10fea980b60b95006388398e
parent37fd08acb6aed168f26eff64c62071a6c36ba731 (diff)
meaningless changes
-rw-r--r--font_effect_ui.includes8
-rw-r--r--main.c17
2 files changed, 24 insertions, 1 deletions
diff --git a/font_effect_ui.includes b/font_effect_ui.includes
index cd70cdb..f7348a8 100644
--- a/font_effect_ui.includes
+++ b/font_effect_ui.includes
@@ -6,3 +6,11 @@
6/home/jpeg/e/core/efl/src/lib/eio 6/home/jpeg/e/core/efl/src/lib/eio
7/home/jpeg/e/core/efl/src/lib/eo 7/home/jpeg/e/core/efl/src/lib/eo
8/home/jpeg/e/core/elementary/src/lib 8/home/jpeg/e/core/elementary/src/lib
9/home/jpeg/e/core/efl/build/src/lib/evas
10/home/jpeg/e/core/efl/build/src/lib/eina
11/home/jpeg/e/core/efl/build/src/lib/ecore
12/home/jpeg/e/core/efl/build/src/lib/edje
13/home/jpeg/e/core/efl/build/src/lib/efl/build
14/home/jpeg/e/core/efl/build/src/lib/eio
15/home/jpeg/e/core/efl/build/src/lib/eo
16/home/jpeg/e/core/elementary/build/src/lib
diff --git a/main.c b/main.c
index 275d71e..814a25e 100644
--- a/main.c
+++ b/main.c
@@ -63,6 +63,17 @@ static void _textblock_proxies_bind(void);
63static char *_absolute_path_get(const char *path); 63static char *_absolute_path_get(const char *path);
64static const char *_relative_path_get(const char *path); 64static const char *_relative_path_get(const char *path);
65 65
66#ifdef EO_BASE_EVENT_ANY
67static Eina_Bool
68_win_any_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
69 Eo_Event_Description *desc, void *info)
70{
71 printf("event: %s (info %p)\n", desc->name, info);
72 fflush(stdout);
73 return EO_CALLBACK_CONTINUE;
74}
75#endif
76
66static void 77static void
67_spacer_add(Eo *box) 78_spacer_add(Eo *box)
68{ 79{
@@ -157,7 +168,7 @@ _video_set(const char *path)
157 evas_object_show(proxypreviews[VIDEO_PROXY_ID]); 168 evas_object_show(proxypreviews[VIDEO_PROXY_ID]);
158 evas_object_hide(fsbuttons[VIDEO_PROXY_ID]); 169 evas_object_hide(fsbuttons[VIDEO_PROXY_ID]);
159 170
160 elm_video_audio_mute_set(emotion_video, EINA_FALSE); 171 elm_video_audio_mute_set(emotion_video, EINA_TRUE);
161 Evas_Object *emotion = elm_video_emotion_get(emotion_video); 172 Evas_Object *emotion = elm_video_emotion_get(emotion_video);
162 emotion_object_keep_aspect_set(emotion, EINA_FALSE); 173 emotion_object_keep_aspect_set(emotion, EINA_FALSE);
163 evas_object_smart_callback_add(emotion, "playback_started", 174 evas_object_smart_callback_add(emotion, "playback_started",
@@ -1289,6 +1300,10 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
1289 // Apply default style 1300 // Apply default style
1290 _style_apply(); 1301 _style_apply();
1291 1302
1303#ifdef EO_BASE_EVENT_ANY
1304 eo_do(win, eo_event_callback_add(EO_BASE_EVENT_ANY, _win_any_cb, NULL));
1305#endif
1306
1292 //elm_win_alpha_set(win, 1); 1307 //elm_win_alpha_set(win, 1);
1293 evas_object_resize(win, WIDTH, HEIGHT); 1308 evas_object_resize(win, WIDTH, HEIGHT);
1294 evas_object_show(win); 1309 evas_object_show(win);