styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests 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
parent 73f35d8444
commit 30e4ed9439
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,6 +252,7 @@ _mixer_update_volume(E_Mixer_Instance *inst, int dl, int dr, Eina_Bool non_ui)
E_Mixer_Channel_State *state;
state = &inst->mixer_state;
if (!inst->channel) return;
e_mod_mixer_volume_get(inst->sys, inst->channel,
&state->left, &state->right);
if (state->left >= 0)
@ -292,6 +293,8 @@ _mixer_toggle_mute(E_Mixer_Instance *inst, Eina_Bool non_ui)
{
E_Mixer_Channel_State *state;
if (!inst->channel) return;
if (!e_mod_mixer_channel_is_mutable(inst->channel))
return;
@ -316,6 +319,7 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __U
E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state = &inst->mixer_state;
if (!inst->channel) return;
e_mod_mixer_volume_get(inst->sys, inst->channel,
&state->left, &state->right);
@ -337,6 +341,7 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __
E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state = &inst->mixer_state;
if (!inst->channel) return;
e_mod_mixer_volume_get(inst->sys, inst->channel,
&state->left, &state->right);
@ -358,6 +363,7 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__
E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state = &inst->mixer_state;
if (!inst->channel) return;
state->mute = e_widget_check_checked_get(obj);
e_mod_mixer_mute_set(inst->sys, inst->channel, state->mute);