formatting

SVN revision: 75187
This commit is contained in:
Mike Blumenkrantz 2012-08-13 06:51:24 +00:00
parent d616447bca
commit 6cb077ac45
1 changed files with 46 additions and 40 deletions

View File

@ -2,15 +2,15 @@
struct _E_Powersave_Deferred_Action struct _E_Powersave_Deferred_Action
{ {
void (*func) (void *data); void (*func)(void *data);
const void *data; const void *data;
unsigned char delete_me : 1; unsigned char delete_me : 1;
}; };
/* local subsystem functions */ /* local subsystem functions */
static Eina_Bool _e_powersave_cb_deferred_timer(void *data); static Eina_Bool _e_powersave_cb_deferred_timer(void *data);
static void _e_powersave_mode_eval(void); static void _e_powersave_mode_eval(void);
static void _e_powersave_event_update_free(void *data __UNUSED__, void *event); static void _e_powersave_event_update_free(void *data __UNUSED__, void *event);
/* local subsystem globals */ /* local subsystem globals */
EAPI int E_EVENT_POWERSAVE_UPDATE = 0; EAPI int E_EVENT_POWERSAVE_UPDATE = 0;
@ -38,7 +38,7 @@ e_powersave_shutdown(void)
} }
EAPI E_Powersave_Deferred_Action * EAPI E_Powersave_Deferred_Action *
e_powersave_deferred_action_add(void (*func) (void *data), const void *data) e_powersave_deferred_action_add(void (*func)(void *data), const void *data)
{ {
E_Powersave_Deferred_Action *pa; E_Powersave_Deferred_Action *pa;
@ -46,8 +46,8 @@ e_powersave_deferred_action_add(void (*func) (void *data), const void *data)
if (!pa) return NULL; if (!pa) return NULL;
if (deferred_timer) ecore_timer_del(deferred_timer); if (deferred_timer) ecore_timer_del(deferred_timer);
deferred_timer = ecore_timer_add(defer_time, deferred_timer = ecore_timer_add(defer_time,
_e_powersave_cb_deferred_timer, _e_powersave_cb_deferred_timer,
NULL); NULL);
pa->func = func; pa->func = func;
pa->data = data; pa->data = data;
deferred_actions = eina_list_append(deferred_actions, pa); deferred_actions = eina_list_append(deferred_actions, pa);
@ -59,21 +59,21 @@ e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa)
{ {
if (walking_deferred_actions) if (walking_deferred_actions)
{ {
pa->delete_me = 1; pa->delete_me = 1;
return; return;
} }
else else
{ {
deferred_actions = eina_list_remove(deferred_actions, pa); deferred_actions = eina_list_remove(deferred_actions, pa);
free(pa); free(pa);
if (!deferred_actions) if (!deferred_actions)
{ {
if (deferred_timer) if (deferred_timer)
{ {
ecore_timer_del(deferred_timer); ecore_timer_del(deferred_timer);
deferred_timer = NULL; deferred_timer = NULL;
} }
} }
} }
} }
@ -83,7 +83,8 @@ e_powersave_mode_set(E_Powersave_Mode mode)
E_Event_Powersave_Update *ev; E_Event_Powersave_Update *ev;
if (mode < e_config->powersave.min) mode = e_config->powersave.min; if (mode < e_config->powersave.min) mode = e_config->powersave.min;
else if (mode > e_config->powersave.max) mode = e_config->powersave.max; else if (mode > e_config->powersave.max)
mode = e_config->powersave.max;
if (powersave_mode == mode) return; if (powersave_mode == mode) return;
printf("CHANGE PW SAVE MODE TO %i / %i\n", (int)mode, E_POWERSAVE_MODE_EXTREME); printf("CHANGE PW SAVE MODE TO %i / %i\n", (int)mode, E_POWERSAVE_MODE_EXTREME);
powersave_mode = mode; powersave_mode = mode;
@ -94,7 +95,6 @@ e_powersave_mode_set(E_Powersave_Mode mode)
_e_powersave_mode_eval(); _e_powersave_mode_eval();
} }
EAPI E_Powersave_Mode EAPI E_Powersave_Mode
e_powersave_mode_get(void) e_powersave_mode_get(void)
{ {
@ -123,8 +123,8 @@ _e_powersave_cb_deferred_timer(void *data __UNUSED__)
walking_deferred_actions++; walking_deferred_actions++;
EINA_LIST_FREE(deferred_actions, pa) EINA_LIST_FREE(deferred_actions, pa)
{ {
if (!pa->delete_me) pa->func((void *)pa->data); if (!pa->delete_me) pa->func((void *)pa->data);
free(pa); free(pa);
} }
walking_deferred_actions--; walking_deferred_actions--;
if (!deferred_actions) deferred_timer = NULL; if (!deferred_actions) deferred_timer = NULL;
@ -139,31 +139,36 @@ _e_powersave_mode_eval(void)
switch (powersave_mode) switch (powersave_mode)
{ {
case E_POWERSAVE_MODE_NONE: case E_POWERSAVE_MODE_NONE:
t = e_config->powersave.none; /* time to defer "power expensive" activities */ t = e_config->powersave.none; /* time to defer "power expensive" activities */
break; break;
case E_POWERSAVE_MODE_LOW: case E_POWERSAVE_MODE_LOW:
t = e_config->powersave.low; t = e_config->powersave.low;
break; break;
case E_POWERSAVE_MODE_MEDIUM: case E_POWERSAVE_MODE_MEDIUM:
t = e_config->powersave.medium; t = e_config->powersave.medium;
break; break;
case E_POWERSAVE_MODE_HIGH: case E_POWERSAVE_MODE_HIGH:
t = e_config->powersave.high; t = e_config->powersave.high;
break; break;
case E_POWERSAVE_MODE_EXTREME: case E_POWERSAVE_MODE_EXTREME:
t = e_config->powersave.extreme; t = e_config->powersave.extreme;
break; break;
default: default:
return; return;
break; break;
} }
if (t != defer_time) if (t != defer_time)
{ {
if (deferred_timer) ecore_timer_del(deferred_timer); if (deferred_timer) ecore_timer_del(deferred_timer);
deferred_timer = ecore_timer_add(defer_time, deferred_timer = ecore_timer_add(defer_time,
_e_powersave_cb_deferred_timer, _e_powersave_cb_deferred_timer,
NULL); NULL);
defer_time = t; defer_time = t;
} }
} }
@ -172,3 +177,4 @@ _e_powersave_event_update_free(void *data __UNUSED__, void *event)
{ {
free(event); free(event);
} }