summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-05-07 14:44:10 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-05-07 14:44:10 +0200
commit7ff5a2a74488af1e307d624ec5095638a1966184 (patch)
tree84929eaefe66adeaca8592c6bdcd727f55f9f0fe
parent3679550b5c06471b2801f5313625938c9ee565e2 (diff)
downloadenlightenment-7ff5a2a74488af1e307d624ec5095638a1966184.tar.gz
fix launch mixer from config panel, select card and channel
-rw-r--r--src/modules/mixer/conf_module.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/modules/mixer/conf_module.c b/src/modules/mixer/conf_module.c
index 8c44b372c4..0ee1bd42e4 100644
--- a/src/modules/mixer/conf_module.c
+++ b/src/modules/mixer/conf_module.c
@@ -137,6 +137,7 @@ cb_mixer_app_del(E_Dialog *dialog __UNUSED__, void *data)
static void
cb_mixer_call(void *data, void *data2 __UNUSED__)
{
+ Eina_List *l;
E_Mixer_Module_Context *ctxt = data;
if (ctxt->mixer_dialog)
@@ -146,6 +147,22 @@ cb_mixer_call(void *data, void *data2 __UNUSED__)
}
ctxt->mixer_dialog = e_mixer_app_dialog_new(NULL, cb_mixer_app_del, ctxt);
+
+ for (l = ctxt->instances; l; l = l->next)
+ {
+ E_Mixer_Instance *inst;
+ E_Mixer_Gadget_Config *conf;
+
+ inst = l->data;
+ conf = inst->conf;
+
+ if (conf)
+ {
+ e_mixer_app_dialog_select(ctxt->mixer_dialog, conf->card, conf->channel_name);
+ break;
+ }
+
+ }
}
static void