gemian/pulseaudio-modules-droid
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: Use replace in place from utils in parser.

Browse source
This commit is contained in:
Juho Hämäläinen 2022-02-23 10:55:40 +02:00
parent 67eeb83105
commit 4ca8716bd1
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/config-parser-xml.c
View file

@ -37,6 +37,7 @@
#include "droid/conversion.h" #include "droid/conversion.h"
#include "droid/sllist.h" #include "droid/sllist.h"
#include "droid/utils.h"
#ifdef XML_UNICODE_WCHAR_T #ifdef XML_UNICODE_WCHAR_T
# include <wchar.h> # include <wchar.h>
@ -737,18 +738,6 @@ done:
return parsed; return parsed;
} }
static void replace_in_place(char **string, const char *a, const char *b) {
char *tmp;
pa_assert(*string);
pa_assert(a);
pa_assert(b);
tmp = pa_replace(*string, a, b);
pa_xfree(*string);
*string = tmp;
}
static bool parse_profile(struct parser_data *data, const char *element_name, const XML_Char **attributes) { static bool parse_profile(struct parser_data *data, const char *element_name, const XML_Char **attributes) {
struct profile *p; struct profile *p;
int channel_count = -1; int channel_count = -1;
@ -784,12 +773,12 @@ static bool parse_profile(struct parser_data *data, const char *element_name, co
if (output && pa_startswith(channelMasks, "AUDIO_CHANNEL_IN_")) { if (output && pa_startswith(channelMasks, "AUDIO_CHANNEL_IN_")) {
pa_log_info("[%s:%u] Output has wrong direction channel mask (%s), reversing.", pa_log_info("[%s:%u] Output has wrong direction channel mask (%s), reversing.",
data->fn, data->lineno, channelMasks); data->fn, data->lineno, channelMasks);
replace_in_place(&channelMasks, "AUDIO_CHANNEL_IN_", "AUDIO_CHANNEL_OUT_"); dm_replace_in_place(&channelMasks, "AUDIO_CHANNEL_IN_", "AUDIO_CHANNEL_OUT_");
} }
else if (!output && pa_startswith(channelMasks, "AUDIO_CHANNEL_OUT_")) { else if (!output && pa_startswith(channelMasks, "AUDIO_CHANNEL_OUT_")) {
pa_log_info("[%s:%u] Input has wrong direction channel mask (%s), reversing.", pa_log_info("[%s:%u] Input has wrong direction channel mask (%s), reversing.",
data->fn, data->lineno, channelMasks); data->fn, data->lineno, channelMasks);
replace_in_place(&channelMasks, "AUDIO_CHANNEL_OUT_", "AUDIO_CHANNEL_IN_"); dm_replace_in_place(&channelMasks, "AUDIO_CHANNEL_OUT_", "AUDIO_CHANNEL_IN_");
} }
} }