Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv32513/src/pcm
Modified Files:
pcm.c pcm_dmix.c pcm_dshare.c pcm_dsnoop.c
Log Message:
Added SNDRV_PCM_STATE_DISCONNECTED state.
Changed direct plugins to handle DISCONNECT/SUSPEND states from slave.
Index: pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- pcm.c 8 Jan 2004 14:05:55 -0000 1.265
+++ pcm.c 19 Jan 2004 19:48:27 -0000 1.266
@@ -199,6 +199,9 @@
#snd_pcm_drop(), #snd_pcm_drain() can be used
to leave this state.
+\par SND_PCM_STATE_DISCONNECTED
+The device is physicaly disconnected. It does not accept any I/O calls in this state.
+
\section pcm_formats PCM formats
The full list of formats present the #snd_pcm_format_t type.
@@ -1276,6 +1279,7 @@
STATE(DRAINING),
STATE(PAUSED),
STATE(SUSPENDED),
+ STATE(DISCONNECTED),
};
static const char *snd_pcm_access_names[] = {
@@ -2050,6 +2054,8 @@
return -EPIPE;
case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ return -ENOTTY; /* linux VFS does this? */
default:
return -EIO;
}
@@ -5932,6 +5938,8 @@
return -EPIPE;
case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
@@ -6003,6 +6011,8 @@
return -EPIPE;
case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
Index: pcm_dmix.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dmix.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pcm_dmix.c 7 Dec 2003 09:30:47 -0000 1.45
+++ pcm_dmix.c 19 Jan 2004 19:48:27 -0000 1.46
@@ -385,6 +385,15 @@
snd_pcm_uframes_t slave_hw_ptr, old_slave_hw_ptr, avail;
snd_pcm_sframes_t diff;
+ switch (snd_pcm_state(dmix->spcm)) {
+ case SND_PCM_STATE_SUSPENDED:
+ return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ dmix->state = -ENOTTY;
+ return -ENOTTY;
+ default:
+ break;
+ }
old_slave_hw_ptr = dmix->slave_hw_ptr;
slave_hw_ptr = dmix->slave_hw_ptr = *dmix->spcm->hw.ptr;
diff = slave_hw_ptr - old_slave_hw_ptr;
@@ -420,6 +429,7 @@
static int snd_pcm_dmix_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
{
snd_pcm_direct_t *dmix = pcm->private_data;
+ snd_pcm_state_t state;
switch (dmix->state) {
case SNDRV_PCM_STATE_DRAINING:
@@ -430,7 +440,8 @@
break;
}
memset(status, 0, sizeof(*status));
- status->state = dmix->state;
+ state = snd_pcm_state(dmix->spcm);
+ status->state = state == SNDRV_PCM_STATE_RUNNING ? dmix->state : state;
status->trigger_tstamp = dmix->trigger_tstamp;
status->tstamp = snd_pcm_hw_fast_tstamp(dmix->spcm);
status->avail = snd_pcm_mmap_playback_avail(pcm);
@@ -442,6 +453,15 @@
static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm)
{
snd_pcm_direct_t *dmix = pcm->private_data;
+ switch (snd_pcm_state(dmix->spcm)) {
+ case SND_PCM_STATE_SUSPENDED:
+ return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ dmix->state = -ENOTTY;
+ return -ENOTTY;
+ default:
+ break;
+ }
return dmix->state;
}
@@ -462,6 +482,8 @@
return 0;
case SNDRV_PCM_STATE_XRUN:
return -EPIPE;
+ case SNDRV_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
@@ -480,6 +502,8 @@
return 0;
case SNDRV_PCM_STATE_XRUN:
return -EPIPE;
+ case SNDRV_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
@@ -891,7 +915,7 @@
if (dmix->channels == UINT_MAX)
dmix->channels = dmix->shmptr->s.channels;
-
+
snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT);
*pcmp = pcm;
Index: pcm_dshare.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dshare.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pcm_dshare.c 7 Dec 2003 09:30:47 -0000 1.11
+++ pcm_dshare.c 19 Jan 2004 19:48:28 -0000 1.12
@@ -132,6 +132,15 @@
snd_pcm_uframes_t slave_hw_ptr, old_slave_hw_ptr, avail;
snd_pcm_sframes_t diff;
+ switch (snd_pcm_state(dshare->spcm)) {
+ case SND_PCM_STATE_SUSPENDED:
+ return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ dshare->state = SNDRV_PCM_STATE_DISCONNECTED;
+ return -ENOTTY;
+ default:
+ break;
+ }
old_slave_hw_ptr = dshare->slave_hw_ptr;
slave_hw_ptr = dshare->slave_hw_ptr = *dshare->spcm->hw.ptr;
diff = slave_hw_ptr - old_slave_hw_ptr;
@@ -167,6 +176,7 @@
static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
{
snd_pcm_direct_t *dshare = pcm->private_data;
+ snd_pcm_state_t state;
switch (dshare->state) {
case SNDRV_PCM_STATE_DRAINING:
@@ -177,7 +187,8 @@
break;
}
memset(status, 0, sizeof(*status));
- status->state = dshare->state;
+ state = snd_pcm_state(dshare->spcm);
+ status->state = state == SND_PCM_STATE_RUNNING ? dshare->state : state;
status->trigger_tstamp = dshare->trigger_tstamp;
status->tstamp = snd_pcm_hw_fast_tstamp(dshare->spcm);
status->avail = snd_pcm_mmap_playback_avail(pcm);
@@ -189,6 +200,15 @@
static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm)
{
snd_pcm_direct_t *dshare = pcm->private_data;
+ switch (snd_pcm_state(dshare->spcm)) {
+ case SND_PCM_STATE_SUSPENDED:
+ return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ dshare->state = SNDRV_PCM_STATE_DISCONNECTED;
+ return -ENOTTY;
+ default:
+ break;
+ }
return dshare->state;
}
@@ -209,6 +229,8 @@
return 0;
case SNDRV_PCM_STATE_XRUN:
return -EPIPE;
+ case SNDRV_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
@@ -227,6 +249,8 @@
return 0;
case SNDRV_PCM_STATE_XRUN:
return -EPIPE;
+ case SNDRV_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
Index: pcm_dsnoop.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dsnoop.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pcm_dsnoop.c 7 Dec 2003 09:30:47 -0000 1.11
+++ pcm_dsnoop.c 19 Jan 2004 19:48:28 -0000 1.12
@@ -114,6 +114,15 @@
snd_pcm_uframes_t slave_hw_ptr, old_slave_hw_ptr, avail;
snd_pcm_sframes_t diff;
+ switch (snd_pcm_state(dsnoop->spcm)) {
+ case SND_PCM_STATE_SUSPENDED:
+ return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED;
+ return -ENOTTY;
+ default:
+ break;
+ }
old_slave_hw_ptr = dsnoop->slave_hw_ptr;
slave_hw_ptr = dsnoop->slave_hw_ptr = *dsnoop->spcm->hw.ptr;
diff = slave_hw_ptr - old_slave_hw_ptr;
@@ -150,6 +159,7 @@
static int snd_pcm_dsnoop_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
{
snd_pcm_direct_t *dsnoop = pcm->private_data;
+ snd_pcm_state_t state;
switch(dsnoop->state) {
case SNDRV_PCM_STATE_DRAINING:
@@ -160,7 +170,8 @@
break;
}
memset(status, 0, sizeof(*status));
- status->state = dsnoop->state;
+ state = snd_pcm_state(dsnoop->spcm);
+ status->state = state == SND_PCM_STATE_RUNNING ? dsnoop->state : state;
status->trigger_tstamp = dsnoop->trigger_tstamp;
status->tstamp = snd_pcm_hw_fast_tstamp(dsnoop->spcm);
status->avail = snd_pcm_mmap_capture_avail(pcm);
@@ -172,6 +183,15 @@
static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
{
snd_pcm_direct_t *dsnoop = pcm->private_data;
+ switch (snd_pcm_state(dsnoop->spcm)) {
+ case SND_PCM_STATE_SUSPENDED:
+ return -ESTRPIPE;
+ case SND_PCM_STATE_DISCONNECTED:
+ dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED;
+ return -ENOTTY;
+ default:
+ break;
+ }
return dsnoop->state;
}
@@ -192,6 +212,8 @@
return 0;
case SNDRV_PCM_STATE_XRUN:
return -EPIPE;
+ case SNDRV_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
@@ -210,6 +232,8 @@
return 0;
case SNDRV_PCM_STATE_XRUN:
return -EPIPE;
+ case SNDRV_PCM_STATE_DISCONNECTED:
+ return -ENOTTY;
default:
return -EBADFD;
}
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
