[alsa-cvslog] CVS: alsa-kernel/drivers/opl4 opl4_proc.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/drivers/opl4
In directory sc8-pr-cvs1:/tmp/cvs-serv3501
Modified Files:
opl4_proc.c
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
use vmalloc instead of kmalloc for temp buffer in proc read()/write()
Index: opl4_proc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl4/opl4_proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opl4_proc.c 23 May 2003 11:15:12 - 1.1
+++ opl4_proc.c 3 Nov 2003 10:30:47 - 1.2
@@ -18,6 +18,7 @@
*/
#include opl4_local.h
+#include linux/vmalloc.h
#include sound/info.h
#ifdef CONFIG_PROC_FS
@@ -59,7 +60,7 @@
if (file-f_pos + size entry-size)
size = entry-size - file-f_pos;
if (size 0) {
- buf = kmalloc(size, GFP_KERNEL);
+ buf = vmalloc(size);
if (!buf)
return -ENOMEM;
snd_opl4_read_memory(opl4, buf, file-f_pos, size);
@@ -67,7 +68,7 @@
kfree(buf);
return -EFAULT;
}
- kfree(buf);
+ vfree(buf);
file-f_pos += size;
return size;
}
@@ -85,7 +86,7 @@
if (file-f_pos + size entry-size)
size = entry-size - file-f_pos;
if (size 0) {
- buf = kmalloc(size, GFP_KERNEL);
+ buf = vmalloc(size);
if (!buf)
return -ENOMEM;
if (copy_from_user(buf, _buf, size)) {
@@ -93,7 +94,7 @@
return -EFAULT;
}
snd_opl4_write_memory(opl4, buf, file-f_pos, size);
- kfree(buf);
+ vfree(buf);
file-f_pos += size;
return size;
}
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/control control.c,1.100,1.101
Update of /cvsroot/alsa/alsa-lib/src/control
In directory sc8-pr-cvs1:/tmp/cvs-serv3774
Modified Files:
control.c
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
clear element count when freeing space in element list
Index: control.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- control.c 21 Oct 2003 17:39:14 - 1.100
+++ control.c 3 Nov 2003 10:31:50 - 1.101
@@ -781,6 +781,7 @@
{
free(obj-pids);
obj-pids = NULL;
+ obj-space = 0;
}
/**
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.110,1.111 ac97_patch.c,1.28,1.29 ac97_patch.h,1.10,1.11
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv5389
Modified Files:
ac97_codec.c ac97_patch.c ac97_patch.h
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
new controls for AD1981A/B/1980/1985
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ac97_codec.c27 Oct 2003 10:48:41 - 1.110
+++ ac97_codec.c3 Nov 2003 10:42:12 - 1.111
@@ -101,8 +101,8 @@
{ 0x41445362, 0x, AD1887,patch_ad1881, NULL },
{ 0x41445363, 0x, AD1886A, patch_ad1881, NULL },
{ 0x41445370, 0x, AD1980,patch_ad1980, NULL },
-{ 0x41445372, 0x, AD1981A, patch_ad1881, NULL },
-{ 0x41445374, 0x, AD1981B, patch_ad1881, NULL },
+{ 0x41445372, 0x, AD1981A, patch_ad1981a, NULL },
+{ 0x41445374, 0x, AD1981B, patch_ad1981b, NULL },
{ 0x41445375, 0x, AD1985,patch_ad1985, NULL },
{ 0x414c4300, 0xfff0, RL5306,NULL, NULL },
{ 0x414c4310, 0xfff0, RL5382,NULL, NULL },
Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ac97_patch.c27 Oct 2003 10:48:42 - 1.28
+++ ac97_patch.c3 Nov 2003 10:42:13 - 1.29
@@ -708,7 +708,7 @@
#define AC97_AD198X_2MIC 0x0040 /* 2-channel mic select */
#define AC97_AD198X_SPRD 0x0080 /* SPREAD enable */
#define AC97_AD198X_DMIX0 0x0100 /* downmix mode: 0 = 6-to-4, 1 = 6-to-2
downmix */
-#define AC97_AD198X_DMIX1 0x0300 /* downmix mode: 1 = enabled */
+#define AC97_AD198X_DMIX1 0x0200 /* downmix mode: 1 = enabled */
#define AC97_AD198X_HPSEL 0x0400 /* headphone amplifier input select */
#define AC97_AD198X_CLDIS 0x0800 /* center/lfe disable */
#define AC97_AD198X_LODIS 0x1000 /* LINE_OUT disable */
@@ -717,7 +717,7 @@
#define AC97_AD198X_DACZ 0x8000 /* DAC zero-fill mode */
-static int snd_ac97_ad1980_spdif_source_info(snd_kcontrol_t *kcontrol,
snd_ctl_elem_info_t * uinfo)
+static int snd_ac97_ad198x_spdif_source_info(snd_kcontrol_t *kcontrol,
snd_ctl_elem_info_t * uinfo)
{
static char *texts[2] = { AC-Link, A/D Converter };
@@ -730,7 +730,7 @@
return 0;
}
-static int snd_ac97_ad1980_spdif_source_get(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
+static int snd_ac97_ad198x_spdif_source_get(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val;
@@ -740,7 +740,7 @@
return 0;
}
-static int snd_ac97_ad1980_spdif_source_put(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
+static int snd_ac97_ad198x_spdif_source_put(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val;
@@ -751,31 +751,162 @@
return snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x0004, val);
}
-static const snd_kcontrol_new_t snd_ac97_ad1980_spdif_source = {
+static const snd_kcontrol_new_t snd_ac97_ad198x_spdif_source = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958(,PLAYBACK,NONE) Source,
- .info = snd_ac97_ad1980_spdif_source_info,
- .get= snd_ac97_ad1980_spdif_source_get,
- .put= snd_ac97_ad1980_spdif_source_put,
+ .info = snd_ac97_ad198x_spdif_source_info,
+ .get= snd_ac97_ad198x_spdif_source_get,
+ .put= snd_ac97_ad198x_spdif_source_put,
};
-static int patch_ad1980_post_spdif(ac97_t * ac97)
+static int patch_ad198x_post_spdif(ac97_t * ac97)
{
- return patch_build_controls(ac97, snd_ac97_ad1980_spdif_source, 1);
+ return patch_build_controls(ac97, snd_ac97_ad198x_spdif_source, 1);
}
+static struct snd_ac97_build_ops patch_ad1981a_build_ops = {
+ .build_post_spdif = patch_ad198x_post_spdif
+};
+
+int patch_ad1981a(ac97_t *ac97)
+{
+ patch_ad1881(ac97);
+ ac97-build_ops = patch_ad1981a_build_ops;
+ snd_ac97_update_bits(ac97, AC97_AD_MISC, AC97_AD198X_MSPLT, AC97_AD198X_MSPLT);
+ ac97-flags |= AC97_STEREO_MUTES;
+ return 0;
+}
+
+static const snd_kcontrol_new_t snd_ac97_ad198x_2cmic =
+AC97_SINGLE(Stereo Mic, AC97_AD_MISC, 6, 1, 0);
+
+static int patch_ad1981b_specific(ac97_t *ac97)
+{
+ return patch_build_controls(ac97, snd_ac97_ad198x_2cmic, 1);
+}
+
+static struct snd_ac97_build_ops patch_ad1981b_build_ops = {
+ .build_post_spdif = patch_ad198x_post_spdif,
+ .build_specific = patch_ad1981b_specific
+};
+
+int
[alsa-cvslog] CVS: alsa-utils/iecset iecset.c,1.2,1.3
Update of /cvsroot/alsa/alsa-utils/iecset
In directory sc8-pr-cvs1:/tmp/cvs-serv5620
Modified Files:
iecset.c
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
- add error handler for ALSA errors
- enumerate all controls to find the desired control
(because SPDIF is device 1 on ymfpci)
Index: iecset.c
===
RCS file: /cvsroot/alsa/alsa-utils/iecset/iecset.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iecset.c28 Oct 2003 17:42:28 - 1.2
+++ iecset.c3 Nov 2003 10:43:32 - 1.3
@@ -76,6 +76,12 @@
};
+static void error(const char *s, int err)
+{
+ fprintf(stderr, %s: %s\n, s, snd_strerror(err));
+}
+
+
static void usage(void)
{
int i;
@@ -279,13 +285,16 @@
int main(int argc, char **argv)
{
const char *dev = default;
- const char *spdif_str = IEC958 Playback Default;
+ const char *spdif_str = SND_CTL_NAME_IEC958(, PLAYBACK, DEFAULT);
snd_ctl_t *ctl;
+ snd_ctl_elem_list_t *clist;
+ snd_ctl_elem_id_t *cid;
snd_ctl_elem_value_t *cval;
snd_aes_iec958_t iec958;
int from_stdin = 0;
int dumphex = 0;
- int i, c;
+ int i, c, err;
+ unsigned int controls, cidx;
char tmpname[32];
int parms[IDX_LAST];
@@ -318,20 +327,42 @@
}
}
- if (snd_ctl_open(ctl, dev, 0) 0) {
- perror(snd_ctl_open);
+ if ((err = snd_ctl_open(ctl, dev, 0)) 0) {
+ error(snd_ctl_open, err);
return 1;
}
+ snd_ctl_elem_list_alloca(clist);
+ if ((err = snd_ctl_elem_list(ctl, clist)) 0) {
+ error(snd_ctl_elem_list, err);
+ return 1;
+ }
+ if ((err = snd_ctl_elem_list_alloc_space(clist,
snd_ctl_elem_list_get_count(clist))) 0) {
+ error(snd_ctl_elem_list_alloc_space, err);
+ return 1;
+ }
+ if ((err = snd_ctl_elem_list(ctl, clist)) 0) {
+ error(snd_ctl_elem_list, err);
+ return 1;
+ }
+
+ controls = snd_ctl_elem_list_get_used(clist);
+ for (cidx = 0; cidx controls; cidx++) {
+ if (!strcmp(snd_ctl_elem_list_get_name(clist, cidx), spdif_str))
+ break;
+ }
+ if (cidx = controls) {
+ fprintf(stderr, control \%s\ not found\n, spdif_str);
+ return 1;
+ }
+
+ snd_ctl_elem_id_alloca(cid);
+ snd_ctl_elem_list_get_id(clist, cidx, cid);
snd_ctl_elem_value_alloca(cval);
- snd_ctl_elem_value_set_interface(cval, SND_CTL_ELEM_IFACE_MIXER);
- snd_ctl_elem_value_set_name(cval, spdif_str);
- if (snd_ctl_elem_read(ctl, cval) 0) {
- snd_ctl_elem_value_set_interface(cval, SND_CTL_ELEM_IFACE_PCM);
- if (snd_ctl_elem_read(ctl, cval) 0) {
- perror(snd_ctl_elem_read);
- return 1;
- }
+ snd_ctl_elem_value_set_id(cval, cid);
+ if ((err = snd_ctl_elem_read(ctl, cval)) 0) {
+ error(snd_ctl_elem_read, err);
+ return 1;
}
snd_ctl_elem_value_get_iec958(cval, iec958);
@@ -347,12 +378,12 @@
if (update_iec958_status(iec958, parms)) {
/* store the values */
snd_ctl_elem_value_set_iec958(cval, iec958);
- if (snd_ctl_elem_write(ctl, cval) 0) {
- perror(snd_ctl_elem_write);
+ if ((err = snd_ctl_elem_write(ctl, cval)) 0) {
+ error(snd_ctl_elem_write, err);
return 1;
}
- if (snd_ctl_elem_read(ctl, cval) 0) {
- perror(snd_ctl_elem_write);
+ if ((err = snd_ctl_elem_read(ctl, cval)) 0) {
+ error(snd_ctl_elem_write, err);
return 1;
}
snd_ctl_elem_value_get_iec958(cval, iec958);
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.65,1.66
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv22574/pci
Modified Files:
via82xx.c
Log Message:
added the quirk for ASUS A7V600.
Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- via82xx.c 28 Oct 2003 11:28:01 - 1.65
+++ via82xx.c 3 Nov 2003 12:31:50 - 1.66
@@ -1976,6 +1976,7 @@
static struct dxs_whitelist whitelist[] = {
{ .vendor = 0x1019, .device = 0x0996, .action = VIA_DXS_48K },
{ .vendor = 0x1043, .device = 0x80a1, .action = VIA_DXS_NO_VRA }, /*
ASUS A7V8-X */
+ { .vendor = 0x1043, .device = 0x80b0, .action = VIA_DXS_ENABLE }, /*
ASUS A7V600 */
{ .vendor = 0x1297, .device = 0xc160, .action = VIA_DXS_ENABLE }, /*
Shuttle SK41G */
{ .vendor = 0x1458, .device = 0xa002, .action = VIA_DXS_ENABLE }, /*
Gigabyte GA-7VAXP */
{ .vendor = 0x14ff, .device = 0x0403, .action = VIA_DXS_ENABLE }, /*
Twinhead mobo */
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/usb/us428 usbus428.c,1.6,1.7 usbus428.h,1.2,1.3 usbus428audio.c,1.6,1.7
Update of /cvsroot/alsa/alsa-driver/usb/us428
In directory sc8-pr-cvs1:/tmp/cvs-serv29007
Modified Files:
usbus428.c usbus428.h usbus428audio.c
Log Message:
- added 24Bit in 3Bytes (S24_3LE) support.
Index: usbus428.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- usbus428.c 24 Oct 2003 13:58:47 - 1.6
+++ usbus428.c 3 Nov 2003 18:13:40 - 1.7
@@ -1,6 +1,11 @@
/*
* usbus428.c - ALSA USB US-428 Driver
*
+2003-11-03 Karsten Wiese
+ Version 0.3:
+ 24Bit support.
+ arecord -D hw:1 -c 2 -r 48000 -M -f S24_3LE|aplay -D hw:1 -c 2 -r 48000 -M -f
S24_3LE works.
+
2003-08-22 Karsten Wiese
Version 0.0.8:
Removed EZUSB Firmware. First Stage Firmwaredownload is now done by
tascam-firmware downloader.
@@ -75,7 +80,7 @@
MODULE_AUTHOR(Karsten Wiese [EMAIL PROTECTED]);
-MODULE_DESCRIPTION(TASCAM NAME_ALLCAPS Version 0.2);
+MODULE_DESCRIPTION(TASCAM NAME_ALLCAPS Version 0.3);
MODULE_LICENSE(GPL);
MODULE_CLASSES({sound});
MODULE_DEVICES({{TASCAM(0x1604), NAME_ALLCAPS(0x8001) }});
@@ -226,18 +231,14 @@
{
int dev;
snd_card_t* card;
-
for (dev = 0; dev SNDRV_CARDS; ++dev)
if (enable[dev] !snd_us428_card_used[dev])
break;
-
if (dev = SNDRV_CARDS)
return NULL;
-
card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(us428dev_t));
if (!card)
return NULL;
-
snd_us428_card_used[us428(card)-chip.index = dev] = 1;
card-private_free = snd_us428_card_private_free;
us428(card)-chip.dev = device;
@@ -245,7 +246,6 @@
init_MUTEX (us428(card)-open_mutex);
INIT_LIST_HEAD(us428(card)-chip.midi_list);
us428(card)-Seq04Complete = 1;
- us428(card)-stride = 4;// 16 Bit
strcpy(card-driver, USB NAME_ALLCAPS);
sprintf(card-shortname, TASCAM NAME_ALLCAPS);
sprintf(card-longname, %s (%x:%x if %d at %03d/%03d),
@@ -258,25 +258,15 @@
}
-static void* snd_us428_usb_probe(struct usb_device* device,
-struct usb_interface *intf,
-const struct usb_device_id* device_id)
+static void* snd_us428_usb_probe(struct usb_device* device, struct usb_interface
*intf, const struct usb_device_id* device_id)
{
int err;
snd_card_t* card;
-
- /* See if the device offered us matches what we can accept */
- if (device-descriptor.idVendor != 0x1604 || device-descriptor.idProduct !=
0x8001)
+ if (device-descriptor.idVendor != 0x1604 || device-descriptor.idProduct !=
0x8001 ||
+ !(card = snd_us428_create_card(device)))
return 0;
-
- if (!(card = snd_us428_create_card(device)))
- return 0;
-
- if ((err = snd_usX2Y_hwdep_new(card, device)) 0) {
- snd_card_free(card);
- return 0;
- }
- if ((err = snd_card_register(card)) 0) {
+ if ((err = snd_usX2Y_hwdep_new(card, device)) 0 ||
+ (err = snd_card_register(card)) 0) {
snd_card_free(card);
return 0;
}
@@ -287,8 +277,7 @@
/*
* new 2.5 USB kernel API
*/
-static int snd_us428_probe(struct usb_interface *intf,
- const struct usb_device_id *id)
+static int snd_us428_probe(struct usb_interface *intf, const struct usb_device_id *id)
{
void *chip;
chip = snd_us428_usb_probe(interface_to_usbdev(intf), intf, id);
@@ -308,8 +297,7 @@
/*
* 2.4 USB kernel API
*/
-static void *snd_us428_probe(struct usb_device *dev, unsigned int ifnum,
-const struct usb_device_id *id)
+static void *snd_us428_probe(struct usb_device *dev, unsigned int ifnum, const struct
usb_device_id *id)
{
return snd_us428_usb_probe(dev, usb_ifnum_to_if(dev, ifnum), id);
}
Index: usbus428.h
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- usbus428.h 24 Sep 2003 16:45:10 - 1.2
+++ usbus428.h 3 Nov 2003 18:13:40 - 1.3
@@ -14,12 +14,12 @@
#define URBS_AsyncSeq 10
#define URB_DataLen_AsyncSeq 32
-typedef struct{
+typedef struct {
urb_t* urb[URBS_AsyncSeq];
char* buffer;
} snd_us428_AsyncSeq_t;
-typedef struct{
+typedef struct {
int submitted;
int len;
urb_t* urb[0];
@@ -38,7 +38,8 @@
int Seq04Complete;
wait_queue_head_t In04WaitQueue;
snd_us428_AsyncSeq_tAS04;
- int rate;
+ unsigned intrate,
+
[alsa-cvslog] CVS: alsa-tools/envy24control envy24control.c,1.19,1.20 hardware.c,1.11,1.12
Update of /cvsroot/alsa/alsa-tools/envy24control
In directory sc8-pr-cvs1:/tmp/cvs-serv30516
Modified Files:
envy24control.c hardware.c
Log Message:
Daniel Ankers [EMAIL PROTECTED]:
- Fixes a minor bug in the previous patch in hardware.c
- Adds friendly names to the analog volume controls for DMX 6Fire users
- Automatically sets the number of I/O channels for DMX 6Fire users
Index: envy24control.c
===
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- envy24control.c 30 Oct 2003 15:09:04 - 1.19
+++ envy24control.c 3 Nov 2003 18:20:53 - 1.20
@@ -387,6 +387,16 @@
H/W In 8
};
+ if (card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE)
+ {
+ table[2] = CD In L;
+table[3] = CD In R;
+table[4] = Line In L;
+table[5] = Line In R;
+table[6] = Phono/Mic In L;
+table[7] = Phono/Mic In R;
+ }
+
if (stream = 8) {
sprintf(str, H/W Out %i (%s), stream, stream 1 ? L : R);
} else if (stream == 9) {
@@ -1438,6 +1448,23 @@
GtkWidget *scrolledwindow;
GtkWidget *viewport;
int i, j;
+ static char* dmx6fire_inputs[6] = {
+ CD In (L),
+ CD In (R),
+ Line In (L),
+ Line In (R),
+ Phono In (L),
+ Phono In (R)
+ };
+ static char* dmx6fire_outputs[6] = {
+ Front (L),
+ Front (R),
+ Rear (L),
+ Rear (R),
+ Centre,
+ LFE
+ };
+
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwindow);
@@ -1474,6 +1501,13 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ /* Add friendly labels for DMX 6Fires */
+ if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) (i 6)){
+ label = gtk_label_new(dmx6fire_outputs[i]);
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 6);
+ }
+
adj = gtk_adjustment_new(0, -(envy_dac_max()), 0, 1, 16, 0);
av_dac_volume_adj[i] = adj;
vscale = gtk_vscale_new(GTK_ADJUSTMENT(adj));
@@ -1523,6 +1557,13 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ /* Add friendly labels for DMX 6Fires */
+ if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) (i 6)){
+ label = gtk_label_new(dmx6fire_inputs[i]);
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 6);
+ }
+
adj = gtk_adjustment_new(0, -127, 0, 1, 16, 0);
av_adc_volume_adj[i] = adj;
vscale = gtk_vscale_new(GTK_ADJUSTMENT(adj));
@@ -1572,6 +1613,13 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ /* Add friendly labels for DMX 6Fires */
+ if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) (i 6)){
+ label = gtk_label_new(dmx6fire_inputs[i]);
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 6);
+ }
+
adj = gtk_adjustment_new(0, -36, 0, 1, 16, 0);
av_ipga_volume_adj[i] = adj;
vscale = gtk_vscale_new(GTK_ADJUSTMENT(adj));
@@ -1612,6 +1660,8 @@
int npfds;
struct pollfd *pfds;
int page;
+ int output_channels_set = 0;
+ int input_channels_set = 0;
static struct option long_options[] = {
{device, 1, 0, 'D'},
{card, 1, 0, 'c'},
@@ -1652,12 +1702,14 @@
fprintf(stderr, envy24control: must have 0-8
inputs\n);
exit(1);
}
+ input_channels_set = 1;
break;
case 'o':
output_channels = atoi(optarg);
if (output_channels 0 || output_channels 10) {
fprintf(stderr, envy24control: must have 0-10
outputs\n);
exit(1);
+ output_channels_set = 1;
}
break;
case 's':
@@ -1694,6 +1746,19 @@
exit(EXIT_FAILURE);
[alsa-cvslog] CVS: alsa-kernel/include hdsp.h,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv31285/include
Modified Files:
hdsp.h
Log Message:
Thomas Charbonnel [EMAIL PROTECTED]:
- include support for hdsp 9632 cards and bugfixes for hdsp
9652 cards.
Index: hdsp.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/hdsp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hdsp.h 25 Sep 2003 18:55:43 - 1.3
+++ hdsp.h 3 Nov 2003 18:24:53 - 1.4
@@ -25,17 +25,20 @@
Digiface,
Multiface,
H9652,
+ H9632,
Undefined,
} HDSP_IO_Type;
typedef struct _snd_hdsp_peak_rms hdsp_peak_rms_t;
struct _snd_hdsp_peak_rms {
- unsigned int playback_peaks[26];
unsigned int input_peaks[26];
+ unsigned int playback_peaks[26];
unsigned int output_peaks[28];
- unsigned long long playback_rms[26];
unsigned long long input_rms[26];
+ unsigned long long playback_rms[26];
+ /* These are only used for H96xx cards */
+ unsigned long long output_rms[26];
};
#define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, hdsp_peak_rms_t)
@@ -61,6 +64,11 @@
unsigned char autosync_ref;
unsigned char line_out;
unsigned char passthru;
+ unsigned char da_gain;
+ unsigned char ad_gain;
+ unsigned char phone_gain;
+ unsigned char xlr_breakout_cable;
+ unsigned char analog_extension_board;
};
#define SNDRV_HDSP_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, hdsp_config_info_t)
@@ -89,5 +97,14 @@
};
#define SNDRV_HDSP_IOCTL_GET_MIXER _IOR('H', 0x44, hdsp_mixer_t)
+
+typedef struct _snd_hdsp_9632_aeb hdsp_9632_aeb_t;
+
+struct _snd_hdsp_9632_aeb {
+ int aebi;
+ int aebo;
+};
+
+#define SNDRV_HDSP_IOCTL_GET_9632_AEB _IOR('H', 0x45, hdsp_9632_aeb_t)
#endif /* __SOUND_HDSP_H */
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/ac3dec .cvsignore,1.5,1.6 configure.in,1.5,1.6
Update of /cvsroot/alsa/alsa-tools/ac3dec In directory sc8-pr-cvs1:/tmp/cvs-serv7577/ac3dec Modified Files: .cvsignore configure.in Log Message: - don't ignore autogen.sh (included in tarball). - removed the unnecessary host detection. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-tools/ac3dec/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Mar 2003 17:34:29 - 1.5 +++ .cvsignore 3 Nov 2003 19:07:51 - 1.6 @@ -14,7 +14,6 @@ stamp-h.in ac3dec .deps -autogen.sh stamp-h confdefs.h depcomp Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/ac3dec/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure.in31 Aug 2002 10:26:33 - 1.5 +++ configure.in3 Nov 2003 19:07:51 - 1.6 @@ -18,13 +18,13 @@ AM_PATH_ALSA(0.9.0) dnl Set the appropriate architecture define -case $host in -i?86-*) AC_DEFINE(__i386__, 1, [Using i386 architecture]);; -alpha*-*) AC_DEFINE(__alpha__, 1, [Using Alpha architecture]);; -sparc-*) AC_DEFINE(__sparc__, 1, [Using SPARC architecture]);; -ppc-*|powerpc-*) AC_DEFINE(__ppc__, 1, [Using PowerPC architecture]);; -ia64-*) AC_DEFINE(__ia64__, 1, [Using IA-64 architecture]);; -*) echo $host is not currently supported by ac3dec; exit 1;; -esac +dnl case $host in +dnl i?86-*) AC_DEFINE(__i386__, 1, [Using i386 architecture]);; +dnl alpha*-*) AC_DEFINE(__alpha__, 1, [Using Alpha architecture]);; +dnl sparc-*) AC_DEFINE(__sparc__, 1, [Using SPARC architecture]);; +dnl ppc-*|powerpc-*) AC_DEFINE(__ppc__, 1, [Using PowerPC architecture]);; +dnl ia64-*) AC_DEFINE(__ia64__, 1, [Using IA-64 architecture]);; +dnl *) echo $host is not currently supported by ac3dec; exit 1;; +dnl esac AC_OUTPUT(libac3/Makefile tools/Makefile test/Makefile Makefile ) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf ChangeLog,1.1,1.2 README,1.1,1.2 configure.in,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdspconf In directory sc8-pr-cvs1:/tmp/cvs-serv8037/hdspconf Modified Files: ChangeLog README configure.in Log Message: Thomas Charbonnel [EMAIL PROTECTED]: updated to version 1.2. Index: ChangeLog === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 2 Jul 2003 10:21:11 - 1.1 +++ ChangeLog 3 Nov 2003 19:09:32 - 1.2 @@ -0,0 +1,2 @@ +Version 1.2 (01/11/2003) : +* added support for HDSP 9652 and HDSP 9632 specific features Index: README === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 2 Jul 2003 10:21:11 - 1.1 +++ README 3 Nov 2003 19:09:32 - 1.2 @@ -1,2 +1,2 @@ -HDSPConfig is a GUI to control the Hammerfall HDSP Alsa Settings. +HDSPConf is a GUI to control the Hammerfall HDSP Alsa Settings. Up to four hdsp cards are supported. Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in28 Jul 2003 12:58:10 - 1.2 +++ configure.in3 Nov 2003 19:09:32 - 1.3 @@ -1,5 +1,5 @@ AC_INIT(src/hdspconf.cxx) -AM_INIT_AUTOMAKE(hdspconf, 1.1) +AM_INIT_AUTOMAKE(hdspconf, 1.2) AC_PROG_CXX AC_PROG_MAKE_SET --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf/pixmaps alsalogo.xpm,1.1,1.2 lad_banner.xpm,1.1,1.2 rme.xpm,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspconf/pixmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv8037/hdspconf/pixmaps
Modified Files:
alsalogo.xpm lad_banner.xpm rme.xpm
Log Message:
Thomas Charbonnel [EMAIL PROTECTED]:
updated to version 1.2.
Index: alsalogo.xpm
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/pixmaps/alsalogo.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsalogo.xpm2 Jul 2003 10:21:11 - 1.1
+++ alsalogo.xpm3 Nov 2003 19:09:32 - 1.2
@@ -1,5 +1,5 @@
/* XPM */
-static char * alsalogo_xpm[] = {
+char * alsalogo_xpm[] = {
50 50 398 2,
c None,
. c #C0C0C0,
Index: lad_banner.xpm
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/pixmaps/lad_banner.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lad_banner.xpm 2 Jul 2003 10:21:11 - 1.1
+++ lad_banner.xpm 3 Nov 2003 19:09:32 - 1.2
@@ -1,5 +1,5 @@
/* XPM */
-static char * lad_banner_xpm[] = {
+char * lad_banner_xpm[] = {
113 39 1833 2,
c None,
. c #C0C0C0,
Index: rme.xpm
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/pixmaps/rme.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rme.xpm 2 Jul 2003 10:21:11 - 1.1
+++ rme.xpm 3 Nov 2003 19:09:32 - 1.2
@@ -1,5 +1,5 @@
/* XPM */
-static char * rme_xpm[] = {
+char * rme_xpm[] = {
113 35 2300 2,
c None,
. c #030505,
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf/src HC_Aeb.cxx,NONE,1.1 HC_Aeb.h,NONE,1.1 HC_BreakoutCable.cxx,NONE,1.1 HC_BreakoutCable.h,NONE,1.1 HC_InputLevel.cxx,NONE,1.1 HC_InputLevel.h,NONE,1.1 HC_OutputLevel.cxx,NONE,1.1 HC_OutputLevel.h,NONE,1.1 HC_Phones.cxx,NONE,1.1 HC_Phones.h,NONE,1.1 pixmaps.cxx,NONE,1.1 pixmaps.h,NONE,1.1 HC_AboutText.cxx,1.1,1.2 HC_AutoSyncRef.cxx,1.1,1.2 HC_CardPane.cxx,1.1,1.2 HC_CardPane.h,1.1,1.2 HC_ClockSource.cxx,1.1,1.2 HC_ClockSource.h,1.1,1.2 HC_PrefSyncRef.cxx,1.1,1.2 HC_PrefSyncRef.h,1.1,1.2 HC_SpdifFreq.cxx,1.1,1.2 HC_SpdifIn.cxx,1.1,1.2 HC_SpdifIn.h,1.1,1.2 HC_SyncCheck.cxx,1.1,1.2 HC_SyncCheck.h,1.1,1.2 HC_SystemClock.cxx,1.1,1.2 HC_XpmRenderer.h,1.1,1.2 Makefile.am,1.1,1.2 defines.h,1.1,1.2 hdspconf.cxx,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdspconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8037/hdspconf/src
Modified Files:
HC_AboutText.cxx HC_AutoSyncRef.cxx HC_CardPane.cxx
HC_CardPane.h HC_ClockSource.cxx HC_ClockSource.h
HC_PrefSyncRef.cxx HC_PrefSyncRef.h HC_SpdifFreq.cxx
HC_SpdifIn.cxx HC_SpdifIn.h HC_SyncCheck.cxx HC_SyncCheck.h
HC_SystemClock.cxx HC_XpmRenderer.h Makefile.am defines.h
hdspconf.cxx
Added Files:
HC_Aeb.cxx HC_Aeb.h HC_BreakoutCable.cxx HC_BreakoutCable.h
HC_InputLevel.cxx HC_InputLevel.h HC_OutputLevel.cxx
HC_OutputLevel.h HC_Phones.cxx HC_Phones.h pixmaps.cxx
pixmaps.h
Log Message:
Thomas Charbonnel [EMAIL PROTECTED]:
updated to version 1.2.
--- NEW FILE: HC_Aeb.cxx ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#pragma implementation
#include HC_Aeb.h
static void setAebStatus(char *ctl_name, int val, int card_index)
{
int err;
char card_name[6];
snd_ctl_elem_value_t *ctl;
snd_ctl_elem_id_t *id;
snd_ctl_t *handle;
snprintf(card_name, 6, hw:%i, card_index);
snd_ctl_elem_value_alloca(ctl);
snd_ctl_elem_id_alloca(id);
snd_ctl_elem_id_set_name(id, ctl_name);
snd_ctl_elem_id_set_numid(id, 0);
snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_HWDEP);
snd_ctl_elem_id_set_device(id, 0);
snd_ctl_elem_id_set_subdevice(id, 0);
snd_ctl_elem_id_set_index(id, 0);
snd_ctl_elem_value_set_id(ctl, id);
snd_ctl_elem_value_set_integer(ctl, 0, val);
if ((err = snd_ctl_open(handle, card_name, SND_CTL_NONBLOCK)) 0) {
fprintf(stderr, Error opening ctl interface on card %s\n, card_name);
return;
}
if ((err = snd_ctl_elem_write(handle, ctl)) 0) {
fprintf(stderr, Error accessing ctl interface on card %s\n, card_name);
return;
}
snd_ctl_close(handle);
}
void adat_internal_cb(Fl_Widget *w, void *arg)
{
setAebStatus(Analog Extension Board, ((Fl_Check_Button *)w)-value(),
((HC_CardPane *)arg)-alsa_index);
}
HC_Aeb::HC_Aeb(int x, int y, int w, int h):Fl_Group(x, y, w, h, AEB)
{
int i = 0;
lock = 0;
box(FL_ENGRAVED_FRAME);
label(AEB);
labelsize(10);
align(FL_ALIGN_TOP|FL_ALIGN_LEFT);
adat_internal = new Fl_Check_Button(x+15, y, w-30, 20, Adat1 Int.);
adat_internal-labelsize(10);
adat_internal-callback(adat_internal_cb, (void *)parent());
end();
}
void HC_Aeb::setAdatInternal(unsigned char val)
{
if (val != adat_internal-value()) {
adat_internal-value(val);
}
}
int HC_Aeb::handle(int e)
{
switch (e) {
case FL_PUSH:
lock = 1;
break;
case FL_RELEASE:
lock = 0;
break;
default:
return Fl_Group::handle(e);
}
return Fl_Group::handle(e);
}
--- NEW FILE: HC_Aeb.h ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#pragma interface
#ifndef HC_AEB_H
#define HC_AEB_H
#include FL/Fl_Group.H
#include FL/Fl_Check_Button.H
#include alsa/asoundlib.h
#include HC_CardPane.h
class HC_CardPane;
class HC_Aeb:public Fl_Group
{
public:
HC_Aeb(int x, int y, int w, int h);
Fl_Check_Button *adat_internal;
void setAdatInternal(unsigned char val);
int handle(int e);
int lock;
};
#endif
--- NEW FILE: HC_BreakoutCable.cxx ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel
[alsa-cvslog] CVS: alsa-tools/hdspmixer NEWS,1.1,1.2 configure.in,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdspmixer In directory sc8-pr-cvs1:/tmp/cvs-serv8357/hdspmixer Modified Files: NEWS configure.in Log Message: Thomas Charbonnel [EMAIL PROTECTED]: updated to version 1.4. Index: NEWS === RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/NEWS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NEWS28 Jul 2003 11:32:32 - 1.1 +++ NEWS3 Nov 2003 19:10:38 - 1.2 @@ -1,3 +1,16 @@ +Version 1.4 (01/11/2003): +* Adds support for H9632 cards + +Version 1.3 (no public release): +* Adds metering for H9652 cards +* Stops shipping unused pixmaps +* Shows stereo relationships in the mixer +* pixmap directory has been cleaned up + +Version 1.2 (no public release): +* Fixes a graphical bug for H9652 cards +* Changes FLTK detection scheme in configure + Version 1.1 (27/07/2003): * Fixes a typo for Digiface and H9652 cards in HDSPMixerSelector.cxx (caused a crash on startup) Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in28 Jul 2003 12:02:25 - 1.2 +++ configure.in3 Nov 2003 19:10:38 - 1.3 @@ -1,5 +1,5 @@ AC_INIT(src/hdspmixer.cxx) -AM_INIT_AUTOMAKE(hdspmixer, 1.1) +AM_INIT_AUTOMAKE(hdspmixer, 1.4) AC_PROG_CXX AC_PROG_MAKE_SET @@ -51,9 +51,12 @@ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no) if test $FLTK_CONFIG = no; then - AC_MSG_WARN(no fltk-config is found) +AC_MSG_ERROR(fltk-config is required) fi -LIBS=-s `fltk-config --ldflags` -lasound -CXXFLAGS=`fltk-config --cxxflags` -fno-exceptions $ALSA_CFLAGS +FLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags` -fno-exceptions +FLTK_LIBS=`$FLTK_CONFIG --ldflags` + +CXXFLAGS=$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS +LDFLAGS=$LDFLAGS $ALSA_LIBS $FLTK_LIBS AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
