summaryrefslogtreecommitdiff
path: root/src/bin/main.c
diff options
context:
space:
mode:
authorFlavio Ceolin <flavio.ceolin@gmail.com>2014-10-26 22:13:22 -0200
committerFlavio Ceolin <flavio.ceolin@gmail.com>2014-10-29 23:57:10 -0200
commit1324b2b07d36a5fed73837c769b0d3af57dff283 (patch)
tree3d67bb6bb9e240e597b3dc09b116f58bb5962665 /src/bin/main.c
parentd25435a066491ce2dd4d740313af3b4db817e450 (diff)
Using callbacks instead of Ecore_Events
Also the volume meter functionality was removed.
Diffstat (limited to 'src/bin/main.c')
-rw-r--r--src/bin/main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/bin/main.c b/src/bin/main.c
index 276a0d4..2077176 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -16,10 +16,6 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
16 EINA_SAFETY_ON_FALSE_RETURN_VAL(emixer_common_init("emixer"), EXIT_FAILURE); 16 EINA_SAFETY_ON_FALSE_RETURN_VAL(emixer_common_init("emixer"), EXIT_FAILURE);
17 EINA_SAFETY_ON_FALSE_RETURN_VAL(emix_init() == EINA_TRUE, EXIT_FAILURE); 17 EINA_SAFETY_ON_FALSE_RETURN_VAL(emix_init() == EINA_TRUE, EXIT_FAILURE);
18 18
19 win = main_window_add();
20 evas_object_resize(win, DEFAULT_WIDTH, DEFAULT_HEIGHT);
21 evas_object_show(win);
22
23 if (emix_backend_set("PULSEAUDIO") == EINA_FALSE) 19 if (emix_backend_set("PULSEAUDIO") == EINA_FALSE)
24 { 20 {
25 WRN("Could not load PULSEAUDIO, trying another one ..."); 21 WRN("Could not load PULSEAUDIO, trying another one ...");
@@ -37,9 +33,15 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
37 else 33 else
38 backend_loaded = EINA_TRUE; 34 backend_loaded = EINA_TRUE;
39 35
40 if (backend_loaded) 36 if (!backend_loaded)
41 elm_run(); 37 goto end;
38
39 win = main_window_add();
40 evas_object_resize(win, DEFAULT_WIDTH, DEFAULT_HEIGHT);
41 evas_object_show(win);
42 elm_run();
42 43
44end:
43 emixer_common_shutdown(); 45 emixer_common_shutdown();
44 emix_shutdown(); 46 emix_shutdown();
45 return 0; 47 return 0;