Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
Makefile.am e_mod_config.c
Log Message:
Start on config dialog.
===================================================================
RCS file: /cvs/e/e_modules/mixer/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 7 Sep 2006 15:26:47 -0000 1.3
+++ Makefile.am 7 Sep 2006 16:03:29 -0000 1.4
@@ -28,7 +28,8 @@
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
alsa_mixer.h \
- alsa_mixer.c
+ alsa_mixer.c \
+ e_mod_config.c
module_la_LIBADD = @e_libs@ @SOUND_LDFLAGS@
module_la_LDFLAGS = -module -avoid-version
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 15 Aug 2006 02:33:01 -0000 1.1
+++ e_mod_config.c 7 Sep 2006 16:03:29 -0000 1.2
@@ -1,151 +1,109 @@
#include <e.h>
#include "e_mod_main.h"
+#include "alsa_mixer.h"
struct _E_Config_Dialog_Data
{
-// int resolution;
+
};
/* Protos */
-static void *_create_data (E_Config_Dialog * cfd);
-static void _free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata);
-static Evas_Object *_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas,
+static void *_create_data (E_Config_Dialog * cfd);
+static void _free_data (E_Config_Dialog * cfd,
+ E_Config_Dialog_Data * cfdata);
+static Evas_Object *_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas,
+ E_Config_Dialog_Data * cfdata);
+static int _basic_apply_data (E_Config_Dialog * cfd,
E_Config_Dialog_Data * cfdata);
-static int _basic_apply_data (E_Config_Dialog * cfd,
- E_Config_Dialog_Data * cfdata);
-static void onTimeCheckChange (void *data, Evas_Object * obj);
-static void onDateCheckChange (void *data, Evas_Object * obj);
void
-_config_mixer_module (Config_Item * ci)
+_config_mixer_module(Config_Item *ci)
{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View *v;
- E_Container *con;
- char buf[4096];
-
- v = E_NEW (E_Config_Dialog_View, 1);
-
- v->create_cfdata = _create_data;
- v->free_cfdata = _free_data;
- v->basic.apply_cfdata = _basic_apply_data;
- v->basic.create_widgets = _basic_create_widgets;
-
- snprintf (buf, sizeof (buf), "%s/module.eap",
- e_module_dir_get (mixer_config->module));
- con = e_container_current_get (e_manager_current_get ());
- cfd = e_config_dialog_new (con, D_ ("Mixer Configuration"), "Mixer",
"_e_modules_mixer_config_dialog", buf, 0, v, ci);
- mixer_config->config_dialog = cfd;
+ E_Config_Dialog *cfd;
+ E_Config_Dialog_View *v;
+ E_Container *con;
+ char buf[4096];
+
+ v = E_NEW(E_Config_Dialog_View, 1);
+ if (!v) return;
+
+ v->create_cfdata = _create_data;
+ v->free_cfdata = _free_data;
+ v->basic.apply_cfdata = _basic_apply_data;
+ v->basic.create_widgets = _basic_create_widgets;
+
+ snprintf(buf, sizeof(buf), "%s/module.eap",
+ e_module_dir_get(mixer_config->module));
+
+ con = e_container_current_get(e_manager_current_get());
+ cfd = e_config_dialog_new(con, _("Mixer Configuration"), "Mixer",
+ "_mixer_config_dialog", buf, 0, v, ci);
+ mixer_config->config_dialog = cfd;
}
static void
-_fill_data (Config_Item * ci, E_Config_Dialog_Data * cfdata)
+_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
{
-// cfdata->resolution = ci->resolution;
+
}
static void *
-_create_data (E_Config_Dialog * cfd)
+_create_data(E_Config_Dialog *cfd)
{
- E_Config_Dialog_Data *cfdata;
- Config_Item *ci;
-
- ci = cfd->data;
- cfdata = E_NEW (E_Config_Dialog_Data, 1);
+ E_Config_Dialog_Data *cfdata;
+ Config_Item *ci;
- _fill_data (ci, cfdata);
- return cfdata;
+ ci = cfd->data;
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ _fill_data(ci, cfdata);
+ return cfdata;
}
static void
-_free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- if (!mixer_config)
- return;
- mixer_config->config_dialog = NULL;
- free (cfdata);
- cfdata = NULL;
+ if (!mixer_config) return;
+ mixer_config->config_dialog = NULL;
+ E_FREE(cfdata);
}
static Evas_Object *
-_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas,
- E_Config_Dialog_Data * cfdata)
-{
- Evas_Object *o;
-// Evas_Object *of, *ob, *time_entry, *time_check, *date_entry, *date_check;
-// E_Radio_Group *rg;
-
- o = e_widget_list_add (evas, 0, 0);
-/*
- of = e_widget_framelist_add (evas, D_ ("Resolution"), 0);
- rg = e_widget_radio_group_new (&(cfdata->resolution));
- ob = e_widget_radio_add (evas, D_ ("1 Minute"), RESOLUTION_MINUTE, rg);
- e_widget_framelist_object_append (of, ob);
- ob = e_widget_radio_add (evas, D_ ("1 Second"), RESOLUTION_SECOND, rg);
- e_widget_framelist_object_append (of, ob);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
-
- of = e_widget_frametable_add (evas, D_ ("Date"), 1);
- date_check =
- e_widget_check_add (evas, D_ ("Show Date"), &(cfdata->show_date));
- if (cfdata->show_date)
- e_widget_check_checked_set (date_check, 1);
- e_widget_frametable_object_append (of, date_check, 0, 0, 1, 1, 1, 0, 1, 0);
- date_entry = e_widget_entry_add (evas, &cfdata->date_format);
- e_widget_on_change_hook_set (date_check, onDateCheckChange, date_entry);
- e_widget_disabled_set (date_entry, !cfdata->show_date);
- e_widget_min_size_set (date_entry, 150, 1);
- e_widget_frametable_object_append (of, date_entry, 0, 1, 1, 1, 1, 0, 1, 0);
- ob =
- e_widget_label_add (evas, D_ ("Consult strftime(3) for format syntax"));
- e_widget_frametable_object_append (of, ob, 0, 2, 1, 1, 1, 0, 1, 0);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
-
- of = e_widget_frametable_add (evas, D_ ("Time"), 1);
- time_check =
- e_widget_check_add (evas, D_ ("Show Time"), &(cfdata->show_time));
- if (cfdata->show_time)
- e_widget_check_checked_set (time_check, 1);
- e_widget_frametable_object_append (of, time_check, 0, 0, 1, 1, 1, 0, 1, 0);
- time_entry = e_widget_entry_add (evas, &cfdata->time_format);
- e_widget_on_change_hook_set (time_check, onTimeCheckChange, time_entry);
- e_widget_disabled_set (time_entry, !cfdata->show_time);
- e_widget_min_size_set (time_entry, 150, 1);
- e_widget_frametable_object_append (of, time_entry, 0, 1, 1, 1, 1, 0, 1, 0);
- ob =
- e_widget_label_add (evas, D_ ("Consult strftime(3) for format syntax"));
- e_widget_frametable_object_append (of, ob, 0, 2, 1, 1, 1, 0, 1, 0);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
-*/
- return o;
-}
-
-static int
-_basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
-{
-// Config_Item *ci;
-
-// ci = cfd->data;
-
-
-// e_config_save_queue ();
-
-// _mixer_config_updated (ci->id);
- return 1;
-}
-
-static void
-onTimeCheckChange (void *data, Evas_Object * obj)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
- int checked = e_widget_check_checked_get (obj);
+ Evas_Object *o, *ol, *ot, *ob, *icon;
+ Evas_List *cards, *c;
- e_widget_disabled_set (data, !checked);
+ cards = alsa_get_cards();
+
+ o = e_widget_list_add(evas, 0, 0);
+ ot = e_widget_table_add(evas, 0);
+
+ ol = e_widget_ilist_add(evas, 48, 48, NULL);
+ e_widget_min_size_set(ol, 160, 200);
+ if (cards)
+ {
+ for (c = cards; c; c = c->next)
+ {
+ Alsa_Card *card;
+
+ card = c->data;
+ if (!c) continue;
+ e_widget_ilist_append(ol, NULL, card->real, NULL, NULL, NULL);
+ }
+ }
+ e_widget_ilist_go(ol);
+ e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 0, 1, 0);
+
+ ob = e_widget_button_add(evas, _("Configure"), NULL, NULL, NULL, NULL);
+ e_widget_disabled_set(ob, 1);
+ e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+
+ e_widget_list_object_append(o, ot, 1, 1, 0.5);
+ return o;
}
-static void
-onDateCheckChange (void *data, Evas_Object * obj)
+static int
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- int checked = e_widget_check_checked_get (obj);
-
- e_widget_disabled_set (data, !checked);
+ return 1;
}
-------------------------------------------------------------------------
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
