enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

block mixer crashes during init 

fix T1305
This commit is contained in:
Mike Blumenkrantz 2014-06-02 09:13:55 -04:00 committed by Cedric BAIL
parent 514e644c5c
commit 891957f5df
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/mixer/e_mod_main.c
View File

@ -262,6 +262,7 @@ _mixer_balance_left(E_Mixer_Instance *inst)
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state;
state = &inst->mixer_state; state = &inst->mixer_state;
if (!inst->channel) return;
e_mod_mixer_volume_get(inst->sys, inst->channel, e_mod_mixer_volume_get(inst->sys, inst->channel,
&state->left, &state->right); &state->left, &state->right);
if (state->left >= 0) if (state->left >= 0)
@ -377,6 +378,7 @@ _mixer_toggle_mute(E_Mixer_Instance *inst, Eina_Bool non_ui)
{ {
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state;
if (!inst->channel) return;
if (!e_mod_mixer_mutable_get(inst->sys, inst->channel)) if (!e_mod_mixer_mutable_get(inst->sys, inst->channel))
return; return;
@ -401,6 +403,7 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __U
E_Mixer_Instance *inst = data; E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state = &inst->mixer_state; E_Mixer_Channel_State *state = &inst->mixer_state;
if (!inst->channel) return;
e_mod_mixer_volume_get(inst->sys, inst->channel, e_mod_mixer_volume_get(inst->sys, inst->channel,
&state->left, &state->right); &state->left, &state->right);
@ -422,6 +425,7 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __
E_Mixer_Instance *inst = data; E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state = &inst->mixer_state; E_Mixer_Channel_State *state = &inst->mixer_state;
if (!inst->channel) return;
e_mod_mixer_volume_get(inst->sys, inst->channel, e_mod_mixer_volume_get(inst->sys, inst->channel,
&state->left, &state->right); &state->left, &state->right);
@ -443,6 +447,7 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__
E_Mixer_Instance *inst = data; E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state = &inst->mixer_state; E_Mixer_Channel_State *state = &inst->mixer_state;
if (!inst->channel) return;
state->mute = e_widget_check_checked_get(obj); state->mute = e_widget_check_checked_get(obj);
e_mod_mixer_mute_set(inst->sys, inst->channel, state->mute); e_mod_mixer_mute_set(inst->sys, inst->channel, state->mute);