asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-09 17:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsactl: add initial support for UCM init

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-05-14 17:12:08 +02:00
parent 598488c4af
commit 4bea8fe3a7
4 changed files with 49 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alsactl/Makefile.am
View file

@ -9,8 +9,8 @@ EXTRA_DIST=alsactl.1 alsactl_init.xml
AM_CFLAGS = -D_GNU_SOURCE
alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c \
monitor.c
alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c init_ucm.c \
daemon.c monitor.c
alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU \
-DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" \

1
alsactl/alsactl.h
View file

@ -25,6 +25,7 @@ void dbg_(const char *fcn, long line, const char *fmt, ...);
#endif
int init(const char *file, const char *cardname);
int init_ucm(int cardno);
int state_lock(const char *file, int timeout);
int state_unlock(int fd, const char *file);
int save_state(const char *file, const char *cardname);

6
alsactl/init_parse.c
View file

@ -1762,6 +1762,9 @@ int init(const char *filename, const char *cardname)
break;
}
first = 0;
err = init_ucm(card);
if (err == 0)
continue;
err = init_space(&space, card);
if (err == 0) {
space->rootdir = new_root_dir(filename);
@ -1784,6 +1787,9 @@ int init(const char *filename, const char *cardname)
error("Cannot find soundcard '%s'...", cardname);
goto error;
}
err = init_ucm(card);
if (err == 0)
return 0;
memset(&space, 0, sizeof(space));
err = init_space(&space, card);
if (err == 0) {

40
alsactl/init_ucm.c Normal file
View file

@ -0,0 +1,40 @@
/*
* Advanced Linux Sound Architecture Control Program - UCM Initialization
* Copyright (c) by Jaroslav Kysela <perex@perex.cz>
*
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include <alsa/use-case.h>
/*
* Keep it as simple as possible. Execute commands from the SectionOnce only.
*/
int init_ucm(int cardno)
{
snd_use_case_mgr_t *uc_mgr;
char id[32];
int err;
snprintf(id, sizeof(id), "hw:%d", cardno);
err = snd_use_case_mgr_open(&uc_mgr, id);
if (err < 0)
return err;
err = snd_use_case_set(uc_mgr, "_once", NULL);
snd_use_case_mgr_close(uc_mgr);
return err;
}