Update of /cvsroot/alsa/alsa-lib/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13407/src
Modified Files:
Makefile.am Versions conf.c
Log Message:
added snd_user_file() function
alisp extensions
- added nth, include, path commands
- added auto-exec functionality
- added helpers for C<->lisp interoperability
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile.am 24 Jun 2003 19:30:08 -0000 1.49
+++ Makefile.am 3 Sep 2003 19:25:08 -0000 1.50
@@ -9,7 +9,7 @@
endif
lib_LTLIBRARIES = libasound.la
-libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c
socket.c shmarea.c
+libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c
socket.c shmarea.c userfile.c
libasound_la_LIBADD = control/libcontrol.la \
mixer/libmixer.la ordinary_mixer/libordinarymixer.la \
pcm/libpcm.la ordinary_pcm/libordinarypcm.la \
Index: Versions
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/Versions,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Versions 27 Jul 2003 20:20:26 -0000 1.12
+++ Versions 3 Sep 2003 19:25:08 -0000 1.13
@@ -126,3 +126,11 @@
snd_seq_port_info_set_timestamp_real;
snd_seq_port_info_set_timestamp_queue;
} ALSA_0.9.5;
+
+ALSA_0.9.7 {
+ global:
+
+ snd_user_file;
+ sndo_*;
+ alsa_lisp_*;
+} ALSA_0.9.6;
Index: conf.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/conf.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- conf.c 23 Apr 2003 08:01:07 -0000 1.67
+++ conf.c 3 Sep 2003 19:25:08 -0000 1.68
@@ -2780,30 +2780,12 @@
goto _err;
}
if (i == idx) {
- wordexp_t we;
char *name;
if ((err = snd_config_get_ascii(n, &name)) < 0)
goto _err;
- err = wordexp(name, &we, WRDE_NOCMD);
- switch (err) {
- case WRDE_NOSPACE:
- err = -ENOMEM;
+ if ((err = snd_user_file(name, &fi[idx].name)) < 0)
goto _err;
- case 0:
- if (we.we_wordc == 1)
- break;
- /* Fall through */
- default:
- err = -EINVAL;
- goto _err;
- }
- fi[idx].name = strdup(we.we_wordv[0]);
- wordfree(&we);
free(name);
- if (fi[idx].name == NULL) {
- err = -ENOMEM;
- goto _err;
- }
idx++;
hit = 1;
}
@@ -2924,7 +2906,6 @@
int err;
const char *configs, *c;
unsigned int k;
- wordexp_t we;
size_t l;
snd_config_update_t *local;
snd_config_update_t *update;
@@ -2963,25 +2944,9 @@
char name[l + 1];
memcpy(name, c, l);
name[l] = 0;
- err = wordexp(name, &we, WRDE_NOCMD);
- switch (err) {
- case WRDE_NOSPACE:
- err = -ENOMEM;
- goto _end;
- case 0:
- if (we.we_wordc == 1)
- break;
- /* Fall through */
- default:
- err = -EINVAL;
- goto _end;
- }
- local->finfo[k].name = strdup(we.we_wordv[0]);
- wordfree(&we);
- if (!local->finfo[k].name) {
- err = -ENOMEM;
+ err = snd_user_file(name, &local->finfo[k].name);
+ if (err < 0)
goto _end;
- }
c += l;
k++;
if (!*c)
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
