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

output/shout: pass reference to Setup()

Browse Source
This commit is contained in:
Max Kellermann 2022-04-26 16:48:52 +02:00
parent c779fc37eb
commit 83072d6b9c
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ class ShoutConfig {
public: public:
ShoutConfig(const ConfigBlock &block, const char *mime_type); ShoutConfig(const ConfigBlock &block, const char *mime_type);
void Setup(shout_t *connection) const; void Setup(shout_t &connection) const;
}; };
struct ShoutOutput final : AudioOutput { struct ShoutOutput final : AudioOutput {
@ -230,40 +230,40 @@ ShoutOutput::Create(EventLoop &, const ConfigBlock &block)
} }
inline void inline void
ShoutConfig::Setup(shout_t *connection) const ShoutConfig::Setup(shout_t &connection) const
{ {
if (shout_set_host(connection, host) != SHOUTERR_SUCCESS || if (shout_set_host(&connection, host) != SHOUTERR_SUCCESS ||
shout_set_port(connection, port) != SHOUTERR_SUCCESS || shout_set_port(&connection, port) != SHOUTERR_SUCCESS ||
shout_set_password(connection, passwd) != SHOUTERR_SUCCESS || shout_set_password(&connection, passwd) != SHOUTERR_SUCCESS ||
shout_set_mount(connection, mount) != SHOUTERR_SUCCESS || shout_set_mount(&connection, mount) != SHOUTERR_SUCCESS ||
shout_set_name(connection, name) != SHOUTERR_SUCCESS || shout_set_name(&connection, name) != SHOUTERR_SUCCESS ||
shout_set_user(connection, user) != SHOUTERR_SUCCESS || shout_set_user(&connection, user) != SHOUTERR_SUCCESS ||
shout_set_public(connection, is_public) != SHOUTERR_SUCCESS || shout_set_public(&connection, is_public) != SHOUTERR_SUCCESS ||
shout_set_format(connection, format) != SHOUTERR_SUCCESS || shout_set_format(&connection, format) != SHOUTERR_SUCCESS ||
shout_set_protocol(connection, protocol) != SHOUTERR_SUCCESS || shout_set_protocol(&connection, protocol) != SHOUTERR_SUCCESS ||
#ifdef SHOUT_TLS #ifdef SHOUT_TLS
shout_set_tls(connection, tls) != SHOUTERR_SUCCESS || shout_set_tls(&connection, tls) != SHOUTERR_SUCCESS ||
#endif #endif
shout_set_agent(connection, "MPD") != SHOUTERR_SUCCESS) shout_set_agent(&connection, "MPD") != SHOUTERR_SUCCESS)
throw std::runtime_error(shout_get_error(connection)); throw std::runtime_error(shout_get_error(&connection));
/* optional paramters */ /* optional paramters */
if (genre != nullptr && shout_set_genre(connection, genre)) if (genre != nullptr && shout_set_genre(&connection, genre))
throw std::runtime_error(shout_get_error(connection)); throw std::runtime_error(shout_get_error(&connection));
if (description != nullptr && if (description != nullptr &&
shout_set_description(connection, description)) shout_set_description(&connection, description))
throw std::runtime_error(shout_get_error(connection)); throw std::runtime_error(shout_get_error(&connection));
if (url != nullptr && shout_set_url(connection, url)) if (url != nullptr && shout_set_url(&connection, url))
throw std::runtime_error(shout_get_error(connection)); throw std::runtime_error(shout_get_error(&connection));
if (quality != nullptr) if (quality != nullptr)
shout_set_audio_info(connection, SHOUT_AI_QUALITY, quality); shout_set_audio_info(&connection, SHOUT_AI_QUALITY, quality);
if (bitrate != nullptr) if (bitrate != nullptr)
shout_set_audio_info(connection, SHOUT_AI_BITRATE, bitrate); shout_set_audio_info(&connection, SHOUT_AI_BITRATE, bitrate);
} }
void void
@ -274,7 +274,7 @@ ShoutOutput::Enable()
throw std::bad_alloc{}; throw std::bad_alloc{};
try { try {
config.Setup(shout_conn); config.Setup(*shout_conn);
} catch (...) { } catch (...) {
shout_free(shout_conn); shout_free(shout_conn);
throw; throw;