scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 04:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

portaudio: accept device name prefixes

Browse Source 
Also copy the device name to caller allocated buffer instead of cumbersome
giving the pointer to original string.
This commit is contained in:
Martin Pulec
2024-05-14 09:06:52 +02:00
parent cec50e7656
commit d0bfef4651
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/audio/capture/portaudio.c
View File

@@ -122,7 +122,10 @@ static void portaudio_close(PaStream * stream) // closes and frees all audio res
Pa_Terminate();
}
static _Bool parse_fmt(const char *cfg, PaTime *latency, int *input_device_idx, const char **device_name) {
static _Bool
parse_fmt(const char *cfg, PaTime *latency, int *input_device_idx,
char device_name[static STR_LEN])
{
if (isdigit(cfg[0])) {
*input_device_idx = atoi(cfg);
cfg = strchr(cfg, ':') ? strchr(cfg, ':') + 1 : cfg + strlen(cfg);
@@ -131,14 +134,14 @@ static _Bool parse_fmt(const char *cfg, PaTime *latency, int *input_device_idx,
char *item = NULL;
char *saveptr = NULL;
while ((item = strtok_r(ccfg, ":", &saveptr)) != NULL) {
if (strstr(item, "latency=") == item) {
if (IS_KEY_PREFIX(item, "latency")) {
*latency = atof(strchr(item, '=') + 1);
} else if (strstr(item, "device=") == item) {
} else if (IS_KEY_PREFIX(item, "device")) {
const char *dev = strchr(item, '=') + 1;
if (isdigit(dev[0])) {
*input_device_idx = atoi(dev);
} else { // pointer to *input* cfg
*device_name = strchr(strstr(cfg, "device="), '=') + 1;
} else {
snprintf(device_name, STR_LEN, "%s", dev);
}
} else {
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Unknown option: %s!\n", item);
@@ -173,12 +176,12 @@ static void * audio_cap_portaudio_init(struct module *parent, const char *cfg)
}
int input_device_idx = -1;
const char *input_device_name = NULL;
char input_device_name[STR_LEN] = "";
PaError error;
const PaDeviceInfo *device_info = NULL;
PaTime latency = -1.0;
if (!parse_fmt(cfg, &latency, &input_device_idx, &input_device_name)) {
if (!parse_fmt(cfg, &latency, &input_device_idx, input_device_name)) {
return NULL;
}
@@ -202,7 +205,7 @@ static void * audio_cap_portaudio_init(struct module *parent, const char *cfg)
PaStreamParameters inputParameters;
// default device
if (input_device_name != NULL) {
if (strlen(input_device_name) > 0) {
input_device_idx = portaudio_select_device_by_name(input_device_name);
}
if (input_device_idx == -1) {

17
src/audio/playback/portaudio.c
View File

@@ -128,7 +128,10 @@ static void portaudio_close(PaStream * stream) // closes and frees all audio res
Pa_CloseStream(stream);
}
static _Bool parse_fmt(const char *cfg, int *input_device_idx, const char **device_name) {
static _Bool
parse_fmt(const char *cfg, int *input_device_idx,
char device_name[static STR_LEN])
{
if (isdigit(cfg[0])) {
*input_device_idx = atoi(cfg);
cfg = strchr(cfg, ':') ? strchr(cfg, ':') + 1 : cfg + strlen(cfg);
@@ -137,12 +140,12 @@ static _Bool parse_fmt(const char *cfg, int *input_device_idx, const char **devi
char *item = NULL;
char *saveptr = NULL;
while ((item = strtok_r(ccfg, ":", &saveptr)) != NULL) {
if (strstr(item, "device=") == item) {
if (IS_KEY_PREFIX(item, "device")) {
const char *dev = strchr(item, '=') + 1;
if (isdigit(dev[0])) {
*input_device_idx = atoi(dev);
} else { // pointer to *input* cfg
*device_name = strchr(strstr(cfg, "device="), '=') + 1;
} else {
snprintf(device_name, STR_LEN, "%s", dev);
}
} else {
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Unknown option: %s!\n", item);
@@ -167,7 +170,7 @@ static void audio_play_portaudio_help(void) {
static void * audio_play_portaudio_init(const char *cfg)
{
int output_device_idx = -1;
const char *output_device_name = NULL;
char output_device_name[STR_LEN] = "";
portaudio_print_version();
@@ -175,7 +178,7 @@ static void * audio_play_portaudio_init(const char *cfg)
audio_play_portaudio_help();
return INIT_NOERR;
}
if (!parse_fmt(cfg, &output_device_idx, &output_device_name)) {
if (!parse_fmt(cfg, &output_device_idx, output_device_name)) {
return NULL;
}
@@ -186,7 +189,7 @@ static void * audio_play_portaudio_init(const char *cfg)
return NULL;
}
if (output_device_name != NULL) {
if (strlen(output_device_name) > 0) {
output_device_idx = portaudio_select_device_by_name(output_device_name);
}