From fd8d727eeca76f76ccfa9f9a3580c73f77309545 Mon Sep 17 00:00:00 2001 From: zmike Date: Sat, 1 Feb 2014 14:32:07 -0500 Subject: [PATCH] simplify button creation --- src/bin/empc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/bin/empc.c b/src/bin/empc.c index 9906e52..110242a 100644 --- a/src/bin/empc.c +++ b/src/bin/empc.c @@ -512,7 +512,7 @@ empc_queue_list(void *d EINA_UNUSED, int t EINA_UNUSED, Empd_Empc_QueueList_Data } static Evas_Object * -button_add(const char *icon) +button_add(const char *icon, Evas_Smart_Cb cb) { Evas_Object *o, *ic; @@ -527,6 +527,7 @@ button_add(const char *icon) elm_object_part_content_set(o, "icon", ic); evas_object_show(ic); evas_object_show(o); + evas_object_smart_callback_add(o, "clicked", cb, NULL); return o; } @@ -804,21 +805,17 @@ main(int argc, char *argv[]) FILL(hbox); evas_object_show(hbox); - o = button_add("media_player/prev"); - evas_object_smart_callback_add(o, "clicked", control_skip_back, NULL); + o = button_add("media_player/prev", control_skip_back); elm_box_pack_end(hbox, o); - o = button_add("media_player/stop"); - evas_object_smart_callback_add(o, "clicked", control_stop, NULL); + o = button_add("media_player/stop", control_stop); elm_box_pack_end(hbox, o); - o = button_add("media_player/play"); + o = button_add("media_player/play", control_toggle); evas_object_data_set(win, "play_button", o); - evas_object_smart_callback_add(o, "clicked", control_toggle, NULL); elm_box_pack_end(hbox, o); - o = button_add("media_player/next"); - evas_object_smart_callback_add(o, "clicked", control_skip_forward, NULL); + o = button_add("media_player/next", control_skip_forward); elm_box_pack_end(hbox, o); elm_object_part_content_set(layout, EMPC_BASE_SWALLOW_CONTROLS, hbox);