Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h e_mod_types.h
Log Message:
Added options for setting mixer display mode. Only "Simple" mode is
implemented right now.
May need a module.mixer.cfg remove for this as it is a new option.
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_config.c 12 Sep 2006 12:01:35 -0000 1.11
+++ e_mod_config.c 12 Sep 2006 12:17:47 -0000 1.12
@@ -8,6 +8,7 @@
int card_id;
int channel_id;
+ int mode;
};
/* Protos */
@@ -50,6 +51,7 @@
{
cfdata->card_id = ci->card_id;
cfdata->channel_id = ci->channel_id;
+ cfdata->mode = ci->mode;
}
static void *
@@ -78,12 +80,22 @@
Evas_Object *o, *ob, *of;
Evas_List *cards, *chans;
Config_Item *ci;
- E_Radio_Group *cg, *mg;
+ E_Radio_Group *cg, *mg, *dg;
Mixer_Card *card;
ci = cfd->data;
o = e_widget_list_add(evas, 0, 0);
+ of = e_widget_framelist_add(evas, _("Display Mode"), 0);
+ dg = e_widget_radio_group_new(&cfdata->mode);
+ ob = e_widget_radio_add(evas, _("Simple Mode"), SIMPLE_MODE, dg);
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_radio_add(evas, _("Full Mode"), FULL_MODE, dg);
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_radio_add(evas, _("Shelf Mode"), ONEFANG_MODE, dg);
+ e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+
if (!mixer->mix_sys->cards)
{
if (mixer->mix_sys->get_cards)
@@ -143,6 +155,8 @@
ci->card_id = cfdata->card_id;
ci->channel_id = cfdata->channel_id;
+ ci->mode = cfdata->mode;
+
e_config_save_queue();
return 1;
}
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_mod_main.c 12 Sep 2006 12:01:35 -0000 1.28
+++ e_mod_main.c 12 Sep 2006 12:17:47 -0000 1.29
@@ -195,7 +195,9 @@
{
if (ev->flags == EVAS_BUTTON_DOUBLE_CLICK)
{
- /* Call full mixer window */
+ /* Call full mixer window.
+ For now just call simple till this mode is made */
+ _mixer_window_simple_pop_up(inst);
}
else if (ev->flags == EVAS_BUTTON_NONE)
{
@@ -250,6 +252,7 @@
{
ci->card_id = 0;
ci->channel_id = 0;
+ ci->mode = SIMPLE_MODE;
}
else if (mixer->mix_sys)
{
@@ -261,6 +264,7 @@
{
ci->card_id = 0;
ci->channel_id = 0;
+ ci->mode = SIMPLE_MODE;
mixer_config->items = evas_list_append(mixer_config->items,
ci);
return ci;
}
@@ -271,6 +275,7 @@
{
ci->card_id = 0;
ci->channel_id = 0;
+ ci->mode = SIMPLE_MODE;
mixer_config->items = evas_list_append(mixer_config->items, ci);
return ci;
}
@@ -291,7 +296,8 @@
ci->channel_id = 0;
}
}
-
+
+ ci->mode = SIMPLE_MODE;
mixer_config->items = evas_list_append(mixer_config->items, ci);
return ci;
}
@@ -353,6 +359,7 @@
E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_VAL(D, T, card_id, INT);
E_CONFIG_VAL(D, T, channel_id, INT);
+ E_CONFIG_VAL(D, T, mode, INT);
conf_edd = E_CONFIG_DD_NEW("Mixer_Config", Config);
#undef T
@@ -371,7 +378,7 @@
ci->id = evas_stringshare_add("0");
ci->card_id = 0;
ci->channel_id = 0;
-
+ ci->mode = SIMPLE_MODE;
mixer_config->items = evas_list_append(mixer_config->items, ci);
}
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.h 11 Sep 2006 11:21:43 -0000 1.5
+++ e_mod_main.h 12 Sep 2006 12:17:47 -0000 1.6
@@ -19,6 +19,7 @@
int card_id;
int channel_id;
+ int mode;
};
EAPI extern E_Module_Api e_modapi;
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_types.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_types.h 11 Sep 2006 18:24:27 -0000 1.5
+++ e_mod_types.h 12 Sep 2006 12:17:47 -0000 1.6
@@ -7,6 +7,7 @@
typedef struct _Mixer_System Mixer_System;
typedef struct _Mixer_Card Mixer_Card;
typedef struct _Mixer_Channel Mixer_Channel;
+typedef enum _Mixer_Mode Mixer_Mode;
struct _Instance
{
@@ -80,6 +81,13 @@
int id, card_id;
const char *name;
+};
+
+enum _Mixer_Mode
+{
+ SIMPLE_MODE,
+ FULL_MODE,
+ ONEFANG_MODE
};
#endif
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
