Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
alsa_mixer.c e_mod_main.c
Log Message:
Lots of formatting fixes.
===================================================================
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- alsa_mixer.c 22 Dec 2007 18:00:15 -0000 1.38
+++ alsa_mixer.c 22 Dec 2007 20:33:03 -0000 1.39
@@ -17,11 +17,11 @@
Evas_List *
alsa_get_cards()
{
- Evas_List *cards = NULL;
- snd_ctl_t *control;
+ Evas_List *cards = NULL;
+ snd_ctl_t *control;
snd_ctl_card_info_t *hw_info;
- int err, i;
- char buf[1024];
+ int err, i;
+ char buf[1024];
snd_ctl_card_info_alloca(&hw_info);
@@ -54,26 +54,23 @@
alsa_free_cards(void *data)
{
Evas_List *cards;
-
- cards = data;
- if (!cards) return;
-
+
+ if (!(cards = data)) return;
while (cards)
{
Mixer_Card *card;
-
- card = cards->data;
- if (!card) continue;
+
+ if (!(card = cards->data)) return;
if (card->name) evas_stringshare_del(card->name);
if (card->real) evas_stringshare_del(card->real);
while (card->channels)
{
Mixer_Channel *chan;
-
- chan = card->channels->data;
- if (!chan) continue;
+
+ if (!(chan = card->channels->data)) continue;
if (chan->name) evas_stringshare_del(chan->name);
- card->channels = evas_list_remove_list(card->channels,
card->channels);
+ card->channels =
+ evas_list_remove_list(card->channels, card->channels);
E_FREE(chan);
}
cards = evas_list_remove_list(cards, cards);
@@ -84,13 +81,13 @@
void *
alsa_get_card(int id)
{
- Evas_List *cards = NULL;
- snd_mixer_t *handle;
- snd_ctl_t *control;
+ Evas_List *cards = NULL;
+ snd_mixer_t *handle;
+ snd_ctl_t *control;
snd_ctl_card_info_t *hw_info;
- int err, i, cid;
- char buf[1024];
- const char *name;
+ int err, i, cid;
+ char buf[1024];
+ const char *name;
for (i = 0; i < 32; i++)
{
@@ -128,30 +125,24 @@
Evas_List *
alsa_card_get_channels(void *data)
{
- Mixer_Card *card;
- Evas_List *channels;
-
- snd_mixer_t *handle;
- snd_ctl_t *control;
- snd_ctl_card_info_t *hw_info;
+ Mixer_Card *card;
+ Evas_List *channels = NULL;
+ snd_mixer_t *handle;
+ snd_ctl_t *control;
+ snd_ctl_card_info_t *hw_info;
snd_mixer_selem_id_t *sid;
- snd_mixer_elem_t *elem;
- int err, i;
+ snd_mixer_elem_t *elem;
+ int err, i;
- card = data;
- if (!card) return NULL;
-
- channels = NULL;
-
+ if (!(card = data)) return NULL;
snd_mixer_selem_id_alloca(&sid);
snd_ctl_card_info_alloca(&hw_info);
-
+
if ((err = snd_ctl_open(&control, card->name, 0)) < 0)
{
printf("Cannot Open Card: %s %s\n", card->name, snd_strerror(err));
return NULL;
}
-
if ((err = snd_ctl_card_info(control, hw_info)) < 0)
{
printf("Cannot get hardware info: %s %s\n", card->name,
@@ -159,7 +150,6 @@
snd_ctl_close(control);
return NULL;
}
-
snd_ctl_close(control);
if ((err = snd_mixer_open(&handle, 0)) < 0)
@@ -167,21 +157,18 @@
printf("Cannot Open Mixer: %s\n", snd_strerror(err));
return NULL;
}
-
if ((err = snd_mixer_attach(handle, card->name)) < 0)
{
printf("Cannot Attach Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
return NULL;
}
-
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0)
{
printf("Cannot Register Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
return NULL;
}
-
if ((err = snd_mixer_load(handle)) < 0)
{
printf("Cannot Load Mixer: %s\n", snd_strerror(err));
@@ -214,12 +201,10 @@
void *
alsa_card_get_channel(void *data, int channel_id)
{
- Mixer_Card *card;
+ Mixer_Card *card;
Mixer_Channel *chan;
-
- card = data;
- if (!card) return NULL;
+ if (!(card = data)) return NULL;
chan = _alsa_card_get_channel(card, channel_id);
if (!chan) return NULL;
@@ -229,12 +214,12 @@
int
alsa_get_volume(int card_id, int channel_id)
{
- Mixer_Card *card;
- snd_mixer_t *handle;
+ Mixer_Card *card;
+ snd_mixer_t *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *sid;
- int err, range, ret = 0, mute;
- long min, max, vol;
+ int err, range, ret = 0, mute;
+ long min, max, vol;
if (muted)
{
@@ -252,21 +237,18 @@
printf("Cannot open mixer: %s\n", snd_strerror(err));
goto error;
}
-
if ((err = snd_mixer_attach(handle, (char *)card->name)) < 0)
{
printf("Cannot Attach Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
goto error;
}
-
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0)
{
printf("Cannot Register Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
goto error;
}
-
if ((err = snd_mixer_load(handle)) < 0)
{
printf("Cannot Load Mixer: %s\n", snd_strerror(err));
@@ -318,13 +300,13 @@
int
alsa_set_volume(int card_id, int channel_id, double vol)
{
- Mixer_Card *card;
- snd_mixer_t *handle;
+ Mixer_Card *card;
+ snd_mixer_t *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *sid;
- int err, range, v;
- long min, max;
-
+ int err, range, v;
+ long min, max;
+
card = alsa_get_card(card_id);
if (!card) return 0;
@@ -333,21 +315,18 @@
printf("Cannot open mixer: %s\n", snd_strerror(err));
goto error;
}
-
if ((err = snd_mixer_attach(handle, (char *)card->name)) < 0)
{
printf("Cannot Attach Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
goto error;
}
-
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0)
{
printf("Cannot Register Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
goto error;
}
-
if ((err = snd_mixer_load(handle)) < 0)
{
printf("Cannot Load Mixer: %s\n", snd_strerror(err));
@@ -427,12 +406,12 @@
int
alsa_set_mute(int card_id, int channel_id, int mute)
{
- Mixer_Card *card;
- snd_mixer_t *handle;
- snd_mixer_elem_t *elem;
+ Mixer_Card *card;
+ snd_mixer_t *handle;
+ snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *sid;
- int id, err, vol;
- const char *name;
+ int id, err, vol;
+ const char *name;
card = alsa_get_card(card_id);
if (!card) return 0;
@@ -442,21 +421,18 @@
printf("Cannot open mixer: %s\n", snd_strerror(err));
goto error;
}
-
if ((err = snd_mixer_attach(handle, (char *)card->name)) < 0)
{
printf("Cannot Attach Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
goto error;
}
-
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0)
{
printf("Cannot Register Mixer: %s\n", snd_strerror(err));
snd_mixer_close(handle);
goto error;
}
-
if ((err = snd_mixer_load(handle)) < 0)
{
printf("Cannot Load Mixer: %s\n", snd_strerror(err));
@@ -568,11 +544,10 @@
static void *
_alsa_card_get_channel(void *data, int channel_id)
{
- Mixer_Card *card;
- Evas_List *c;
-
- card = data;
- if (!card) return NULL;
+ Mixer_Card *card;
+ Evas_List *c;
+
+ if (!(card = data)) return NULL;
if (!card->channels)
card->channels = alsa_card_get_channels(card);
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- e_mod_main.c 22 Dec 2007 18:13:32 -0000 1.76
+++ e_mod_main.c 22 Dec 2007 20:33:03 -0000 1.77
@@ -181,7 +181,7 @@
_gc_icon(Evas *evas)
{
Evas_Object *o;
- char buf[4096];
+ char buf[4096];
snprintf(buf, sizeof(buf), "%s/e-module-mixer.edj",
e_module_dir_get(mixer_config->module));
@@ -233,7 +233,7 @@
_mixer_window_gauge_pop_up(inst);
- if (!inst || !inst->mixer) return;
+ if ((!inst) || (!inst->mixer)) return;
win = inst->mixer->gauge_win;
_mixer_volume_decrease(inst->mixer, inst->ci);
@@ -244,7 +244,7 @@
void
mixer_mute_toggle(Instance *inst)
{
- if (!inst || !inst->mixer) return;
+ if ((!inst) || (!inst->mixer)) return;
_mixer_simple_mute_toggle(inst->mixer, inst->ci);
}
@@ -252,20 +252,18 @@
static void
_mixer_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
- Instance *inst;
+ Instance *inst;
Evas_Event_Mouse_Down *ev;
+ E_Menu *mn;
+ E_Menu_Item *mi;
+ E_Zone *zone;
+ int x, y, w, h;
- inst = data;
- if (!inst) return;
+ if (!(inst = data)) return;
ev = event_info;
if ((ev->button == 3) && (!mixer_config->menu))
{
- E_Menu *mn;
- E_Menu_Item *mi;
- E_Zone *zone;
- int x, y, w, h;
-
zone = e_util_zone_current_get(e_manager_current_get());
mn = e_menu_new();
@@ -331,21 +329,20 @@
static void
_mixer_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
- Instance *inst;
+ Instance *inst;
- inst = data;
- if (!inst) return;
+ if (!(inst = data)) return;
_config_mixer_module(inst->mixer, inst->ci);
}
static Config_Item *
_mixer_config_item_get(void *data, const char *id)
{
- Mixer *mixer;
- Mixer_Card *card;
+ Mixer *mixer;
+ Mixer_Card *card;
Mixer_Channel *chan;
- Evas_List *l;
- Config_Item *ci;
+ Evas_List *l = NULL;
+ Config_Item *ci;
mixer = data;
for (l = mixer_config->items; l; l = l->next)
@@ -416,11 +413,10 @@
static void
_mixer_system_init(void *data)
{
- Mixer *mixer;
+ Mixer *mixer;
Mixer_System *sys;
- mixer = data;
- if (!mixer) return;
+ if (!(mixer = data)) return;
sys = E_NEW(Mixer_System, 1);
if (!sys) return;
@@ -453,12 +449,9 @@
_mixer_system_shutdown(void *data)
{
Mixer_System *sys;
-
- sys = data;
- if (!sys) return;
+ if (!(sys = data)) return;
if (sys->free_cards) sys->free_cards(sys->cards);
-
E_FREE(sys);
}
@@ -599,8 +592,8 @@
static void
_mixer_volume_change(Mixer *mixer, Config_Item *ci, int channel_id, double val)
{
- int m;
-
+ int m, ret;
+
if (!mixer) return;
if (!mixer->mix_sys) return;
if (!mixer->mix_sys->set_volume) return;
@@ -608,8 +601,6 @@
if (channel_id != 0)
{
- int ret;
-
ret = mixer->mix_sys->set_volume(ci->card_id, channel_id, val);
if (ret)
{
@@ -652,13 +643,9 @@
m = m ? 0 : 1;
mixer->mix_sys->set_mute(ci->card_id, ci->channel_id, m);
if (m)
- {
- edje_object_signal_emit(mixer->base, "muted", "");
- }
+ edje_object_signal_emit(mixer->base, "muted", "");
else
- {
- edje_object_signal_emit(mixer->base, "unmuted", "");
- }
+ edje_object_signal_emit(mixer->base, "unmuted", "");
}
/* Makes the simple window containing the slider pop up */
@@ -671,7 +658,7 @@
Evas_Coord mw, mh;
int cx, cy, cw, ch;
- if (!inst || !inst->mixer) return;
+ if ((!inst) || (!inst->mixer)) return;
if (!(con = e_container_current_get(e_manager_current_get()))) return;
evas_object_geometry_get(inst->mixer->base, &ox, &oy, &ow, &oh);
@@ -786,7 +773,7 @@
m = inst->mixer->mix_sys->get_mute(inst->ci->card_id,
inst->ci->channel_id);
e_widget_check_checked_set(win->check, m);
if (m)
- edje_object_signal_emit(inst->mixer->base, "muted", "");
+ edje_object_signal_emit(inst->mixer->base, "muted", "");
}
}
}
@@ -846,7 +833,7 @@
{
Mixer_Win_Simple *win;
- if (!(win = inst->mixer->simple_win) || !win->popped_up) return;
+ if (!(win = inst->mixer->simple_win) || (!win->popped_up)) return;
if (win->input_window != 0)
{
@@ -936,7 +923,6 @@
e_object_del(E_OBJECT(win->window));
win->mixer->simple_win = NULL;
E_FREE(win);
-
return 0;
}
else
@@ -948,13 +934,12 @@
_mixer_window_simple_changed_cb(void *data, Evas_Object *obj, void *event_info)
{
Mixer_Win_Simple *win;
- Mixer *mixer;
- double val;
-
+ Mixer *mixer;
+ double val;
+
if (!(win = data)) return;
-
- mixer = win->mixer;
- if (!mixer) return;
+
+ if (!(mixer = win->mixer)) return;
if (!mixer->mix_sys) return;
if (!mixer->mix_sys->set_volume) return;
@@ -967,12 +952,11 @@
_mixer_window_simple_mute_cb(void *data, Evas_Object *obj, void *event_info)
{
Mixer_Win_Simple *win;
- Mixer *mixer;
-
+ Mixer *mixer;
+
if (!(win = data)) return;
-
- mixer = win->mixer;
+ mixer = win->mixer;
_mixer_simple_mute_toggle(mixer, mixer->inst->ci);
}
@@ -988,7 +972,6 @@
evas_event_feed_mouse_move(win->window->evas,
xev->x - win->window->x, xev->y - win->window->y,
xev->time, NULL);
-
return 1;
}
@@ -1004,7 +987,6 @@
evas_event_feed_mouse_down(win->window->evas,
xev->button, EVAS_BUTTON_NONE,
xev->time, NULL);
-
return 1;
}
@@ -1045,7 +1027,6 @@
evas_event_feed_mouse_wheel(win->window->evas,
xev->direction, xev->z, xev->time, NULL);
-
return 1;
}
@@ -1073,11 +1054,8 @@
win = data;
_mixer_window_gauge_pop_down(win);
- if (win->timer)
- {
- ecore_timer_del(win->timer);
- win->timer = NULL;
- }
+ if (win->timer) ecore_timer_del(win->timer);
+ win->timer = NULL;
return 0;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
