enlightenment
/
enlightenment-module-mpdule
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mpdule: ecrustify + code cleanup 

SVN revision: 84404
This commit is contained in:
Boris Faure 2013-03-03 11:03:50 +00:00 committed by Tom Hacohen
parent 7bcb878c5c
commit 809774ad86
1 changed files with 606 additions and 627 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/e_mod_main.c
View File

@ -70,7 +70,6 @@ struct _Instance
E_Gadcon_Popup *popup;
};
static void _mpdule_connect(Instance *inst);
static void _mpdule_disconnect(Instance *inst);
static void _mpdule_update_song(Instance *inst);
@ -155,7 +154,7 @@ _gc_shutdown (E_Gadcon_Client * gcc)
_mpdule_popup_destroy(inst);
evas_object_del(inst->mpdule);
free(inst);
inst = NULL;
gcc->data = NULL;
}
static void
@ -191,9 +190,7 @@ _gc_icon (const E_Gadcon_Client_Class *client_class, Evas * evas)
static const char *
_gc_id_new(const E_Gadcon_Client_Class *client_class)
{
Config_Item *ci;
ci = _mpdule_config_item_get (NULL);
Config_Item *ci = _mpdule_config_item_get(NULL);
return ci->id;
}
@ -201,16 +198,14 @@ static void
_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;
Instance *inst = data;
m = e_menu_new();
mi = e_menu_item_new(m);
@ -224,8 +219,8 @@ _mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
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,
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,
@ -237,17 +232,14 @@ _mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
}
}
static void
_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))
if ((!inst) || (!inst->ci->show_popup))
return;
popup = inst->popup;
e_gadcon_popup_show(inst->popup);
}
@ -255,12 +247,10 @@ static void
_mpdule_cb_mouse_out(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)))
if ((!inst) || ((!inst->ci->show_popup) && (inst->popup)))
return;
popup = inst->popup;
e_gadcon_popup_hide(inst->popup);
}
@ -276,9 +266,7 @@ _mpdule_menu_cb_post (void *data, E_Menu * m)
static void
_mpdule_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance *inst;
inst = data;
Instance *inst = data;
_config_mpdule_module(inst->ci);
}
@ -313,16 +301,9 @@ _mpdule_config_updated (Config_Item * ci)
}
}
else
{
if (inst->popup)
{
_mpdule_popup_destroy(inst);
}
if (inst->o_popup)
{
evas_object_del(inst->o_popup);
}
}
break;
}
}
@ -331,10 +312,9 @@ static void
_mpdule_cb_play(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
Instance *inst;
Instance *inst = data;
mpd_Connection *mpd;
inst = data;
mpd = inst->mpd;
mpd_sendPlayCommand(mpd, -1);
}
@ -343,10 +323,9 @@ static void
_mpdule_cb_previous(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
Instance *inst;
Instance *inst = data;
mpd_Connection *mpd;
inst = data;
mpd = inst->mpd;
mpd_sendPrevCommand(mpd);
}
@ -355,10 +334,9 @@ static void
_mpdule_cb_next(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
Instance *inst;
Instance *inst = data;
mpd_Connection *mpd;
inst = data;
mpd = inst->mpd;
mpd_sendNextCommand(mpd);
}
@ -367,10 +345,9 @@ static void
_mpdule_cb_stop(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
Instance *inst;
Instance *inst = data;
mpd_Connection *mpd;
inst = data;
mpd = inst->mpd;
mpd_sendStopCommand(mpd);
}
@ -379,10 +356,9 @@ static void
_mpdule_cb_pause(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
Instance *inst;
Instance *inst = data;
mpd_Connection *mpd;
inst = data;
mpd = inst->mpd;
mpd_sendPauseCommand(mpd, 1);
}
@ -394,7 +370,6 @@ _mpdule_config_item_get (const char *id)
Config_Item *ci;
char buf[128];
if (!id)
{
int num = 0;
@ -463,9 +438,8 @@ _mpdule_disconnect(Instance *inst)
static Eina_Bool
_mpdule_update_song_cb(void *data)
{
Instance *inst;
Instance *inst = data;
inst = data;
_mpdule_update_song(inst);
return EINA_TRUE;
}
@ -748,7 +722,6 @@ e_modapi_shutdown (E_Module * m)
if (ci->id)
eina_stringshare_del(ci->id);
free(ci);
ci = NULL;
}
free(mpdule_config);
@ -768,22 +741,31 @@ e_modapi_save (E_Module * m)
static void
_mpdule_popup_destroy(Instance *inst)
{
if (!inst->popup)
return;
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)
{
Evas *evas;
Evas_Object *o_popup;
char buf[4096];
_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"))
@ -794,6 +776,8 @@ _mpdule_popup_create (Instance * inst, const char *dir)
}
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");
@ -818,9 +802,4 @@ _mpdule_popup_create (Instance * inst, const char *dir)
edje_object_signal_callback_add(o_popup, "mpdule,previous", "",
_mpdule_cb_previous, inst);
}
else
{
inst->popup = NULL;
inst->o_popup = NULL;
}
}