[alsa-cvslog] CVS: alsa-kernel/include version.h,1.26,1.27
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1:/tmp/cvs-serv10808 Modified Files: version.h Log Message: Updated to 0.9.8 Index: version.h === RCS file: /cvsroot/alsa/alsa-kernel/include/version.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- version.h 13 Oct 2003 16:27:58 - 1.26 +++ version.h 21 Oct 2003 17:43:25 - 1.27 @@ -1,3 +1,3 @@ /* include/version.h. Generated by configure. */ -#define CONFIG_SND_VERSION "0.9.7c" +#define CONFIG_SND_VERSION "0.9.8" #define CONFIG_SND_DATE "" --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib configure.in,1.113,1.114
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv10375
Modified Files:
configure.in
Log Message:
0.9.8
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- configure.in25 Sep 2003 19:57:58 - 1.113
+++ configure.in21 Oct 2003 17:41:17 - 1.114
@@ -8,7 +8,7 @@
dnl remove API = c+1:0:0
dnl *
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 0.9.7)
+AM_INIT_AUTOMAKE(alsa-lib, 0.9.8)
eval LIBTOOL_VERSION_INFO="2:0:0"
dnl *
AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools Makefile,1.27,1.28
Update of /cvsroot/alsa/alsa-tools In directory sc8-pr-cvs1:/tmp/cvs-serv10923 Modified Files: Makefile Log Message: 0.9.8 Index: Makefile === RCS file: /cvsroot/alsa/alsa-tools/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile6 Oct 2003 15:57:22 - 1.27 +++ Makefile21 Oct 2003 17:44:03 - 1.28 @@ -1,4 +1,4 @@ -VERSION = 0.9.7 +VERSION = 0.9.8 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \ --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss configure.in,1.17,1.18
Update of /cvsroot/alsa/alsa-oss In directory sc8-pr-cvs1:/tmp/cvs-serv10858 Modified Files: configure.in Log Message: 0.9.8 Index: configure.in === RCS file: /cvsroot/alsa/alsa-oss/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- configure.in28 Jul 2003 12:22:05 - 1.17 +++ configure.in21 Oct 2003 17:43:46 - 1.18 @@ -1,5 +1,5 @@ AC_INIT(alsa-oss.c) -AM_INIT_AUTOMAKE(alsa-oss, 0.9.6) +AM_INIT_AUTOMAKE(alsa-oss, 0.9.8) AC_PREFIX_DEFAULT(/usr) --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include asound.h,1.32,1.33
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/include
Modified Files:
asound.h
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function
Index: asound.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/asound.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- asound.h8 Sep 2003 10:58:07 - 1.32
+++ asound.h21 Oct 2003 17:40:14 - 1.33
@@ -683,7 +683,7 @@
* *
/
-#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 3)
struct sndrv_ctl_card_info {
int card; /* card number */
@@ -728,6 +728,7 @@
#define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually
nothing, but may be updated */
#define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */
#define SNDRV_CTL_ELEM_ACCESS_OWNER(1<<10) /* write lock owner */
+#define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */
#define SNDRV_CTL_ELEM_ACCESS_DINDIRECT(1<<30) /* indirect access for
matrix dimensions in the info structure */
#define SNDRV_CTL_ELEM_ACCESS_INDIRECT (1<<31) /* indirect access for element
value in the value structure */
@@ -824,6 +825,9 @@
SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int),
+ SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct sndrv_ctl_elem_info),
+ SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct sndrv_ctl_elem_info),
+ SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct sndrv_hwdep_info),
SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int),
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core control.c,1.38,1.39
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/core
Modified Files:
control.c
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function
Index: control.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/control.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- control.c 30 Sep 2003 09:28:26 - 1.38
+++ control.c 21 Oct 2003 17:40:13 - 1.39
@@ -37,6 +37,9 @@
#define snd_kctl_ioctl(n) list_entry(n, snd_kctl_ioctl_t, list)
+/* find id without lock */
+static snd_kcontrol_t *_ctl_find_id(snd_card_t * card, snd_ctl_elem_id_t *id);
+
static DECLARE_RWSEM(snd_ioctl_rwsem);
static LIST_HEAD(snd_control_ioctls);
@@ -262,6 +265,8 @@
* snd_ctl_new1() to the given card.
*
* Returns zero if successful, or a negative error code on failure.
+ *
+ * It frees automatically the control which cannot be added.
*/
int snd_ctl_add(snd_card_t * card, snd_kcontrol_t * kcontrol)
{
@@ -270,13 +275,23 @@
snd_runtime_check(card != NULL && kcontrol != NULL, return -EINVAL);
snd_assert(kcontrol->info != NULL, return -EINVAL);
+ id = kcontrol->id;
down_write(&card->controls_rwsem);
+ if (_ctl_find_id(card, &id)) {
+ up_write(&card->controls_rwsem);
+ snd_ctl_free_one(kcontrol);
+ return -EBUSY;
+ }
+ if (card->last_numid > 0x8000 && card->last_numid + kcontrol->count <
0x8000) {
+ up_write(&card->controls_rwsem);
+ snd_ctl_free_one(kcontrol);
+ return -ENOMEM; /* FIXME: find a hole */
+ }
list_add_tail(&kcontrol->list, &card->controls);
card->controls_count += kcontrol->count;
kcontrol->id.numid = card->last_numid + 1;
card->last_numid += kcontrol->count;
up_write(&card->controls_rwsem);
- id = kcontrol->id;
for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
return 0;
@@ -288,7 +303,8 @@
* @kcontrol: the control instance to remove
*
* Removes the control from the card and then releases the instance.
- * You don't need to call snd_ctl_free_one().
+ * You don't need to call snd_ctl_free_one(). You must be in
+ * the write lock - down_write(&card->controls_rwsem).
*
* Returns 0 if successful, or a negative error code on failure.
*/
@@ -298,10 +314,8 @@
unsigned int idx;
snd_runtime_check(card != NULL && kcontrol != NULL, return -EINVAL);
- down_write(&card->controls_rwsem);
list_del(&kcontrol->list);
card->controls_count -= kcontrol->count;
- up_write(&card->controls_rwsem);
id = kcontrol->id;
for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_REMOVE, &id);
@@ -322,15 +336,50 @@
int snd_ctl_remove_id(snd_card_t * card, snd_ctl_elem_id_t *id)
{
snd_kcontrol_t *kctl;
+ int ret;
- kctl = snd_ctl_find_id(card, id);
- if (kctl == NULL)
+ down_write(&card->controls_rwsem);
+ kctl = _ctl_find_id(card, id);
+ if (kctl == NULL) {
+ up_write(&card->controls_rwsem);
return -ENOENT;
- return snd_ctl_remove(card, kctl);
+ }
+ ret = snd_ctl_remove(card, kctl);
+ up_write(&card->controls_rwsem);
+ return ret;
}
-static snd_kcontrol_t *_ctl_find_id
-(snd_card_t * card, snd_ctl_elem_id_t *id); /* w/o lock */
+/**
+ * snd_ctl_remove_unlocked_id - remove the unlocked control of the given id and
release it
+ * @file: active control handle
+ * @id: the control id to remove
+ *
+ * Finds the control instance with the given id, removes it from the
+ * card list and releases it.
+ *
+ * Returns 0 if successful, or a negative error code on failure.
+ */
+static int snd_ctl_remove_unlocked_id(snd_ctl_file_t * file, snd_ctl_elem_id_t *id)
+{
+ snd_card_t *card = file->card;
+ snd_kcontrol_t *kctl;
+ int idx, ret;
+
+ down_write(&card->controls_rwsem);
+ kctl = _ctl_find_id(card, id);
+ if (kctl == NULL) {
+ up_write(&card->controls_rwsem);
+ return -ENOENT;
+ }
+ for (idx = 0; idx < kctl->count; idx++)
+ if (kctl->vd[idx].owner != NULL && kctl->vd[idx].owner != file) {
+ up_write(&card->controls_rwsem);
+ return -EBUSY;
+ }
+ ret = snd_ctl_remove(card, kctl);
+ up_write(&card->controls_rwsem);
+ return ret;
+}
/**
* snd_ctl_rename_id - replace the id of a control on the card
@@ -564,7 +613,6 @@
static int snd_ctl_elem_read(snd_card_t *card, snd_ctl_elem_value_t *_control)
{
-
snd_ctl_elem_value_t *control;
[alsa-cvslog] CVS: alsa-driver configure.in,1.197,1.198
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv10308 Modified Files: configure.in Log Message: 0.9.8 Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- configure.in14 Oct 2003 15:18:06 - 1.197 +++ configure.in21 Oct 2003 17:40:58 - 1.198 @@ -4,7 +4,7 @@ AC_INIT(acore/sound.patch) AC_PREFIX_DEFAULT(/usr) -CONFIG_SND_VERSION="0.9.7c" +CONFIG_SND_VERSION="0.9.8" dnl Checks for programs. AC_PROG_CC --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/control control.c,1.99,1.100 control_hw.c,1.38,1.39 control_local.h,1.29,1.30
Update of /cvsroot/alsa/alsa-lib/src/control
In directory sc8-pr-cvs1:/tmp/cvs-serv9895/src/control
Modified Files:
control.c control_hw.c control_local.h
Log Message:
- added support for user control elements
Index: control.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- control.c 29 Jul 2003 13:19:19 - 1.99
+++ control.c 21 Oct 2003 17:39:14 - 1.100
@@ -253,6 +253,48 @@
}
/**
+ * \brief Create and add an user CTL element
+ * \param ctl CTL handle
+ * \param info CTL element info
+ * \return 0 on success otherwise a negative error code
+ *
+ * Note that the new element is locked!
+ */
+int snd_ctl_elem_add(snd_ctl_t *ctl, snd_ctl_elem_info_t *info)
+{
+ assert(ctl && info && info->id.name[0]);
+ return ctl->ops->element_add(ctl, info);
+}
+
+/**
+ * \brief Replace an user CTL element
+ * \param ctl CTL handle
+ * \param info CTL element info
+ * \return 0 on success otherwise a negative error code
+ *
+ * Note that the new element is locked!
+ */
+int snd_ctl_elem_replace(snd_ctl_t *ctl, snd_ctl_elem_info_t *info)
+{
+ assert(ctl && info && info->id.name[0]);
+ return ctl->ops->element_replace(ctl, info);
+}
+
+/**
+ * \brief Remove an user CTL element
+ * \param ctl CTL handle
+ * \param id CTL element identification
+ * \return 0 on success otherwise a negative error code
+ *
+ * Note that the new element is locked!
+ */
+int snd_ctl_elem_remove(snd_ctl_t *ctl, snd_ctl_elem_id_t *id)
+{
+ assert(ctl && id && (id->name[0] || id->numid));
+ return ctl->ops->element_remove(ctl, id);
+}
+
+/**
* \brief Get CTL element value
* \param ctl CTL handle
* \param control CTL element id/value pointer
Index: control_hw.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control_hw.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- control_hw.c25 Jul 2003 17:02:01 - 1.38
+++ control_hw.c21 Oct 2003 17:39:15 - 1.39
@@ -39,7 +39,7 @@
#endif
#define SNDRV_FILE_CONTROL "/dev/snd/controlC%i"
-#define SNDRV_CTL_VERSION_MAX SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_CTL_VERSION_MAX SNDRV_PROTOCOL_VERSION(2, 0, 3)
typedef struct {
int card;
@@ -142,6 +142,30 @@
return 0;
}
+static int snd_ctl_hw_elem_add(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
+{
+ snd_ctl_hw_t *hw = handle->private_data;
+ if (ioctl(hw->fd, SNDRV_CTL_IOCTL_ELEM_ADD, info) < 0)
+ return -errno;
+ return 0;
+}
+
+static int snd_ctl_hw_elem_replace(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
+{
+ snd_ctl_hw_t *hw = handle->private_data;
+ if (ioctl(hw->fd, SNDRV_CTL_IOCTL_ELEM_REPLACE, info) < 0)
+ return -errno;
+ return 0;
+}
+
+static int snd_ctl_hw_elem_remove(snd_ctl_t *handle, snd_ctl_elem_id_t *id)
+{
+ snd_ctl_hw_t *hw = handle->private_data;
+ if (ioctl(hw->fd, SNDRV_CTL_IOCTL_ELEM_REMOVE, id) < 0)
+ return -errno;
+ return 0;
+}
+
static int snd_ctl_hw_elem_read(snd_ctl_t *handle, snd_ctl_elem_value_t *control)
{
snd_ctl_hw_t *hw = handle->private_data;
@@ -272,6 +296,9 @@
.card_info = snd_ctl_hw_card_info,
.element_list = snd_ctl_hw_elem_list,
.element_info = snd_ctl_hw_elem_info,
+ .element_add = snd_ctl_hw_elem_add,
+ .element_replace = snd_ctl_hw_elem_replace,
+ .element_remove = snd_ctl_hw_elem_remove,
.element_read = snd_ctl_hw_elem_read,
.element_write = snd_ctl_hw_elem_write,
.element_lock = snd_ctl_hw_elem_lock,
Index: control_local.h
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control_local.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- control_local.h 7 Nov 2002 15:18:47 - 1.29
+++ control_local.h 21 Oct 2003 17:39:15 - 1.30
@@ -29,6 +29,9 @@
int (*card_info)(snd_ctl_t *handle, snd_ctl_card_info_t *info);
int (*element_list)(snd_ctl_t *handle, snd_ctl_elem_list_t *list);
int (*element_info)(snd_ctl_t *handle, snd_ctl_elem_info_t *info);
+ int (*element_add)(snd_ctl_t *handle, snd_ctl_elem_info_t *info);
+ int (*element_replace)(snd_ctl_t *handle, snd_ctl_elem_info_t *info);
+ int (*element_remove)(snd_ctl_t *handle, snd_ctl_elem_id_t *id);
int (*element_read)(snd_ctl_t *handle, snd_ctl_elem_value_t *control);
int (*element_write)(snd_ctl_t *handle, snd_ctl_elem_value_t *control);
int (*element_lock)(snd_ctl_t *handle, snd_ctl_elem_id_t *lock);
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emufx.c,1.42,1.43
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/pci/emu10k1
Modified Files:
emufx.c
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function
Index: emufx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- emufx.c 17 Oct 2003 15:39:52 - 1.42
+++ emufx.c 21 Oct 2003 17:40:14 - 1.43
@@ -1009,13 +1009,16 @@
unsigned int i;
snd_ctl_elem_id_t *_id, id;
snd_emu10k1_fx8010_ctl_t *ctl;
+ snd_card_t *card = emu->card;
for (i = 0, _id = icode->gpr_del_controls;
i < icode->gpr_del_control_count; i++, _id++) {
snd_runtime_check(copy_from_user(&id, _id, sizeof(id)) == 0, continue);
+ down_write(&card->controls_rwsem);
ctl = snd_emu10k1_look_for_ctl(emu, &id);
- snd_runtime_check(ctl == NULL, continue);
- snd_ctl_remove(emu->card, ctl->kcontrol);
+ if (ctl)
+ snd_ctl_remove(card, ctl->kcontrol);
+ up_write(&card->controls_rwsem);
}
}
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils configure.in,1.65,1.66
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1:/tmp/cvs-serv10416 Modified Files: configure.in Log Message: 0.9.8 Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- configure.in25 Sep 2003 19:53:43 - 1.65 +++ configure.in21 Oct 2003 17:41:36 - 1.66 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(alsamixer/alsamixer.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 0.9.7) +AM_INIT_AUTOMAKE(alsa-utils, 0.9.8) dnl Checks for programs. --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src Versions,1.15,1.16
Update of /cvsroot/alsa/alsa-lib/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9895/src
Modified Files:
Versions
Log Message:
- added support for user control elements
Index: Versions
===
RCS file: /cvsroot/alsa/alsa-lib/src/Versions,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Versions13 Oct 2003 12:06:45 - 1.15
+++ Versions21 Oct 2003 17:39:14 - 1.16
@@ -139,5 +139,8 @@
ALSA_0.9.8 {
global:
+snd_ctl_elem_add;
+snd_ctl_elem_replace;
+snd_ctl_elem_remove;
snd_hctl_poll_descriptors_revents;
} ALSA_0.9.7;
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/include/sound asound.h,1.7,1.8
Update of /cvsroot/alsa/alsa-lib/include/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv9895/include/sound
Modified Files:
asound.h
Log Message:
- added support for user control elements
Index: asound.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/sound/asound.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- asound.h25 Jul 2003 17:23:18 - 1.7
+++ asound.h21 Oct 2003 17:39:14 - 1.8
@@ -106,9 +106,10 @@
SNDRV_HWDEP_IFACE_SSCAPE, /* Ensoniq SoundScape ISA card (MC68EC000) */
SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */
SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */
+ SNDRV_HWDEP_IFACE_USX2Y,/* Tascam US122, US224 & US428 usb */
/* Don't forget to change the following: */
- SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_MIXART,
+ SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USX2Y,
};
struct sndrv_hwdep_info {
@@ -682,7 +683,7 @@
* *
/
-#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 3)
struct sndrv_ctl_card_info {
int card; /* card number */
@@ -727,6 +728,7 @@
#define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually
nothing, but may be updated */
#define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */
#define SNDRV_CTL_ELEM_ACCESS_OWNER(1<<10) /* write lock owner */
+#define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */
#define SNDRV_CTL_ELEM_ACCESS_DINDIRECT(1<<30) /* indirect access for
matrix dimensions in the info structure */
#define SNDRV_CTL_ELEM_ACCESS_INDIRECT (1<<31) /* indirect access for element
value in the value structure */
@@ -823,6 +825,9 @@
SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int),
+ SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct sndrv_ctl_elem_info),
+ SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct sndrv_ctl_elem_info),
+ SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct sndrv_hwdep_info),
SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int),
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core hwdep.c,1.22,1.23
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1:/tmp/cvs-serv19425 Modified Files: hwdep.c Log Message: allow dsp_load callback without dsp_status callback. Index: hwdep.c === RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- hwdep.c 30 Sep 2003 09:28:26 - 1.22 +++ hwdep.c 21 Oct 2003 09:52:46 - 1.23 @@ -214,7 +214,7 @@ snd_hwdep_dsp_image_t info; int err; - if (! hw->ops.dsp_load || ! hw->ops.dsp_status) + if (! hw->ops.dsp_load) return -ENXIO; memset(&info, 0, sizeof(info)); if (copy_from_user(&info, _info, sizeof(info))) --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core pcm_native.c,1.83,1.84
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv19234
Modified Files:
pcm_native.c
Log Message:
- don't hold power lock while draining
- call trigger callback when suspending/resuming a draining substream
Index: pcm_native.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_native.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- pcm_native.c10 Oct 2003 14:44:56 - 1.83
+++ pcm_native.c21 Oct 2003 09:51:35 - 1.84
@@ -888,7 +888,8 @@
snd_pcm_runtime_t *runtime = substream->runtime;
if (runtime->trigger_master != substream)
return 0;
- if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING)
+ if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING &&
+ runtime->status->suspended_state != SNDRV_PCM_STATE_DRAINING)
return 0;
return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);
}
@@ -962,7 +963,8 @@
snd_pcm_runtime_t *runtime = substream->runtime;
if (runtime->trigger_master != substream)
return 0;
- if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING)
+ if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING &&
+ runtime->status->suspended_state != SNDRV_PCM_STATE_DRAINING)
return 0;
return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_RESUME);
}
@@ -1243,7 +1245,9 @@
}
set_current_state(TASK_INTERRUPTIBLE);
snd_pcm_stream_unlock_irq(substream);
+ snd_power_unlock(card);
tout = schedule_timeout(10 * HZ);
+ snd_power_lock(card);
snd_pcm_stream_lock_irq(substream);
if (tout == 0) {
state = runtime->status->state == SNDRV_PCM_STATE_SUSPENDED ?
SUSPENDED : EXPIRED;
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
