aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-11-03 04:17:18 -05:00
Code

Support pass-through encoder (again)

Browse Source
This commit is contained in:
Moritz Grimm 2018-01-23 00:44:04 +01:00
parent b7d1269944
commit 5287bbdd4b
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ezstream.c
View File

@ -179,8 +179,6 @@ _build_reencode_cmd(const char *extension, const char *filename,
dicts[4].from = PLACEHOLDER_METADATA; dicts[4].from = PLACEHOLDER_METADATA;
dicts[4].to = custom_songinfo; dicts[4].to = custom_songinfo;
dec_str = util_expand_words(cfg_decoder_get_program(decoder), dicts);
if (!cfg_get_metadata_program() && if (!cfg_get_metadata_program() &&
strstr(cfg_encoder_get_program(encoder), strstr(cfg_encoder_get_program(encoder),
PLACEHOLDER_TITLE) != NULL) { PLACEHOLDER_TITLE) != NULL) {
@ -188,13 +186,21 @@ _build_reencode_cmd(const char *extension, const char *filename,
dicts[4].to = custom_songinfo = xstrdup(""); dicts[4].to = custom_songinfo = xstrdup("");
} }
enc_str = util_expand_words(cfg_encoder_get_program(encoder), dicts); dec_str = util_expand_words(cfg_decoder_get_program(decoder), dicts);
cmd_str_size = strlen(dec_str) + 1;
cmd_str_size = strlen(dec_str) + strlen(" | ") + strlen(enc_str) + 1; if (cfg_encoder_get_program(encoder)) {
cmd_str = xcalloc(cmd_str_size, sizeof(char)); enc_str = util_expand_words(cfg_encoder_get_program(encoder),
snprintf(cmd_str, cmd_str_size, "%s | %s", dec_str, enc_str); dicts);
xfree(dec_str); cmd_str_size += strlen(" | ") + strlen(enc_str);
xfree(enc_str); cmd_str = xcalloc(cmd_str_size, sizeof(char));
snprintf(cmd_str, cmd_str_size, "%s | %s", dec_str, enc_str);
xfree(enc_str);
xfree(dec_str);
} else {
cmd_str = xcalloc(cmd_str_size, sizeof(char));
snprintf(cmd_str, cmd_str_size, "%s", dec_str);
xfree(dec_str);
}
xfree(artist); xfree(artist);
xfree(album); xfree(album);