From 809774ad8650af1948b3c52d3e7761acb5fc7ad8 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Sun, 3 Mar 2013 11:03:50 +0000 Subject: [PATCH] mpdule: ecrustify + code cleanup SVN revision: 84404 --- src/e_mod_main.c | 1233 +++++++++++++++++++++++----------------------- 1 file changed, 606 insertions(+), 627 deletions(-) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 4edb5c8..9bbdcb6 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -15,35 +15,35 @@ #define MAX_SONG_LENGTH 255 /* Func Proto Requirements for Gadcon */ -static E_Gadcon_Client *_gc_init (E_Gadcon * gc, const char *name, - const char *id, const char *style); -static void _gc_shutdown (E_Gadcon_Client * gcc); -static void _gc_orient (E_Gadcon_Client * gcc, E_Gadcon_Orient orient); -static const char *_gc_label (const E_Gadcon_Client_Class *client_class); -static Evas_Object *_gc_icon (const E_Gadcon_Client_Class *client_class, Evas * evas); -static const char *_gc_id_new (const E_Gadcon_Client_Class *client_class); +static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, + const char *id, const char *style); +static void _gc_shutdown(E_Gadcon_Client *gcc); +static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); +static const char *_gc_label(const E_Gadcon_Client_Class *client_class); +static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas); +static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class); /* Module Protos */ -static void _mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, - void *event_info); -static void _mpdule_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, - void *event_info); -static void _mpdule_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, - void *event_info); -static void _mpdule_menu_cb_configure (void *data, E_Menu * m, - E_Menu_Item * mi); -static void _mpdule_menu_cb_post (void *data, E_Menu * m); -static void _mpdule_cb_play (void *data, Evas_Object * obj, - const char *emission, const char *source); -static void _mpdule_cb_stop (void *data, Evas_Object * obj, - const char *emission, const char *source); -static void _mpdule_cb_pause (void *data, Evas_Object * obj, - const char *emission, const char *source); -static void _mpdule_cb_next (void *data, Evas_Object * obj, - const char *emission, const char *source); -static void _mpdule_cb_previous (void *data, Evas_Object * obj, - const char *emission, const char *source); -static Config_Item *_mpdule_config_item_get (const char *id); +static void _mpdule_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, + void *event_info); +static void _mpdule_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, + void *event_info); +static void _mpdule_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, + void *event_info); +static void _mpdule_menu_cb_configure(void *data, E_Menu *m, + E_Menu_Item *mi); +static void _mpdule_menu_cb_post(void *data, E_Menu *m); +static void _mpdule_cb_play(void *data, Evas_Object *obj, + const char *emission, const char *source); +static void _mpdule_cb_stop(void *data, Evas_Object *obj, + const char *emission, const char *source); +static void _mpdule_cb_pause(void *data, Evas_Object *obj, + const char *emission, const char *source); +static void _mpdule_cb_next(void *data, Evas_Object *obj, + const char *emission, const char *source); +static void _mpdule_cb_previous(void *data, Evas_Object *obj, + const char *emission, const char *source); +static Config_Item *_mpdule_config_item_get(const char *id); static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_item_edd = NULL; @@ -52,775 +52,754 @@ Config *mpdule_config = NULL; /* Define the class and gadcon functions this module provides */ static const E_Gadcon_Client_Class _gc_class = { - GADCON_CLIENT_CLASS_VERSION, - "mpdule", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, - _gc_id_new, NULL, e_gadcon_site_is_not_toolbar}, - E_GADCON_CLIENT_STYLE_PLAIN + GADCON_CLIENT_CLASS_VERSION, + "mpdule", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, + _gc_id_new, NULL, e_gadcon_site_is_not_toolbar}, + E_GADCON_CLIENT_STYLE_PLAIN }; typedef struct _Instance Instance; struct _Instance { - E_Gadcon_Client *gcc; - Evas_Object *mpdule; - Evas_Object *o_popup; - mpd_Connection *mpd; - Ecore_Timer *update_timer; - Config_Item *ci; - E_Gadcon_Popup *popup; + E_Gadcon_Client *gcc; + Evas_Object *mpdule; + Evas_Object *o_popup; + mpd_Connection *mpd; + Ecore_Timer *update_timer; + Config_Item *ci; + E_Gadcon_Popup *popup; }; - -static void _mpdule_connect (Instance * inst); -static void _mpdule_disconnect (Instance * inst); -static void _mpdule_update_song (Instance * inst); -static Eina_Bool _mpdule_update_song_cb (void *data); -static void _mpdule_popup_destroy (Instance * inst); -static void _mpdule_popup_create (Instance * inst, const char *dir); +static void _mpdule_connect(Instance *inst); +static void _mpdule_disconnect(Instance *inst); +static void _mpdule_update_song(Instance *inst); +static Eina_Bool _mpdule_update_song_cb(void *data); +static void _mpdule_popup_destroy(Instance *inst); +static void _mpdule_popup_create(Instance *inst, const char *dir); static E_Gadcon_Client * -_gc_init (E_Gadcon * gc, const char *name, const char *id, const char *style) +_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) { - Evas_Object *o; - E_Gadcon_Client *gcc; - Evas *evas; - Instance *inst; - char buf[4096]; + Evas_Object *o; + E_Gadcon_Client *gcc; + Evas *evas; + Instance *inst; + char buf[4096]; - inst = E_NEW (Instance, 1); + inst = E_NEW(Instance, 1); - inst->ci = _mpdule_config_item_get (id); - if (!inst->ci->id) - inst->ci->id = eina_stringshare_add (id); + inst->ci = _mpdule_config_item_get(id); + if (!inst->ci->id) + inst->ci->id = eina_stringshare_add(id); - o = edje_object_add (gc->evas); - snprintf (buf, sizeof (buf), "%s/mpdule.edj", - e_module_dir_get (mpdule_config->module)); - if (!e_theme_edje_object_set - (o, "base/theme/modules/mpdule", "modules/mpdule/main")) - edje_object_file_set (o, buf, "modules/mpdule/main"); - evas_object_show (o); + o = edje_object_add(gc->evas); + snprintf(buf, sizeof(buf), "%s/mpdule.edj", + e_module_dir_get(mpdule_config->module)); + if (!e_theme_edje_object_set + (o, "base/theme/modules/mpdule", "modules/mpdule/main")) + edje_object_file_set(o, buf, "modules/mpdule/main"); + evas_object_show(o); - gcc = e_gadcon_client_new (gc, name, id, style, o); - gcc->data = inst; - inst->gcc = gcc; - inst->mpdule = o; + gcc = e_gadcon_client_new(gc, name, id, style, o); + gcc->data = inst; + inst->gcc = gcc; + inst->mpdule = o; - _mpdule_popup_create(inst, buf); + _mpdule_popup_create(inst, buf); - evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, - _mpdule_cb_mouse_down, inst); - evas_object_event_callback_add (inst->mpdule, EVAS_CALLBACK_MOUSE_IN, - _mpdule_cb_mouse_in, inst); - evas_object_event_callback_add (inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, - _mpdule_cb_mouse_out, inst); - edje_object_signal_callback_add (o, "mpdule,play", "", _mpdule_cb_play, - inst); - edje_object_signal_callback_add (o, "mpdule,stop", "", _mpdule_cb_stop, - inst); - edje_object_signal_callback_add (o, "mpdule,pause", "", _mpdule_cb_pause, - inst); - edje_object_signal_callback_add (o, "mpdule,next", "", _mpdule_cb_next, - inst); - edje_object_signal_callback_add (o, "mpdule,previous", "", - _mpdule_cb_previous, inst); - _mpdule_connect (inst); - _mpdule_update_song (inst); - inst->update_timer = ecore_timer_add (inst->ci->poll_time, - _mpdule_update_song_cb, inst); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, + _mpdule_cb_mouse_down, inst); + evas_object_event_callback_add(inst->mpdule, EVAS_CALLBACK_MOUSE_IN, + _mpdule_cb_mouse_in, inst); + evas_object_event_callback_add(inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, + _mpdule_cb_mouse_out, inst); + edje_object_signal_callback_add(o, "mpdule,play", "", _mpdule_cb_play, + inst); + edje_object_signal_callback_add(o, "mpdule,stop", "", _mpdule_cb_stop, + inst); + edje_object_signal_callback_add(o, "mpdule,pause", "", _mpdule_cb_pause, + inst); + edje_object_signal_callback_add(o, "mpdule,next", "", _mpdule_cb_next, + inst); + edje_object_signal_callback_add(o, "mpdule,previous", "", + _mpdule_cb_previous, inst); + _mpdule_connect(inst); + _mpdule_update_song(inst); + inst->update_timer = ecore_timer_add(inst->ci->poll_time, + _mpdule_update_song_cb, inst); - mpdule_config->instances = - eina_list_append (mpdule_config->instances, inst); - return gcc; + mpdule_config->instances = + eina_list_append(mpdule_config->instances, inst); + return gcc; } static void -_gc_shutdown (E_Gadcon_Client * gcc) +_gc_shutdown(E_Gadcon_Client *gcc) { - Instance *inst; + Instance *inst; - inst = gcc->data; - if (inst->update_timer) - ecore_timer_del (inst->update_timer); - _mpdule_disconnect (inst); - mpdule_config->instances = - eina_list_remove (mpdule_config->instances, inst); + inst = gcc->data; + if (inst->update_timer) + ecore_timer_del(inst->update_timer); + _mpdule_disconnect(inst); + mpdule_config->instances = + eina_list_remove(mpdule_config->instances, inst); - evas_object_event_callback_del (inst->mpdule, EVAS_CALLBACK_MOUSE_DOWN, - _mpdule_cb_mouse_down); - evas_object_event_callback_del (inst->mpdule, EVAS_CALLBACK_MOUSE_IN, - _mpdule_cb_mouse_in); - evas_object_event_callback_del (inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, - _mpdule_cb_mouse_out); - _mpdule_popup_destroy (inst); - evas_object_del (inst->mpdule); - free (inst); - inst = NULL; + evas_object_event_callback_del(inst->mpdule, EVAS_CALLBACK_MOUSE_DOWN, + _mpdule_cb_mouse_down); + evas_object_event_callback_del(inst->mpdule, EVAS_CALLBACK_MOUSE_IN, + _mpdule_cb_mouse_in); + evas_object_event_callback_del(inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, + _mpdule_cb_mouse_out); + _mpdule_popup_destroy(inst); + evas_object_del(inst->mpdule); + free(inst); + gcc->data = NULL; } static void -_gc_orient (E_Gadcon_Client * gcc, E_Gadcon_Orient orient) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { - Instance *inst; - Evas_Coord mw, mh; + Instance *inst; + Evas_Coord mw, mh; - inst = gcc->data; - edje_object_size_min_calc (inst->mpdule, &mw, &mh); - e_gadcon_client_min_size_set (gcc, mw, mh); + inst = gcc->data; + edje_object_size_min_calc(inst->mpdule, &mw, &mh); + e_gadcon_client_min_size_set(gcc, mw, mh); } static const char * -_gc_label (const E_Gadcon_Client_Class *client_class) +_gc_label(const E_Gadcon_Client_Class *client_class) { - return D_ ("MPDule"); + return D_("MPDule"); } static Evas_Object * -_gc_icon (const E_Gadcon_Client_Class *client_class, Evas * evas) +_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas) { - Evas_Object *o; - char buf[4096]; + Evas_Object *o; + char buf[4096]; - o = edje_object_add (evas); - snprintf (buf, sizeof (buf), "%s/e-module-mpdule.edj", - e_module_dir_get (mpdule_config->module)); - edje_object_file_set (o, buf, "icon"); - return o; + o = edje_object_add(evas); + snprintf(buf, sizeof(buf), "%s/e-module-mpdule.edj", + e_module_dir_get(mpdule_config->module)); + edje_object_file_set(o, buf, "icon"); + return o; } static const char * -_gc_id_new (const E_Gadcon_Client_Class *client_class) +_gc_id_new(const E_Gadcon_Client_Class *client_class) { - Config_Item *ci; - - ci = _mpdule_config_item_get (NULL); - return ci->id; + Config_Item *ci = _mpdule_config_item_get(NULL); + return ci->id; } static void -_mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, - void *event_info) +_mpdule_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, + void *event_info) { - Instance *inst; - Evas_Event_Mouse_Down *ev; + Evas_Event_Mouse_Down *ev = event_info; - inst = data; - ev = event_info; - if ((ev->button == 3) && (!mpdule_config->menu)) - { - E_Menu *m; - E_Menu_Item *mi; - int x, y, w, h; + if ((ev->button == 3) && (!mpdule_config->menu)) + { + E_Menu *m; + E_Menu_Item *mi; + int x, y, w, h; + Instance *inst = data; - m = e_menu_new (); - mi = e_menu_item_new (m); - e_menu_item_label_set (mi, D_ ("Settings")); - e_util_menu_item_theme_icon_set(mi, "preferences-system"); - e_menu_item_callback_set (mi, _mpdule_menu_cb_configure, inst); + m = e_menu_new(); + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, D_("Settings")); + e_util_menu_item_theme_icon_set(mi, "preferences-system"); + e_menu_item_callback_set(mi, _mpdule_menu_cb_configure, inst); - m = e_gadcon_client_util_menu_items_append (inst->gcc, m, 0); - e_menu_post_deactivate_callback_set (m, _mpdule_menu_cb_post, inst); - mpdule_config->menu = m; + m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); + e_menu_post_deactivate_callback_set(m, _mpdule_menu_cb_post, inst); + mpdule_config->menu = m; - e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h); - e_menu_activate_mouse (m, - e_util_zone_current_get (e_manager_current_get - ()), x + ev->output.x, - y + ev->output.y, 1, 1, - E_MENU_POP_DIRECTION_DOWN, ev->timestamp); - evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, - EVAS_BUTTON_NONE, ev->timestamp, NULL); - } - else if (ev->button == 1) - { - //e_gadcon_popup_toggle_pinned(inst->popup); - } -} - - -static void -_mpdule_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, - void *event_info) -{ - Instance *inst; - E_Gadcon_Popup *popup; - - if ((!(inst = data)) || (!inst->ci->show_popup)) - return; - popup = inst->popup; - e_gadcon_popup_show (inst->popup); + e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h); + e_menu_activate_mouse(m, + e_util_zone_current_get(e_manager_current_get()), + x + ev->output.x, + y + ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, + EVAS_BUTTON_NONE, ev->timestamp, NULL); + } + else if (ev->button == 1) + { + //e_gadcon_popup_toggle_pinned(inst->popup); + } } static void -_mpdule_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, - void *event_info) +_mpdule_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, + void *event_info) { - Instance *inst; - E_Gadcon_Popup *popup; + Instance *inst = data; - if ((!(inst = data)) || ((!inst->ci->show_popup) && (inst->popup))) - return; - popup = inst->popup; - e_gadcon_popup_hide (inst->popup); + if ((!inst) || (!inst->ci->show_popup)) + return; + e_gadcon_popup_show(inst->popup); } static void -_mpdule_menu_cb_post (void *data, E_Menu * m) +_mpdule_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, + void *event_info) { - if (!mpdule_config->menu) - return; - e_object_del (E_OBJECT (mpdule_config->menu)); - mpdule_config->menu = NULL; + Instance *inst = data; + + if ((!inst) || ((!inst->ci->show_popup) && (inst->popup))) + return; + e_gadcon_popup_hide(inst->popup); } static void -_mpdule_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi) +_mpdule_menu_cb_post(void *data, E_Menu *m) { - Instance *inst; + if (!mpdule_config->menu) + return; + e_object_del(E_OBJECT(mpdule_config->menu)); + mpdule_config->menu = NULL; +} - inst = data; - _config_mpdule_module (inst->ci); +static void +_mpdule_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) +{ + Instance *inst = data; + _config_mpdule_module(inst->ci); } void -_mpdule_config_updated (Config_Item * ci) +_mpdule_config_updated(Config_Item *ci) { - Eina_List *l; + Eina_List *l; - if (!mpdule_config) - return; - for (l = mpdule_config->instances; l; l = l->next) - { - Instance *inst; + if (!mpdule_config) + return; + for (l = mpdule_config->instances; l; l = l->next) + { + Instance *inst; - inst = l->data; - if (inst->ci != ci) - continue; - _mpdule_disconnect (inst); - _mpdule_connect (inst); - _mpdule_update_song (inst); - if (inst->update_timer) - ecore_timer_interval_set (inst->update_timer, ci->poll_time); - else - inst->update_timer = - ecore_timer_add (ci->poll_time, _mpdule_update_song_cb, - inst); - if (inst->ci->show_popup) - { - if (!inst->popup) - { - _mpdule_popup_create(inst, NULL); - } - } - else - { - if (inst->popup) - { - _mpdule_popup_destroy(inst); - } - if (inst->o_popup) - { - evas_object_del(inst->o_popup); - } - } - break; - } + inst = l->data; + if (inst->ci != ci) + continue; + _mpdule_disconnect(inst); + _mpdule_connect(inst); + _mpdule_update_song(inst); + if (inst->update_timer) + ecore_timer_interval_set(inst->update_timer, ci->poll_time); + else + inst->update_timer = + ecore_timer_add(ci->poll_time, _mpdule_update_song_cb, + inst); + if (inst->ci->show_popup) + { + if (!inst->popup) + { + _mpdule_popup_create(inst, NULL); + } + } + else + { + _mpdule_popup_destroy(inst); + } + break; + } } static void -_mpdule_cb_play (void *data, Evas_Object * obj, const char *emission, - const char *source) +_mpdule_cb_play(void *data, Evas_Object *obj, const char *emission, + const char *source) { - Instance *inst; - mpd_Connection *mpd; + Instance *inst = data; + mpd_Connection *mpd; - inst = data; - mpd = inst->mpd; - mpd_sendPlayCommand (mpd, -1); + mpd = inst->mpd; + mpd_sendPlayCommand(mpd, -1); } static void -_mpdule_cb_previous (void *data, Evas_Object * obj, const char *emission, - const char *source) +_mpdule_cb_previous(void *data, Evas_Object *obj, const char *emission, + const char *source) { - Instance *inst; - mpd_Connection *mpd; + Instance *inst = data; + mpd_Connection *mpd; - inst = data; - mpd = inst->mpd; - mpd_sendPrevCommand (mpd); + mpd = inst->mpd; + mpd_sendPrevCommand(mpd); } static void -_mpdule_cb_next (void *data, Evas_Object * obj, const char *emission, - const char *source) +_mpdule_cb_next(void *data, Evas_Object *obj, const char *emission, + const char *source) { - Instance *inst; - mpd_Connection *mpd; + Instance *inst = data; + mpd_Connection *mpd; - inst = data; - mpd = inst->mpd; - mpd_sendNextCommand (mpd); + mpd = inst->mpd; + mpd_sendNextCommand(mpd); } static void -_mpdule_cb_stop (void *data, Evas_Object * obj, const char *emission, - const char *source) +_mpdule_cb_stop(void *data, Evas_Object *obj, const char *emission, + const char *source) { - Instance *inst; - mpd_Connection *mpd; + Instance *inst = data; + mpd_Connection *mpd; - inst = data; - mpd = inst->mpd; - mpd_sendStopCommand (mpd); + mpd = inst->mpd; + mpd_sendStopCommand(mpd); } static void -_mpdule_cb_pause (void *data, Evas_Object * obj, const char *emission, - const char *source) +_mpdule_cb_pause(void *data, Evas_Object *obj, const char *emission, + const char *source) { - Instance *inst; - mpd_Connection *mpd; + Instance *inst = data; + mpd_Connection *mpd; - inst = data; - mpd = inst->mpd; - mpd_sendPauseCommand (mpd, 1); + mpd = inst->mpd; + mpd_sendPauseCommand(mpd, 1); } static Config_Item * -_mpdule_config_item_get (const char *id) +_mpdule_config_item_get(const char *id) { - Eina_List *l; - Config_Item *ci; - char buf[128]; + Eina_List *l; + Config_Item *ci; + char buf[128]; + if (!id) + { + int num = 0; - if (!id) - { - int num = 0; + /* Create id */ + if (mpdule_config->items) + { + const char *p; + ci = eina_list_last(mpdule_config->items)->data; + p = strrchr(ci->id, '.'); + if (p) + num = atoi(p + 1) + 1; + } + snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name, num); + id = buf; + } + else + { + for (l = mpdule_config->items; l; l = l->next) + { + ci = l->data; + if (!ci->id) + continue; + if (!strcmp(ci->id, id)) + return ci; + } + } - /* Create id */ - if (mpdule_config->items) - { - const char *p; - ci = eina_list_last (mpdule_config->items)->data; - p = strrchr (ci->id, '.'); - if (p) - num = atoi (p + 1) + 1; - } - snprintf (buf, sizeof (buf), "%s.%d", _gc_class.name, num); - id = buf; - } - else - { - for (l = mpdule_config->items; l; l = l->next) - { - ci = l->data; - if (!ci->id) - continue; - if (!strcmp (ci->id, id)) - return ci; - } - } + ci = E_NEW(Config_Item, 1); + ci->id = eina_stringshare_add(id); + ci->poll_time = 1.0; + ci->hostname = eina_stringshare_add("localhost"); + ci->port = 6600; + ci->show_popup = 1; - ci = E_NEW (Config_Item, 1); - ci->id = eina_stringshare_add (id); - ci->poll_time = 1.0; - ci->hostname = eina_stringshare_add ("localhost"); - ci->port = 6600; - ci->show_popup = 1; - - mpdule_config->items = eina_list_append (mpdule_config->items, ci); - return ci; + mpdule_config->items = eina_list_append(mpdule_config->items, ci); + return ci; } EAPI E_Module_Api e_modapi = { - E_MODULE_API_VERSION, - "MPDule" + E_MODULE_API_VERSION, + "MPDule" }; static void -_mpdule_connect (Instance * inst) +_mpdule_connect(Instance *inst) { - mpd_Connection *mpd; - Config_Item *ci; + mpd_Connection *mpd; + Config_Item *ci; - ci = inst->ci; - mpd = mpd_newConnection (ci->hostname, ci->port, 3.0); - inst->mpd = mpd; + ci = inst->ci; + mpd = mpd_newConnection(ci->hostname, ci->port, 3.0); + inst->mpd = mpd; } static void _mpdule_disconnect(Instance *inst) { - if (inst->mpd) - { - mpd_closeConnection(inst->mpd); - inst->mpd = NULL; - } + if (inst->mpd) + { + mpd_closeConnection(inst->mpd); + inst->mpd = NULL; + } } static Eina_Bool -_mpdule_update_song_cb (void *data) +_mpdule_update_song_cb(void *data) { - Instance *inst; + Instance *inst = data; - inst = data; - _mpdule_update_song (inst); - return EINA_TRUE; + _mpdule_update_song(inst); + return EINA_TRUE; } static void -_mpdule_update_song (Instance * inst) +_mpdule_update_song(Instance *inst) { - mpd_Connection *mpd; - Evas_Object *mpdule; - Evas_Object *o_popup; + mpd_Connection *mpd; + Evas_Object *mpdule; + Evas_Object *o_popup; - if (!inst->mpd) - return; - mpd = inst->mpd; - mpdule = inst->mpdule; - o_popup = inst->o_popup; - mpd_sendStatusCommand (mpd); - if (mpd->error == 0) - { - mpd_Status *status = mpd_getStatus (mpd); + if (!inst->mpd) + return; + mpd = inst->mpd; + mpdule = inst->mpdule; + o_popup = inst->o_popup; + mpd_sendStatusCommand(mpd); + if (mpd->error == 0) + { + mpd_Status *status = mpd_getStatus(mpd); - if (status) - { - if (status->state == MPD_STATUS_STATE_UNKNOWN) - { - edje_object_part_text_set (mpdule, "mpdule.status", - D_ ("Unknown")); - edje_object_part_text_set (o_popup, "mpdule.status", - D_ ("Unknown")); - } - else if (status->state == MPD_STATUS_STATE_STOP) - { - edje_object_part_text_set (mpdule, "mpdule.status", - D_ ("Stopped")); - edje_object_part_text_set (o_popup, "mpdule.status", - D_ ("Stopped")); - } - else if (status->state == MPD_STATUS_STATE_PLAY) - { - edje_object_part_text_set (mpdule, "mpdule.status", - D_ ("Playing")); - edje_object_part_text_set (o_popup, "mpdule.status", - D_ ("Playing")); - } - else if (status->state == MPD_STATUS_STATE_PAUSE) - { - edje_object_part_text_set (mpdule, "mpdule.status", - D_ ("Paused")); - edje_object_part_text_set (o_popup, "mpdule.status", - D_ ("Paused")); - } + if (status) + { + if (status->state == MPD_STATUS_STATE_UNKNOWN) + { + edje_object_part_text_set(mpdule, "mpdule.status", + D_("Unknown")); + edje_object_part_text_set(o_popup, "mpdule.status", + D_("Unknown")); + } + else if (status->state == MPD_STATUS_STATE_STOP) + { + edje_object_part_text_set(mpdule, "mpdule.status", + D_("Stopped")); + edje_object_part_text_set(o_popup, "mpdule.status", + D_("Stopped")); + } + else if (status->state == MPD_STATUS_STATE_PLAY) + { + edje_object_part_text_set(mpdule, "mpdule.status", + D_("Playing")); + edje_object_part_text_set(o_popup, "mpdule.status", + D_("Playing")); + } + else if (status->state == MPD_STATUS_STATE_PAUSE) + { + edje_object_part_text_set(mpdule, "mpdule.status", + D_("Paused")); + edje_object_part_text_set(o_popup, "mpdule.status", + D_("Paused")); + } - if (status->state > MPD_STATUS_STATE_STOP) - { - mpd_sendCurrentSongCommand (mpd); - mpd_InfoEntity *entity = NULL; + if (status->state > MPD_STATUS_STATE_STOP) + { + mpd_sendCurrentSongCommand(mpd); + mpd_InfoEntity *entity = NULL; - while ((entity = mpd_getNextInfoEntity (mpd))) - { - if (entity->type == MPD_INFO_ENTITY_TYPE_SONG && - entity->info.song->id == status->songid) - { - mpd_Song *song = entity->info.song; + while ((entity = mpd_getNextInfoEntity(mpd))) + { + if (entity->type == MPD_INFO_ENTITY_TYPE_SONG && + entity->info.song->id == status->songid) + { + mpd_Song *song = entity->info.song; - if (song->artist) - { - edje_object_part_text_set (mpdule, "mpdule.artist", - song->artist); - edje_object_part_text_set (o_popup, "mpdule.artist", - song->artist); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.artist", - ""); - edje_object_part_text_set (o_popup, "mpdule.artist", - ""); - } - if (song->title) - { - edje_object_part_text_set (mpdule, "mpdule.title", - song->title); - edje_object_part_text_set (o_popup, "mpdule.title", - song->title); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.title", - ""); - edje_object_part_text_set (o_popup, "mpdule.title", - ""); - } - if (song->album) - { - edje_object_part_text_set (mpdule, "mpdule.album", - song->album); - edje_object_part_text_set (o_popup, "mpdule.album", - song->album); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.album", - ""); - edje_object_part_text_set (o_popup, "mpdule.album", - ""); - } - if (song->track) - { - edje_object_part_text_set (mpdule, "mpdule.track", - song->track); - edje_object_part_text_set (o_popup, "mpdule.track", - song->track); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.track", - ""); - edje_object_part_text_set (o_popup, "mpdule.track", - ""); - } - if (song->date) - { - edje_object_part_text_set (mpdule, "mpdule.date", - song->date); - edje_object_part_text_set (o_popup, "mpdule.date", - song->date); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.date", - ""); - edje_object_part_text_set (o_popup, "mpdule.date", - ""); - } - if (song->genre) - { - edje_object_part_text_set (mpdule, "mpdule.genre", - song->genre); - edje_object_part_text_set (o_popup, "mpdule.genre", - song->genre); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.genre", - ""); - edje_object_part_text_set (o_popup, "mpdule.genre", - ""); - } - if (song->composer) - { - edje_object_part_text_set (mpdule, - "mpdule.composer", - song->composer); - edje_object_part_text_set (o_popup, - "mpdule.composer", - song->composer); - } - else - { - edje_object_part_text_set (mpdule, - "mpdule.composer", ""); - edje_object_part_text_set (o_popup, - "mpdule.composer", ""); - } - if (song->time) - { - //char * songtime; - //sprintf(songtime, "%i", song->time); - //edje_object_part_text_set (mpdule, "mpdule.time", songtime); - //edje_object_part_text_set (o_popup, "mpdule.time", songtime); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.time", - ""); - edje_object_part_text_set (o_popup, "mpdule.time", - ""); - } - if (song->file) - { - edje_object_part_text_set (mpdule, "mpdule.file", - song->file); - edje_object_part_text_set (o_popup, "mpdule.file", - song->file); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.file", - ""); - edje_object_part_text_set (o_popup, "mpdule.file", - ""); - } - } + if (song->artist) + { + edje_object_part_text_set(mpdule, "mpdule.artist", + song->artist); + edje_object_part_text_set(o_popup, "mpdule.artist", + song->artist); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.artist", + ""); + edje_object_part_text_set(o_popup, "mpdule.artist", + ""); + } + if (song->title) + { + edje_object_part_text_set(mpdule, "mpdule.title", + song->title); + edje_object_part_text_set(o_popup, "mpdule.title", + song->title); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.title", + ""); + edje_object_part_text_set(o_popup, "mpdule.title", + ""); + } + if (song->album) + { + edje_object_part_text_set(mpdule, "mpdule.album", + song->album); + edje_object_part_text_set(o_popup, "mpdule.album", + song->album); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.album", + ""); + edje_object_part_text_set(o_popup, "mpdule.album", + ""); + } + if (song->track) + { + edje_object_part_text_set(mpdule, "mpdule.track", + song->track); + edje_object_part_text_set(o_popup, "mpdule.track", + song->track); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.track", + ""); + edje_object_part_text_set(o_popup, "mpdule.track", + ""); + } + if (song->date) + { + edje_object_part_text_set(mpdule, "mpdule.date", + song->date); + edje_object_part_text_set(o_popup, "mpdule.date", + song->date); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.date", + ""); + edje_object_part_text_set(o_popup, "mpdule.date", + ""); + } + if (song->genre) + { + edje_object_part_text_set(mpdule, "mpdule.genre", + song->genre); + edje_object_part_text_set(o_popup, "mpdule.genre", + song->genre); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.genre", + ""); + edje_object_part_text_set(o_popup, "mpdule.genre", + ""); + } + if (song->composer) + { + edje_object_part_text_set(mpdule, + "mpdule.composer", + song->composer); + edje_object_part_text_set(o_popup, + "mpdule.composer", + song->composer); + } + else + { + edje_object_part_text_set(mpdule, + "mpdule.composer", ""); + edje_object_part_text_set(o_popup, + "mpdule.composer", ""); + } + if (song->time) + { + //char * songtime; + //sprintf(songtime, "%i", song->time); + //edje_object_part_text_set(mpdule, "mpdule.time", songtime); + //edje_object_part_text_set(o_popup, "mpdule.time", songtime); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.time", + ""); + edje_object_part_text_set(o_popup, "mpdule.time", + ""); + } + if (song->file) + { + edje_object_part_text_set(mpdule, "mpdule.file", + song->file); + edje_object_part_text_set(o_popup, "mpdule.file", + song->file); + } + else + { + edje_object_part_text_set(mpdule, "mpdule.file", + ""); + edje_object_part_text_set(o_popup, "mpdule.file", + ""); + } + } - mpd_freeInfoEntity (entity); - } - } + mpd_freeInfoEntity(entity); + } + } - mpd_freeStatus (status); - } - } - else - { - _mpdule_disconnect (inst); - _mpdule_connect (inst); - } + mpd_freeStatus(status); + } + } + else + { + _mpdule_disconnect(inst); + _mpdule_connect(inst); + } } EAPI void * -e_modapi_init (E_Module * m) +e_modapi_init(E_Module *m) { - char buf[4096]; + char buf[4096]; - snprintf (buf, sizeof (buf), "%s/locale", e_module_dir_get (m)); - bindtextdomain (PACKAGE, buf); - bind_textdomain_codeset (PACKAGE, "UTF-8"); + snprintf(buf, sizeof(buf), "%s/locale", e_module_dir_get(m)); + bindtextdomain(PACKAGE, buf); + bind_textdomain_codeset(PACKAGE, "UTF-8"); - conf_item_edd = E_CONFIG_DD_NEW ("MPDule_Config_Item", Config_Item); + conf_item_edd = E_CONFIG_DD_NEW("MPDule_Config_Item", Config_Item); #undef T #undef D #define T Config_Item #define D conf_item_edd - E_CONFIG_VAL (D, T, id, STR); - E_CONFIG_VAL (D, T, poll_time, DOUBLE); - E_CONFIG_VAL (D, T, hostname, STR); - E_CONFIG_VAL (D, T, port, INT); - E_CONFIG_VAL (D, T, show_popup, UCHAR); + E_CONFIG_VAL(D, T, id, STR); + E_CONFIG_VAL(D, T, poll_time, DOUBLE); + E_CONFIG_VAL(D, T, hostname, STR); + E_CONFIG_VAL(D, T, port, INT); + E_CONFIG_VAL(D, T, show_popup, UCHAR); - conf_edd = E_CONFIG_DD_NEW ("MPDule_Config", Config); + conf_edd = E_CONFIG_DD_NEW("MPDule_Config", Config); #undef T #undef D #define T Config #define D conf_edd - E_CONFIG_LIST (D, T, items, conf_item_edd); + E_CONFIG_LIST(D, T, items, conf_item_edd); - mpdule_config = e_config_domain_load ("module.mpdule", conf_edd); - if (!mpdule_config) - { - Config_Item *ci; + mpdule_config = e_config_domain_load("module.mpdule", conf_edd); + if (!mpdule_config) + { + Config_Item *ci; - mpdule_config = E_NEW (Config, 1); + mpdule_config = E_NEW(Config, 1); - ci = E_NEW (Config_Item, 1); - ci->id = eina_stringshare_add ("0"); - ci->poll_time = 1.0; - ci->hostname = eina_stringshare_add ("localhost"); - ci->port = 6600; - ci->show_popup = 1; + ci = E_NEW(Config_Item, 1); + ci->id = eina_stringshare_add("0"); + ci->poll_time = 1.0; + ci->hostname = eina_stringshare_add("localhost"); + ci->port = 6600; + ci->show_popup = 1; - mpdule_config->items = eina_list_append (mpdule_config->items, ci); - } - mpdule_config->module = m; + mpdule_config->items = eina_list_append(mpdule_config->items, ci); + } + mpdule_config->module = m; - e_gadcon_provider_register (&_gc_class); - return m; + e_gadcon_provider_register(&_gc_class); + return m; } EAPI int -e_modapi_shutdown (E_Module * m) +e_modapi_shutdown(E_Module *m) { - mpdule_config->module = NULL; - e_gadcon_provider_unregister (&_gc_class); + mpdule_config->module = NULL; + e_gadcon_provider_unregister(&_gc_class); - if (mpdule_config->config_dialog) - e_object_del (E_OBJECT (mpdule_config->config_dialog)); - if (mpdule_config->menu) - { - e_menu_post_deactivate_callback_set (mpdule_config->menu, NULL, NULL); - e_object_del (E_OBJECT (mpdule_config->menu)); - mpdule_config->menu = NULL; - } + if (mpdule_config->config_dialog) + e_object_del(E_OBJECT(mpdule_config->config_dialog)); + if (mpdule_config->menu) + { + e_menu_post_deactivate_callback_set(mpdule_config->menu, NULL, NULL); + e_object_del(E_OBJECT(mpdule_config->menu)); + mpdule_config->menu = NULL; + } - while (mpdule_config->items) - { - Config_Item *ci; + while (mpdule_config->items) + { + Config_Item *ci; - ci = mpdule_config->items->data; - mpdule_config->items = - eina_list_remove_list (mpdule_config->items, mpdule_config->items); - if (ci->id) - eina_stringshare_del (ci->id); - free (ci); - ci = NULL; - } + ci = mpdule_config->items->data; + mpdule_config->items = + eina_list_remove_list(mpdule_config->items, mpdule_config->items); + if (ci->id) + eina_stringshare_del(ci->id); + free(ci); + } - free (mpdule_config); - mpdule_config = NULL; - E_CONFIG_DD_FREE (conf_item_edd); - E_CONFIG_DD_FREE (conf_edd); - return 1; + free(mpdule_config); + mpdule_config = NULL; + E_CONFIG_DD_FREE(conf_item_edd); + E_CONFIG_DD_FREE(conf_edd); + return 1; } EAPI int -e_modapi_save (E_Module * m) +e_modapi_save(E_Module *m) { - e_config_domain_save ("module.mpdule", conf_edd, mpdule_config); - return 1; + e_config_domain_save("module.mpdule", conf_edd, mpdule_config); + return 1; } static void -_mpdule_popup_destroy (Instance * inst) +_mpdule_popup_destroy(Instance *inst) { - if (!inst->popup) - return; - e_object_del (E_OBJECT (inst->popup)); + if (inst->popup) + { + e_object_del(E_OBJECT(inst->popup)); + inst->popup = NULL; + } + if (inst->o_popup) + { + evas_object_del(inst->o_popup); + inst->o_popup = NULL; + } } static void -_mpdule_popup_create (Instance * inst, const char *dir) +_mpdule_popup_create(Instance *inst, const char *dir) { - Evas *evas; - Evas_Object *o_popup; - char buf[4096]; - - if (inst->ci->show_popup) - { - inst->popup = e_gadcon_popup_new (inst->gcc); - evas = inst->popup->win->evas; - o_popup = edje_object_add (evas); - if (!e_theme_edje_object_set - (o_popup, "base/theme/modules/mpdule", "modules/mpdule/popup")) - { - if (dir) - { - edje_object_file_set (o_popup, dir, "modules/mpdule/popup"); - } - else - { - snprintf(buf, sizeof(buf), "%s/mpdule.edj", - e_module_dir_get(mpdule_config->module)); - edje_object_file_set(o_popup, buf, "modules/mpdule/popup"); - } - } - edje_object_part_text_set(o_popup, "mpdule.artist_label", D_("Artist:")); - edje_object_part_text_set(o_popup, "mpdule.title_label", D_("Title:")); - edje_object_part_text_set(o_popup, "mpdule.album_label", D_("Album:")); - edje_object_part_text_set(o_popup, "mpdule.genre_label", D_("Genre:")); - evas_object_show (o_popup); - e_gadcon_popup_content_set (inst->popup, o_popup); - edje_object_size_min_calc (o_popup, NULL, NULL); - inst->o_popup = o_popup; - edje_object_signal_callback_add (o_popup, "mpdule,play", "", - _mpdule_cb_play, inst); - edje_object_signal_callback_add (o_popup, "mpdule,stop", "", - _mpdule_cb_stop, inst); - edje_object_signal_callback_add (o_popup, "mpdule,pause", "", - _mpdule_cb_pause, inst); - edje_object_signal_callback_add (o_popup, "mpdule,next", "", - _mpdule_cb_next, inst); - edje_object_signal_callback_add (o_popup, "mpdule,previous", "", - _mpdule_cb_previous, inst); - } - else - { - inst->popup = NULL; - inst->o_popup = NULL; - } + _mpdule_popup_destroy(inst); + + if (inst->ci->show_popup) + { + Evas *evas; + Evas_Object *o_popup; + + inst->popup = e_gadcon_popup_new(inst->gcc); + evas = inst->popup->win->evas; + ERR("evas:%p", evas); + o_popup = edje_object_add(evas); + if (!e_theme_edje_object_set + (o_popup, "base/theme/modules/mpdule", "modules/mpdule/popup")) + { + if (dir) + { + edje_object_file_set(o_popup, dir, "modules/mpdule/popup"); + } + else + { + char buf[4096]; + + snprintf(buf, sizeof(buf), "%s/mpdule.edj", + e_module_dir_get(mpdule_config->module)); + edje_object_file_set(o_popup, buf, "modules/mpdule/popup"); + } + } + edje_object_part_text_set(o_popup, "mpdule.artist_label", D_("Artist:")); + edje_object_part_text_set(o_popup, "mpdule.title_label", D_("Title:")); + edje_object_part_text_set(o_popup, "mpdule.album_label", D_("Album:")); + edje_object_part_text_set(o_popup, "mpdule.genre_label", D_("Genre:")); + evas_object_show(o_popup); + e_gadcon_popup_content_set(inst->popup, o_popup); + edje_object_size_min_calc(o_popup, NULL, NULL); + inst->o_popup = o_popup; + edje_object_signal_callback_add(o_popup, "mpdule,play", "", + _mpdule_cb_play, inst); + edje_object_signal_callback_add(o_popup, "mpdule,stop", "", + _mpdule_cb_stop, inst); + edje_object_signal_callback_add(o_popup, "mpdule,pause", "", + _mpdule_cb_pause, inst); + edje_object_signal_callback_add(o_popup, "mpdule,next", "", + _mpdule_cb_next, inst); + edje_object_signal_callback_add(o_popup, "mpdule,previous", "", + _mpdule_cb_previous, inst); + } }