mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-10-29 05:40:25 -04:00
added snd_hctl_ctl() function
ordinary mixer:
- revised Ordinary Mixer I/O type
- sndo_mixer_open() take PCMs rather than strings to pass
the real relationship
- an initial version of toplevel alisp script
more alisp development:
- renamed a* functions to A* functions (acall -> Acall etc.)
- many improvements (unset*, exfun, Acall pcm_info, Asnderr, Asyserr)
This commit is contained in:
parent
668a300229
commit
60585e25fc
16 changed files with 535 additions and 165 deletions
|
|
@ -468,6 +468,7 @@ int snd_hctl_free(snd_hctl_t *hctl);
|
|||
int snd_hctl_handle_events(snd_hctl_t *hctl);
|
||||
const char *snd_hctl_name(snd_hctl_t *hctl);
|
||||
int snd_hctl_wait(snd_hctl_t *hctl, int timeout);
|
||||
snd_ctl_t *snd_hctl_ctl(snd_hctl_t *hctl);
|
||||
|
||||
snd_hctl_elem_t *snd_hctl_elem_next(snd_hctl_elem_t *elem);
|
||||
snd_hctl_elem_t *snd_hctl_elem_prev(snd_hctl_elem_t *elem);
|
||||
|
|
|
|||
|
|
@ -29,48 +29,137 @@
|
|||
|
||||
#include <alsa/asoundlib.h>
|
||||
|
||||
/** Ordinary Mixer latency type */
|
||||
/** Ordinary Mixer I/O type */
|
||||
enum sndo_mixer_io_type {
|
||||
|
||||
/*
|
||||
* playback section
|
||||
*/
|
||||
|
||||
/** master volume - left (0-1000) */
|
||||
/** Master volume - left (0-1000) */
|
||||
SNDO_MIO_MASTER_LVOL = 0,
|
||||
/** master volume - right (0-1000) */
|
||||
/** Master volume - right (0-1000) */
|
||||
SNDO_MIO_MASTER_RVOL,
|
||||
/** master volume - left mute (0 = off, 1 = on) */
|
||||
/** Master volume - left surround (0-1000) */
|
||||
SNDO_MIO_MASTER_LSVOL = 0,
|
||||
/** Master volume - right surround (0-1000) */
|
||||
SNDO_MIO_MASTER_RSVOL,
|
||||
/** Master volume - center (0-1000) */
|
||||
SNDO_MIO_MASTER_CVOL = 0,
|
||||
/** Master volume - LFE (0-1000) */
|
||||
SNDO_MIO_MASTER_LFEVOL,
|
||||
/** Master volume - left mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MASTER_LMUTE,
|
||||
/** master volume - right mute (0 = off, 1 = on) */
|
||||
/** Master volume - right mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MASTER_RMUTE,
|
||||
/** Master volume - left surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MASTER_LSMUTE,
|
||||
/** Master volume - right surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MASTER_RSMUTE,
|
||||
/** Master volume - center mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MASTER_CMUTE,
|
||||
/** Master volume - LFE mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MASTER_LFEMUTE,
|
||||
|
||||
/** pcm volume - left (0-1000) */
|
||||
SNDO_MIO_Mixer_LVOL,
|
||||
/** pcm volume - right (0-1000) */
|
||||
SNDO_MIO_Mixer_RVOL,
|
||||
/** pcm volume - left mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_Mixer_LMUTE,
|
||||
/** pcm volume - right mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_Mixer_RMUTE,
|
||||
/** PCM volume - left (0-1000) */
|
||||
SNDO_MIO_PCM_LVOL = 0,
|
||||
/** PCM volume - right (0-1000) */
|
||||
SNDO_MIO_PCM_RVOL,
|
||||
/** PCM volume - left surround (0-1000) */
|
||||
SNDO_MIO_PCM_LSVOL = 0,
|
||||
/** PCM volume - right surround (0-1000) */
|
||||
SNDO_MIO_PCM_RSVOL,
|
||||
/** PCM volume - center (0-1000) */
|
||||
SNDO_MIO_PCM_CVOL = 0,
|
||||
/** PCM volume - LFE (0-1000) */
|
||||
SNDO_MIO_PCM_LFEVOL,
|
||||
/** PCM volume - left mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_PCM_LMUTE,
|
||||
/** PCM volume - right mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_PCM_RMUTE,
|
||||
/** PCM volume - left surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_PCM_LSMUTE,
|
||||
/** PCM volume - right surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_PCM_RSMUTE,
|
||||
/** PCM volume - center mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_PCM_CMUTE,
|
||||
/** PCM volume - LFE mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_PCM_LFEMUTE,
|
||||
|
||||
/** LINE volume - left (0-1000) */
|
||||
SNDO_MIO_LINE_LVOL = 0,
|
||||
/** LINE volume - right (0-1000) */
|
||||
SNDO_MIO_LINE_RVOL,
|
||||
/** LINE volume - left surround (0-1000) */
|
||||
SNDO_MIO_LINE_LSVOL = 0,
|
||||
/** LINE volume - right surround (0-1000) */
|
||||
SNDO_MIO_LINE_RSVOL,
|
||||
/** LINE volume - center (0-1000) */
|
||||
SNDO_MIO_LINE_CVOL = 0,
|
||||
/** LINE volume - LFE (0-1000) */
|
||||
SNDO_MIO_LINE_LFEVOL,
|
||||
/** LINE volume - left mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_LINE_LMUTE,
|
||||
/** LINE volume - right mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_LINE_RMUTE,
|
||||
/** LINE volume - left surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_LINE_LSMUTE,
|
||||
/** LINE volume - right surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_LINE_RSMUTE,
|
||||
/** LINE volume - center mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_LINE_CMUTE,
|
||||
/** LINE volume - LFE mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_LINE_LFEMUTE,
|
||||
|
||||
/** MIC volume - left (0-1000) */
|
||||
SNDO_MIO_MIC_LVOL = 0,
|
||||
/** MIC volume - right (0-1000) */
|
||||
SNDO_MIO_MIC_RVOL,
|
||||
/** MIC volume - left surround (0-1000) */
|
||||
SNDO_MIO_MIC_LSVOL = 0,
|
||||
/** MIC volume - right surround (0-1000) */
|
||||
SNDO_MIO_MIC_RSVOL,
|
||||
/** MIC volume - center (0-1000) */
|
||||
SNDO_MIO_MIC_CVOL = 0,
|
||||
/** MIC volume - LFE (0-1000) */
|
||||
SNDO_MIO_MIC_LFEVOL,
|
||||
/** MIC volume - left mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MIC_LMUTE,
|
||||
/** MIC volume - right mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MIC_RMUTE,
|
||||
/** MIC volume - left surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MIC_LSMUTE,
|
||||
/** MIC volume - right surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MIC_RSMUTE,
|
||||
/** MIC volume - center mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MIC_CMUTE,
|
||||
/** MIC volume - LFE mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_MIC_LFEMUTE,
|
||||
|
||||
/** CD volume - left (0-1000) */
|
||||
SNDO_MIO_CD_LVOL,
|
||||
SNDO_MIO_CD_LVOL = 0,
|
||||
/** CD volume - right (0-1000) */
|
||||
SNDO_MIO_CD_RVOL,
|
||||
/** CD volume - left surround (0-1000) */
|
||||
SNDO_MIO_CD_LSVOL = 0,
|
||||
/** CD volume - right surround (0-1000) */
|
||||
SNDO_MIO_CD_RSVOL,
|
||||
/** CD volume - center (0-1000) */
|
||||
SNDO_MIO_CD_CVOL = 0,
|
||||
/** CD volume - LFE (0-1000) */
|
||||
SNDO_MIO_CD_LFEVOL,
|
||||
/** CD volume - left mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_CD_LMUTE,
|
||||
/** CD volume - right mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_CD_RMUTE,
|
||||
|
||||
/** AUX volume - left (0-1000) */
|
||||
SNDO_MIO_AUX_LVOL,
|
||||
/** CD volume - right (0-1000) */
|
||||
SNDO_MIO_AUX_RVOL,
|
||||
/** CD volume - left mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_AUX_LMUTE,
|
||||
/** CD volume - right mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_AUX_RMUTE,
|
||||
/** CD volume - left surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_CD_LSMUTE,
|
||||
/** CD volume - right surround mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_CD_RSMUTE,
|
||||
/** CD volume - center mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_CD_CMUTE,
|
||||
/** CD volume - LFE mute (0 = off, 1 = on) */
|
||||
SNDO_MIO_CD_LFEMUTE,
|
||||
|
||||
/*
|
||||
* capture section
|
||||
|
|
@ -80,17 +169,24 @@ enum sndo_mixer_io_type {
|
|||
SNDO_MIO_CGAIN_LVOL = 0x1000,
|
||||
/** capture gain - right (0-1000) */
|
||||
SNDO_MIO_CGAIN_RVOL,
|
||||
/** capture gain - left surround (0-1000) */
|
||||
SNDO_MIO_CGAIN_LSVOL,
|
||||
/** capture gain - right surround (0-1000) */
|
||||
SNDO_MIO_CGAIN_RSVOL,
|
||||
/** capture gain - center (0-1000) */
|
||||
SNDO_MIO_CGAIN_CVOL,
|
||||
/** capture gain - LFE (0-1000) */
|
||||
SNDO_MIO_CGAIN_LFEVOL,
|
||||
|
||||
|
||||
/** capture source - mic switch (0 = off, 1 = on) */
|
||||
/** capture source - MIC exclusive switch (0 = off, 1 = on) */
|
||||
SNDO_MIO_CSOURCE_MIC = 0x1100,
|
||||
/** capture source - line switch (0 = off, 1 = on)*/
|
||||
/** capture source - LINE exclusive switch (0 = off, 1 = on) */
|
||||
SNDO_MIO_CSOURCE_LINE,
|
||||
/** capture source - CD switch (0 = off, 1 = on) */
|
||||
/** capture source - CD exclusive switch (0 = off, 1 = on) */
|
||||
SNDO_MIO_CSOURCE_CD,
|
||||
/** capture source - AUX switch (0 = off, 1 = on) */
|
||||
/** capture source - AUX exclusive switch (0 = off, 1 = on) */
|
||||
SNDO_MIO_CSOURCE_AUX,
|
||||
/** capture source - mix switch (0 = off, 1 = on) */
|
||||
/** capture source - MIX exclusive switch (0 = off, 1 = on) */
|
||||
SNDO_MIO_CSOURCE_MIX
|
||||
};
|
||||
|
||||
|
|
@ -107,7 +203,7 @@ extern "C" {
|
|||
* \{
|
||||
*/
|
||||
|
||||
int sndo_mixer_open(sndo_mixer_t **pmixer, const char *playback_name, const char *capture_name, struct alisp_cfg *lconf);
|
||||
int sndo_mixer_open(sndo_mixer_t **pmixer, snd_pcm_t *playback_pcm, snd_pcm_t *capture_pcm, struct alisp_cfg *lconf);
|
||||
int sndo_mixer_close(sndo_mixer_t *mixer);
|
||||
int sndo_mixer_poll_descriptors_count(sndo_mixer_t *mixer);
|
||||
int sndo_mixer_poll_descriptors(sndo_mixer_t *mixer, struct pollfd *pfds, unsigned int space);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue