Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv17563
Modified Files:
rme96.c
Log Message:
- changed the clock source control to be compliant to the standard
control name rules.
Index: rme96.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme96.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rme96.c 2 Jul 2003 10:11:55 -0000 1.26
+++ rme96.c 3 Jul 2003 11:11:43 -0000 1.27
@@ -806,10 +806,12 @@
{
switch (mode) {
case RME96_CLOCKMODE_SLAVE:
+ /* AutoSync */
rme96->wcreg &= ~RME96_WCR_MASTER;
rme96->areg &= ~RME96_AR_WSEL;
break;
case RME96_CLOCKMODE_MASTER:
+ /* Internal */
rme96->wcreg |= RME96_WCR_MASTER;
rme96->areg &= ~RME96_AR_WSEL;
break;
@@ -1862,15 +1864,15 @@
snd_iprintf(buffer, " sample format: 16 bit\n");
}
if (rme96->areg & RME96_AR_WSEL) {
- snd_iprintf(buffer, " clock mode: word clock\n");
+ snd_iprintf(buffer, " sample clock source: word clock\n");
} else if (rme96->wcreg & RME96_WCR_MASTER) {
- snd_iprintf(buffer, " clock mode: master\n");
+ snd_iprintf(buffer, " sample clock source: internal\n");
} else if (snd_rme96_getinputtype(rme96) == RME96_INPUT_ANALOG) {
- snd_iprintf(buffer, " clock mode: slave (master anyway due to analog
input setting)\n");
+ snd_iprintf(buffer, " sample clock source: autosync (internal anyway
due to analog input setting)\n");
} else if (snd_rme96_capture_getrate(rme96, &n) < 0) {
- snd_iprintf(buffer, " clock mode: slave (master anyway due to no
valid signal)\n");
+ snd_iprintf(buffer, " sample clock source: autosync (internal anyway
due to no valid signal)\n");
} else {
- snd_iprintf(buffer, " clock mode: slave\n");
+ snd_iprintf(buffer, " sample clock source: autosync\n");
}
if (rme96->wcreg & RME96_WCR_PRO) {
snd_iprintf(buffer, " format: AES/EBU (professional)\n");
@@ -2095,7 +2097,7 @@
static int
snd_rme96_info_clockmode_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
{
- static char *texts[3] = { "Slave", "Master", "Wordclock" };
+ static char *texts[3] = { "AutoSync", "Internal", "Word" };
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo->count = 1;
@@ -2418,7 +2420,7 @@
},
{
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
- .name = "Clock Mode",
+ .name = "Sample Clock Source",
.info = snd_rme96_info_clockmode_control,
.get = snd_rme96_get_clockmode_control,
.put = snd_rme96_put_clockmode_control
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
