E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume
Modified Files:
configure.ac
Log Message:
Fix minor oversight with x86_64 libdir. Thanks Sebastian
===
RCS file: /cvs/e/e_modules/evolume/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.ac25 Jul 2006 03:51:22 - 1.7
+++ configure.ac25 Jul 2006 13:31:16 - 1.8
@@ -100,7 +100,7 @@
moduledir=${prefix}/modules
else
datarootdir=${prefix}/share
-moduledir=${libdir}/lib/enlightenment/modules
+moduledir=${libdir}/enlightenment/modules
fi
AC_SUBST(E_MODULES, ${moduledir})
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume
Modified Files:
configure.ac
Log Message:
Bad Marcus, no cookie :) . Fixed x86_64 install patch.
===
RCS file: /cvs/e/e_modules/evolume/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.ac7 Jul 2006 03:14:34 - 1.6
+++ configure.ac25 Jul 2006 03:51:22 - 1.7
@@ -100,7 +100,7 @@
moduledir=${prefix}/modules
else
datarootdir=${prefix}/share
-moduledir=${prefix}/lib/enlightenment/modules
+moduledir=${libdir}/lib/enlightenment/modules
fi
AC_SUBST(E_MODULES, ${moduledir})
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_cdialog.c
Log Message:
Evolume module now shows icon in config dialogs.
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cdialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_cdialog.c 6 Apr 2006 19:13:37 - 1.4
+++ e_mod_cdialog.c 3 Jul 2006 13:42:36 - 1.5
@@ -31,7 +31,8 @@
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
-
+ char buf[4096];
+
v = E_NEW(E_Config_Dialog_View, 1);
v-create_cfdata = _create_data;
@@ -41,7 +42,8 @@
v-advanced.apply_cfdata = NULL;
v-advanced.create_widgets = NULL;
- cfd = e_config_dialog_new(con, _(Mixer Face Configuration), NULL, 0, v,
face);
+ snprintf(buf, sizeof(buf), %s/module.eap, module_root);
+ cfd = e_config_dialog_new(con, _(Mixer Face Configuration), buf, 0, v,
face);
}
static void
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_main.c
Log Message:
Make all active e_modules work with the new e_module_dialog_show function
change(s). If you get errors building these, update e17/apps/e .
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.c3 Jun 2006 13:19:00 - 1.5
+++ e_mod_main.c2 Jul 2006 19:06:09 - 1.6
@@ -72,9 +72,9 @@
}
int
-e_modapi_about(E_Module *module __UNUSED__)
+e_modapi_about(E_Module *module)
{
- e_module_dialog_show(D_(Enlightenment Evolume Module),
+ e_module_dialog_show(module, D_(Enlightenment Evolume Module),
D_(A simple module to give E17 a volume control for
some mixers.));
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_util.c
Log Message:
Fix a few more module_dialog_shows that were hiding.
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_util.c6 Apr 2006 19:13:37 - 1.3
+++ e_mod_util.c2 Jul 2006 19:16:14 - 1.4
@@ -24,15 +24,6 @@
int
e_volume_first_run()
{
- e_module_dialog_show(eVolume,
-So, if you see that post, it means, that you
successfullbr
-compile and load eVolume module for a first timebr
-br
-Possibly, you want to change something - if you has
anybr
-ideas - contact to me: [EMAIL PROTECTED] orbr
-JID: [EMAIL PROTECTED] (davinchi on E IRC
channels)br
-br Thanks for using eVolume, Pavel Boldin aka
davinchibr);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Make evolume build again at least. Not ready for shelf yet tho.
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.c9 Apr 2006 17:51:48 - 1.4
+++ e_mod_main.c3 Jun 2006 13:19:00 - 1.5
@@ -45,7 +45,6 @@
/* actually init buttons */
volume = e_volume_init(NULL);
- module-config_menu = volume-config_menu;
return volume;
}
@@ -54,9 +53,6 @@
{
Volume *volume;
- if (module-config_menu)
- module-config_menu = NULL;
-
volume = module-data;
if (volume)
@@ -72,16 +68,6 @@
volume = module-data;
e_config_domain_save(module.evolume, conf_edd, volume-conf);
- return 1;
-}
-
-int
-e_modapi_info(E_Module *module)
-{
- char buf[1024];
-
- snprintf(buf, 1024, %s/module_icon.png, module_root);
- module-icon_file = strdup(buf);
return 1;
}
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h6 Apr 2006 19:13:37 - 1.3
+++ e_mod_main.h3 Jun 2006 13:19:00 - 1.4
@@ -29,7 +29,6 @@
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
-EAPI int e_modapi_info(E_Module *m);
EAPI int e_modapi_about(E_Module *m);
EAPI int e_modapi_config(E_Module *m);
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume Modified Files: Makefile.am Added Files: module.eap Log Message: Evolume now builds and shows in module list. === RCS file: /cvs/e/e_modules/evolume/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 22 Mar 2006 01:58:08 - 1.2 +++ Makefile.am 3 Jun 2006 13:45:04 - 1.3 @@ -1,7 +1,9 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = src data patches po -EXTRA_DIST=TODO TODO.rus COPYING COPYING-PLAIN autogen.sh m4/*.m4 e_modules-evolume.spec e_modules-evolume.spec.in +EXTRA_DIST=TODO TODO.rus COPYING COPYING-PLAIN autogen.sh m4/*.m4 \ +e_modules-evolume.spec e_modules-evolume.spec.in module.eap + # data files for the module filesdir = @e_modules@/evolume/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume/data/themes/default Modified Files: Makefile.am Log Message: Now evolume shows in module list. === RCS file: /cvs/e/e_modules/evolume/data/themes/default/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 6 Apr 2006 18:46:17 - 1.3 +++ Makefile.am 3 Jun 2006 14:10:54 - 1.4 @@ -7,7 +7,8 @@ filesdir = @E_MODULES@/$(PACKAGE) files_DATA = module_icon.png \ -volume.edj +volume.edj \ +../../../module.eap EXTRA_DIST = ./default.edc \ ./groups/mixer_entry.edc \ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_config.c
Log Message:
Add some debugging for getting multiple mixers working again.
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 6 Apr 2006 19:13:37 - 1.3
+++ e_mod_config.c 7 Apr 2006 09:40:18 - 1.4
@@ -156,14 +156,17 @@
mixer_conf = evas_list_data(l);
-#if 0
DBG(stderr, mixer_id1 = %x, mixer_id2 = %x\n, mixer_conf-mixer_id,
mixer_name-mixer_id);
-#endif
if (MIXER_ID(mixer_conf-mixer_id) == MIXER_ID(mixer_name-mixer_id))
{
// DBG(stderr,using mixer_conf = %p\n, mixer_conf);
return mixer_conf;
}
+ else if ((!strcmp(mixer_conf-real, mixer_name-real))
+(!strcmp(mixer_conf-card, mixer_name-card)))
+ {
+return mixer_conf;
+ }
}
if (!l)
{
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/lib
Modified Files:
e_mixer.h
Log Message:
Some formatting of comments.
===
RCS file: /cvs/e/e_modules/evolume/src/lib/e_mixer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mixer.h 5 Apr 2006 17:48:48 - 1.2
+++ e_mixer.h 6 Apr 2006 18:28:03 - 1.3
@@ -20,36 +20,38 @@
struct _Mixer
{
-/** Name of this mixer */
+ /* Name of this mixer */
Mixer_Name *name;
-/** System for this mixer */
+ /* System for this mixer */
Mixer_System *system;
-/** Local data - mixer engine definded data */
+ /* Local data - mixer engine definded data */
void *local;
-/** Mixer elements */
+ /* Mixer elements */
Evas_List *elems;
-/** Signals if update necessary */
+ /* Signals if update necessary */
int is_changed;
-/** Callback and callback data */
+ /* Callback and callback data */
mixer_callback callback;
void *callback_private;
-/** Reference counter */
+ /* Reference counter */
int ref;
-/** Pointer to function, that initializes mixer */
+ /* Pointer to function, that initializes mixer */
Mixer *(*open) (Mixer *mixer, Mixer_System *ms, Mixer_Name *mixer_name);
-/** Pointer to function, that frees mixer */
+
+ /* Pointer to function, that frees mixer */
int (*close) (Mixer *mixer, Mixer_System *ms);
-/** Standart operations: get and set volume */
+
+ /* Standart operations: get and set volume */
int (*get_volume) (Mixer_Elem *melem, int *left, int *right);
int (*set_volume) (Mixer_Elem *melem, int left, int right);
-/** get and set mute */
+ /* get and set mute */
int (*get_mute) (Mixer_Elem *melem);
int (*set_mute) (Mixer_Elem *melem, int mute);
@@ -61,21 +63,22 @@
struct _Mixer_Elem
{
-/** pointer to the parent */
+ /* pointer to the parent */
Mixer *mixer;
-/** type of mixer (reserved) */
+ /* type of mixer (reserved) */
char type;
-/** mixer name (printable) */
+ /* mixer name (printable) */
char *name;
-/** is this mixer active? */
+ /* is this mixer active? */
char active;
-/** local (engine specific) data */
+
+ /* local (engine specific) data */
void *local;
-/** Element identifier (hash) */
+ /* Element identifier (hash) */
int elem_id;
/* Previous volume */
@@ -85,26 +88,28 @@
struct _Mixer_Name
{
-/** card name (engine specific */
+ /* card name (engine specific */
char *card;
-/** real (printable) name */
+
+ /* real (printable) name */
char *real;
-/** active flag */
+
+ /* active flag */
int active;
-/** ID of mixer, this is typically hash */
+ /* ID of mixer, this is typically hash */
int mixer_id;
-/** name of mixer system (parent)*/
+ /* name of mixer system (parent) */
Mixer_System_Name *system_name;
};
struct _Mixer_System
{
-/** name of mixer system (child)*/
+ /* name of mixer system (child) */
Mixer_System_Name *name;
-/** dl info */
+ /* dl info */
void *handle;
int ref;
@@ -115,10 +120,11 @@
{
/* This is system name: name of module_%s */
char *system;
+
/* This is name of system (in nice printable form */
char *name;
-/** system id (hash) */
+ /** system id (hash) */
int system_id;
/* List of Mixer_Name structures */
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/lib
Modified Files:
e_mixer.c
Log Message:
Removed some fprintf's to quiet the mixer library.
Some formatting.
===
RCS file: /cvs/e/e_modules/evolume/src/lib/e_mixer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mixer.c 5 Apr 2006 17:48:48 - 1.2
+++ e_mixer.c 6 Apr 2006 18:32:38 - 1.3
@@ -66,8 +66,6 @@
Mixer_System_Name *(*s_get_systems) (void);
snprintf(buf, 1024, %s/%s/systems/%s, module_root, MODULE_ARCH,
ptr);
-
- fprintf(stderr, module_path = %s\n, buf);
handle = dlopen(buf, RTLD_NOW);
if (!handle)
continue;
@@ -81,36 +79,12 @@
}
msn = s_get_systems();
-
- /*
- * fprintf(stderr,msn = %p\n, msn);
- * fprintf(stderr,msn = { \%s\, \%s\, %p }\n,
- * msn-system, msn-real, msn-mixer_names);
- */
-
dlclose(handle);
-
l = evas_list_append(l, msn);
-
}
-
-/*
- * char name[128];
- *
- * strncpy(name, ptr + strlen(module_), 128);
- * ms = calloc(sizeof(Mixer_System), 1);
- * ms-name = strdup(name);
- * mixer_system_load(ms);
- *
- *
- * mixer_system_unload(ms);
- * l = evas_list_append(l, ms);
- */
-
}
closedir(d);
-
return l;
}
@@ -122,7 +96,6 @@
mixer-callback = callback;
mixer-callback_private = data;
-
return 1;
}
@@ -145,10 +118,7 @@
ms-handle = dlopen(buf, RTLD_NOW);
if (!ms-handle)
- {
-fprintf(stderr, Cannot load mixer system: %s: %s\n, msn-system,
dlerror());
-return 1;
- }
+ return 1;
ms-ref++;
return 0;
@@ -188,9 +158,7 @@
if (!mixer-open || !mixer-close || !mixer-get_volume ||
!mixer-set_volume)
{
-fprintf(stderr, Cannot get mixer entry points: %s: %s\n,
msn-system, dlerror());
mixer_system_unload(ms);
-
free(mixer);
return NULL;
}
@@ -210,19 +178,14 @@
if (*ms == NULL)
{
-// fprintf(stderr,Allocating new Mixer_System\n);
*ms = calloc(sizeof(Mixer_System), 1);
(*ms)-handle = NULL;
(*ms)-name = msn;
}
mixer_system_load(*ms);
-
mixer = mixer_system_getentries(*ms, msn);
-// fprintf(stderr,mixer-system = %p, name = %s\n, mixer-system,
-// mixer-system-name-system);
-
if (!mixer)
return NULL;
@@ -246,8 +209,6 @@
return 0;
mixer-ref++;
- fprintf(stderr, mixer_ref = %d\n, mixer-ref);
-
return mixer-ref;
}
@@ -258,8 +219,6 @@
return 0;
mixer-ref--;
- fprintf(stderr, mixer_ref = %d\n, mixer-ref);
-
return mixer-ref;
}
@@ -279,7 +238,6 @@
int
mixer_close(Mixer *mixer)
{
-
int ret;
if (mixer-ref 0)
@@ -288,10 +246,7 @@
if (!mixer || !mixer-close)
return 0;
- fprintf(stderr, Mixer unloading: %s, %s\n, mixer-name-real,
mixer-name-card);
-
ret = mixer-close(mixer, mixer-system);
-
mixer_system_unload(mixer-system);
return ret;
}
@@ -302,7 +257,6 @@
Mixer *mixer;
mixer = melem-mixer;
-
return mixer-get_volume(melem, left, right);
}
@@ -312,7 +266,6 @@
Mixer *mixer;
mixer = melem-mixer;
-
return mixer-set_volume(melem, left, right);
}
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/lib
Modified Files:
alsa_mixer.c
Log Message:
Removed some fprintf's.
Minor formatting.
===
RCS file: /cvs/e/e_modules/evolume/src/lib/alsa_mixer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- alsa_mixer.c5 Apr 2006 17:48:48 - 1.2
+++ alsa_mixer.c6 Apr 2006 18:35:40 - 1.3
@@ -97,14 +97,6 @@
static int
_alsamixer_event(snd_mixer_t *__UNUSED__ m, unsigned int __UNUSED__ sign,
snd_mixer_elem_t *__UNUSED__ elem)
{
- //Mixer* mixer;
-
- /*
-* mixer = (Mixer*) snd_mixer_get_callback_private(m);
-*
-* if(mixer mixer-callback)
-* mixer-callback(mixer-callback_private);
-*/
return 0;
}
#endif
@@ -168,8 +160,6 @@
mixer-is_changed = 1;
-// fprintf(stderr,revents = %x\n, POLLIN, POLLNVAL, POLLERR = %x, %x,
%x\n,
-// revents, POLLIN, POLLNVAL, POLLERR);
if (revents POLLIN mixer-callback !amixer-update)
mixer-callback(mixer-callback_private);
@@ -284,16 +274,8 @@
snd_mixer_set_callback_private(handle, mixer);
mixer-name = mixer_name;
-
- if (mixer-name == NULL)
- {
-fprintf(stderr, Mixer %s was not listed\n, card);
- }
-
amixer-handle = handle;
-
mixer-system = ms;
-
mixer-elems = NULL;
for (i = 0, elem = snd_mixer_first_elem(handle); elem; elem =
snd_mixer_elem_next(elem))
@@ -318,11 +300,9 @@
mixer-elems = evas_list_append(mixer-elems, melem);
}
-
}
alsamixer_set_poll_handlers(mixer);
-
return mixer;
}
@@ -382,7 +362,6 @@
amixer = ALSAMIXER(mixer-local);
snd_mixer_handle_events(amixer-handle);
- //fprintf(stderr,mixer-is_changed = %d\n, mixer-is_changed);
if (mixer-is_changed)
{
snd_mixer_free(amixer-handle);
@@ -395,9 +374,7 @@
}
elem = snd_mixer_find_selem(amixer-handle, melem-local);
-
snd_mixer_selem_get_playback_volume(elem, 0, lvol);
-
snd_mixer_selem_get_playback_volume_range(elem, min, max);
if (snd_mixer_selem_is_playback_mono(elem))
@@ -422,17 +399,13 @@
mixer = melem-mixer;
amixer = ALSAMIXER(mixer-local);
-
-// fprintf(stderr,volume = (%d,%d)\n, left, right);
amixer-update = 1;
elem = snd_mixer_find_selem(amixer-handle, melem-local);
-
snd_mixer_selem_get_playback_volume_range(elem, min, max);
lvol = convert_from_percent(left, min, max);
rvol = convert_from_percent(right, min, max);
-// fprintf(stderr,cvolume = (%ld,%ld)\n, lvol, rvol);
snd_mixer_selem_set_playback_volume(elem, 0, lvol);
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume/data/themes/default Removed Files: volume_icon.png Log Message: Removed volume_icon.png to be replaced by module_icon.png so it shows in module config panel. --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume/data/themes/default Modified Files: Makefile.am Log Message: Updated to replace volume_icon with module_icon. === RCS file: /cvs/e/e_modules/evolume/data/themes/default/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 21 Mar 2006 02:12:18 - 1.1 +++ Makefile.am 6 Apr 2006 18:41:37 - 1.2 @@ -6,7 +6,7 @@ filesdir = @E_MODULES@/$(PACKAGE) -files_DATA = volume_icon.png \ +files_DATA = module_icon.png \ volume.edj EXTRA_DIST = ./default.edc \ --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume/data/themes/default Modified Files: Makefile.am Log Message: Missed a volume_icon.png - module_icon.png === RCS file: /cvs/e/e_modules/evolume/data/themes/default/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 6 Apr 2006 18:41:37 - 1.2 +++ Makefile.am 6 Apr 2006 18:46:17 - 1.3 @@ -22,7 +22,7 @@ ./images/volume_bar_vert.png \ ./images/bg.png \ ./images/over.png \ -./volume_icon.png +./module_icon.png volume.edj: Makefile $(EXTRA_DIST) --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume/src/lib Modified Files: alsa_mixer.c e_mixer.c Log Message: Removed some extra fprintf's. Be Quiet module !! === RCS file: /cvs/e/e_modules/evolume/src/lib/alsa_mixer.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- alsa_mixer.c6 Apr 2006 18:35:40 - 1.3 +++ alsa_mixer.c6 Apr 2006 19:12:27 - 1.4 @@ -17,9 +17,7 @@ int r; va_start(va, fmt); - fprintf(stderr, eVolume: ALSA mixer: ); r = vfprintf(stderr, fmt, va); - fprintf(stderr, \n); va_end(va); return r; } === RCS file: /cvs/e/e_modules/evolume/src/lib/e_mixer.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mixer.c 6 Apr 2006 18:32:38 - 1.3 +++ e_mixer.c 6 Apr 2006 19:12:27 - 1.4 @@ -22,9 +22,7 @@ int r; va_start(va, fmt); - fprintf(stderr, e_vol_module: ); r = vfprintf(stderr, fmt, va); - fprintf(stderr, \n); va_end(va); return r; } --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_main.h e_mod_cdialog.c e_mod_config.c e_mod_main.c
e_mod_pack.c e_mod_slider.c e_mod_util.c e_mod_volume.c
Log Message:
Removed some extra fprintfs (Be Quiet !!).
Allow this module to be configured from the Module Config Panel by providing
e_modapi_config function.
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.h5 Apr 2006 17:48:48 - 1.2
+++ e_mod_main.h6 Apr 2006 19:13:37 - 1.3
@@ -18,11 +18,19 @@
static char *
D_(char *str)
{
- fprintf(stderr, dgettext(%s, %s)\n, PACKAGE, str);
return dgettext(PACKAGE, str);
}
extern char *module_root;
extern char *module_theme;
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
+EAPI int e_modapi_info(E_Module *m);
+EAPI int e_modapi_about(E_Module *m);
+EAPI int e_modapi_config(E_Module *m);
#endif //E_MOD_MAIN_H_INCLUDED
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cdialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_cdialog.c 5 Apr 2006 17:48:48 - 1.3
+++ e_mod_cdialog.c 6 Apr 2006 19:13:37 - 1.4
@@ -60,7 +60,6 @@
mcfd = calloc(1, sizeof(Mixer_CFData));
mcfd-mixer = evas_list_data(l1);
- fprintf(stderr, mcfd-mixer-real = %s\n, mcfd-mixer-real);
mcfd-active = mcfd-mixer-active;
cfdata-mixers = evas_list_append(cfdata-mixers, mcfd);
}
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 5 Apr 2006 17:48:48 - 1.2
+++ e_mod_config.c 6 Apr 2006 19:13:37 - 1.3
@@ -115,7 +115,7 @@
#endif
#if 0
-fprintf(stderr, cms-system_id = %x, msn-system_id = %x\n,
cms-system_id, msn-system_id);
+DBG(stderr, cms-system_id = %x, msn-system_id = %x\n,
cms-system_id, msn-system_id);
#endif
if (SYSTEM_ID(cms-system_id) == SYSTEM_ID(msn-system_id))
return cms;
@@ -157,7 +157,7 @@
mixer_conf = evas_list_data(l);
#if 0
-fprintf(stderr, mixer_id1 = %x, mixer_id2 = %x\n,
mixer_conf-mixer_id, mixer_name-mixer_id);
+DBG(stderr, mixer_id1 = %x, mixer_id2 = %x\n, mixer_conf-mixer_id,
mixer_name-mixer_id);
#endif
if (MIXER_ID(mixer_conf-mixer_id) == MIXER_ID(mixer_name-mixer_id))
{
@@ -214,11 +214,11 @@
#endif
#if 0
-fprintf(stderr, elem-elem_id = %x, elem-elem_id = %x\n,
ELEM_ID(elem-elem_id), elem-elem_id);
+DBG(stderr, elem-elem_id = %x, elem-elem_id = %x\n,
ELEM_ID(elem-elem_id), elem-elem_id);
#endif
if (ELEM_ID(elem-elem_id) == ELEM_ID(melem-elem_id))
{
- fprintf(stderr, found: %x\n, elem-elem_id);
+ DBG(stderr, found: %x\n, elem-elem_id);
return elem;
}
}
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.c5 Apr 2006 17:48:48 - 1.2
+++ e_mod_main.c6 Apr 2006 19:13:37 - 1.3
@@ -16,6 +16,7 @@
#include e_mod_main.h
#include e_mod_volume.h
+#include e_mod_cdialog.h
char *module_root = NULL;
char *module_theme = NULL;
@@ -40,7 +41,6 @@
snprintf(buf, 128, %s/volume.edj, module_root);
module_theme = strdup(buf);
- fprintf(stderr, module_theme = %s\n, module_theme);
}
/* actually init buttons */
@@ -71,7 +71,6 @@
Volume *volume;
volume = module-data;
-// DBG(stderr,conf_edd = %p, volume-conf = %p\n, conf_edd, volume-conf);
e_config_domain_save(module.evolume, conf_edd, volume-conf);
return 1;
}
@@ -81,7 +80,7 @@
{
char buf[1024];
- snprintf(buf, 1024, %s/volume_icon.png, module_root);
+ snprintf(buf, 1024, %s/module_icon.png, module_root);
module-icon_file = strdup(buf);
return 1;
}
@@ -89,6 +88,38 @@
int
e_modapi_about(E_Module *module __UNUSED__)
{
- e_module_dialog_show(Enlightenment Button Module, A simple module to
give E17 a volume control for some mixers.);
+ e_module_dialog_show(_(Enlightenment Evolume Module),
+ _(A simple module to give E17 a volume control for
some mixers.));
return 1;
+}
+
+int
+e_modapi_config(E_Module *module)
+{
+ Volume *v;
+ E_Container *con;
+ Evas_List
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume/src/module Modified Files: e_mod_menu.c Log Message: Move Configuration before Edit on the menu like other modules. === RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_menu.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_menu.c6 Apr 2006 19:23:44 - 1.4 +++ e_mod_menu.c6 Apr 2006 23:25:18 - 1.5 @@ -156,12 +156,12 @@ e_menu_item_separator_set(mi, 1); mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, D_(Edit Mode)); - e_util_menu_item_edje_icon_set(mi, enlightenment/gadgets); - e_menu_item_callback_set(mi, _volume_cb_menu_edit, (void *)face); - - mi = e_menu_item_new(mn); e_menu_item_label_set(mi, D_(Configuration)); e_util_menu_item_edje_icon_set(mi, enlightenment/configuration); e_menu_item_callback_set(mi, _volume_cb_configure, (void *)face); + + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, D_(Edit Mode)); + e_util_menu_item_edje_icon_set(mi, enlightenment/gadgets); + e_menu_item_callback_set(mi, _volume_cb_menu_edit, (void *)face); } --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume Dir : e_modules/evolume/src/module Modified Files: Makefile.am Log Message: Make evolume build again by changing module_la_dependencies to use libemixer.la not libemixer.a after vapier's recent changes. === RCS file: /cvs/e/e_modules/evolume/src/module/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 21 Mar 2006 02:12:19 - 1.1 +++ Makefile.am 1 Apr 2006 10:41:59 - 1.2 @@ -41,4 +41,4 @@ module_la_LIBADD = @e_libs@ -lm -L../lib/ -lemixer module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/src/lib/libemixer.a +module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/src/lib/libemixer.la --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_cmdialog.h e_mod_cmdialog.c e_mod_cdialog.c
Log Message:
Good bye EVolume Segfault :)
Now Auto-Apply compliant too.
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cmdialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_cmdialog.h21 Mar 2006 02:12:20 - 1.1
+++ e_mod_cmdialog.h28 Mar 2006 20:30:39 - 1.2
@@ -1,8 +1,6 @@
-
#ifndef E_MOD_CMDIALOG_H_INCLUDED
#define E_MOD_CMDIALOG_H_INCLUDED
-
-void e_volume_config_mixer(Volume_Face *face, Config_Mixer* mixer_conf);
+void e_volume_config_mixer(void *data, void *data2);
#endif// E_MOD_CMDIALOG_H_INCLUDED
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cmdialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_cmdialog.c21 Mar 2006 02:12:20 - 1.1
+++ e_mod_cmdialog.c28 Mar 2006 20:30:39 - 1.2
@@ -32,31 +32,30 @@
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-void e_volume_config_mixer(Volume_Face *face,
- Config_Mixer* mixer_conf)
+void e_volume_config_mixer(void *data, void *data2)
{
+ Volume_Face *face;
+ Config_Mixer *mixer_conf;
E_Config_Dialog* cfd;
- E_Config_Dialog_View v;
+ E_Config_Dialog_View *v;
struct _cfg *c;
- v.create_cfdata = _create_data;
- v.free_cfdata = _free_data;
- v.basic.apply_cfdata = _basic_apply_data;
- v.basic.create_widgets = _basic_create_widgets;
- v.advanced.apply_cfdata = NULL;
- v.advanced.create_widgets = NULL;
- /*
- v.advanced.apply_cfdata = _advanced_apply_data;
- v.advanced.create_widgets = _advanced_create_widgets;
- */
+ face = data;
+ mixer_conf = data2;
+
+ 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;
+ v-advanced.apply_cfdata = NULL;
+ v-advanced.create_widgets = NULL;
c = malloc(sizeof(struct _cfg));
c-mixer_conf = mixer_conf;
c-face = face;
- cfd = e_config_dialog_new(face-con, _(Mixer Face Configuration),
NULL, 0, v, c);
+ cfd = e_config_dialog_new(face-con, _(Mixer Face Configuration),
NULL, 0, v, c);
}
@@ -91,6 +90,7 @@
_free_data(E_Config_Dialog* cfd, CFData* cfdata)
{
Evas_List *l;
+
for(l = cfdata-elems; l; l = evas_list_next(l))
{
Elem_CFData* d;
@@ -119,11 +119,11 @@
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, D_(Mixer Configuration), 0);
- for(l = cfdata-elems, i = 0; l; l = evas_list_next(l), i++)
+ for(l = cfdata-elems, i = 0; l; l = l-next, i++)
{
Evas_Object *olabel, *oact, *obal, *ot;
Elem_CFData* ecfd;
- ecfd = evas_list_data(l);
+ ecfd = l-data;
ot = e_widget_table_add(evas, 0);
@@ -147,8 +147,9 @@
{
Evas_List *l;
struct _cfg* c;
- c = cfd-data;
int u;
+
+ c = cfd-data;
for(l = cfdata-elems; l; l = evas_list_next(l))
{
Elem_CFData* ecfd;
@@ -159,25 +160,8 @@
{
ecfd-elem-active = ecfd-active;
ecfd-elem-balance = ecfd-balance;
-
- e_volume_face_mixer_elem_update(c-face,
- ecfd-elem, cfdata-mixer_conf);
+ e_volume_face_mixer_elem_update(c-face, ecfd-elem,
cfdata-mixer_conf);
}
}
return 1;
}
-
-
-static Evas_Object
-*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
-
-{
- return NULL;
-}
-
-static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
-{
- return 1;
-}
-
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cdialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_cdialog.c 21 Mar 2006 02:12:20 - 1.1
+++ e_mod_cdialog.c 28 Mar 2006 20:30:39 - 1.2
@@ -26,26 +26,21 @@
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
E CVS: evolume devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : evolume
Dir : e_modules/evolume/src/module
Modified Files:
e_mod_menu.c
Log Message:
Some attempt at consistency across module menus.
Cannot include the modules icon itself on the face menu due to the way this
module was coded.
===
RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_menu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_menu.c21 Mar 2006 02:12:20 - 1.1
+++ e_mod_menu.c29 Mar 2006 01:56:54 - 1.2
@@ -124,33 +124,33 @@
Evas_List *l;
E_Menu *mn, *sm, *om;
E_Menu_Item* mi;
-
+
mn = e_menu_new();
face-menu = mn;
- e_object_data_set(E_OBJECT(mn), face);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, D_(Edit Mode));
- e_menu_item_callback_set(mi, _volume_cb_menu_edit, (void*)face);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, D_(Configure));
- e_menu_item_callback_set(mi, _volume_cb_configure, (void*)face);
-
-
- {
+ {
/* Face Menu */
sm = e_menu_new();
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, D_(Face));
+ e_menu_item_label_set(mi, D_(Faces));
e_menu_item_submenu_set(mi, sm);
mi = e_menu_item_new(sm);
e_menu_item_label_set(mi, D_(Remove Face));
e_menu_item_callback_set(mi, _volume_remove_face_cb,
(void*)face);
- }
+ }
+
+ e_object_data_set(E_OBJECT(mn), face);
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, D_(Edit Mode));
+ e_util_menu_item_edje_icon_set(mi, enlightenment/gadgets);
+ e_menu_item_callback_set(mi, _volume_cb_menu_edit, (void*)face);
- /* End of face menu */
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, D_(Configuration));
+ e_util_menu_item_edje_icon_set(mi, enlightenment/configuration);
+ e_menu_item_callback_set(mi, _volume_cb_configure, (void*)face);
}
+
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
