oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/Shout: move code to ShoutSetAudioInfo()

Browse Source
This commit is contained in:
Max Kellermann 2017-08-08 18:34:26 +02:00
parent 3ab905644d
commit 6e24381962
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/output/plugins/ShoutOutputPlugin.cxx
View File

@ -100,6 +100,18 @@ shout_encoder_plugin_get(const char *name)
return encoder_plugin_get(name); return encoder_plugin_get(name);
} }
static void
ShoutSetAudioInfo(shout_t *shout_conn, const AudioFormat &audio_format)
{
char temp[11];
snprintf(temp, sizeof(temp), "%u", audio_format.channels);
shout_set_audio_info(shout_conn, SHOUT_AI_CHANNELS, temp);
snprintf(temp, sizeof(temp), "%u", audio_format.sample_rate);
shout_set_audio_info(shout_conn, SHOUT_AI_SAMPLERATE, temp);
}
ShoutOutput::ShoutOutput(const ConfigBlock &block) ShoutOutput::ShoutOutput(const ConfigBlock &block)
:base(shout_output_plugin, block), :base(shout_output_plugin, block),
shout_conn(shout_new()), shout_conn(shout_new()),
@ -212,16 +224,10 @@ ShoutOutput::ShoutOutput(const ConfigBlock &block)
if (value != nullptr && shout_set_url(shout_conn, value)) if (value != nullptr && shout_set_url(shout_conn, value))
throw std::runtime_error(shout_get_error(shout_conn)); throw std::runtime_error(shout_get_error(shout_conn));
ShoutSetAudioInfo(shout_conn, audio_format);
{ {
char temp[11]; char temp[11];
snprintf(temp, sizeof(temp), "%u", audio_format.channels);
shout_set_audio_info(shout_conn, SHOUT_AI_CHANNELS, temp);
snprintf(temp, sizeof(temp), "%u", audio_format.sample_rate);
shout_set_audio_info(shout_conn, SHOUT_AI_SAMPLERATE, temp);
if (quality >= -1.0) { if (quality >= -1.0) {
snprintf(temp, sizeof(temp), "%2.2f", quality); snprintf(temp, sizeof(temp), "%2.2f", quality);
shout_set_audio_info(shout_conn, SHOUT_AI_QUALITY, shout_set_audio_info(shout_conn, SHOUT_AI_QUALITY,