3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-16 02:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Small code cleanup

Browse source
This commit is contained in:
badaix 2020-06-06 13:44:22 +02:00
parent 8238f7a147
commit 0af19ca0cb
2 changed files with 102 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/client_connection.cpp
View file

@ -155,6 +155,7 @@ void ClientConnection::sendNext()
})); }));
} }
void ClientConnection::send(const msg::message_ptr& message, const ResultHandler& handler) void ClientConnection::send(const msg::message_ptr& message, const ResultHandler& handler)
{ {
strand_.post([this, message, handler]() { strand_.post([this, message, handler]() {

202
client/controller.cpp
View file

@ -65,6 +65,7 @@
using namespace std; using namespace std;
static constexpr auto LOG_TAG = "Controller"; static constexpr auto LOG_TAG = "Controller";
static constexpr auto TIME_SYNC_INTERVAL = 1s;
Controller::Controller(boost::asio::io_context& io_context, const ClientSettings& settings, std::unique_ptr<MetadataAdapter> meta) Controller::Controller(boost::asio::io_context& io_context, const ClientSettings& settings, std::unique_ptr<MetadataAdapter> meta)
: io_context_(io_context), timer_(io_context), settings_(settings), stream_(nullptr), decoder_(nullptr), player_(nullptr), meta_(std::move(meta)), : io_context_(io_context), timer_(io_context), settings_(settings), stream_(nullptr), decoder_(nullptr), player_(nullptr), meta_(std::move(meta)),
@ -88,139 +89,138 @@ std::unique_ptr<Player> Controller::createPlayer(ClientSettings::Player& setting
void Controller::getNextMessage() void Controller::getNextMessage()
{ {
clientConnection_->getNextMessage([this](const boost::system::error_code& ec, std::unique_ptr<msg::BaseMessage> response) { clientConnection_->getNextMessage([this](const boost::system::error_code& ec, std::unique_ptr<msg::BaseMessage> response) {
if (!ec) if (ec)
{ {
if (response->type == message_type::kWireChunk) reconnect();
{ return;
if (stream_ && decoder_) }
{
// execute on the io_context to do the (costly) decoding on another thread (if more than one thread is used)
// boost::asio::post(io_context_, [this, response = std::move(response)]() mutable {
auto pcmChunk = msg::message_cast<msg::PcmChunk>(std::move(response));
pcmChunk->format = sampleFormat_;
// LOG(TRACE, LOG_TAG) << "chunk: " << pcmChunk->payloadSize << ", sampleFormat: " << sampleFormat_.toString() << "\n";
if (decoder_->decode(pcmChunk.get()))
{
// LOG(TRACE, LOG_TAG) << ", decoded: " << pcmChunk->payloadSize << ", Duration: " << pcmChunk->durationMs() << ", sec: " <<
// pcmChunk->timestamp.sec << ", usec: " << pcmChunk->timestamp.usec / 1000 << ", type: " << pcmChunk->type << "\n";
stream_->addChunk(std::move(pcmChunk));
}
// });
}
}
else if (response->type == message_type::kServerSettings)
{
serverSettings_ = msg::message_cast<msg::ServerSettings>(std::move(response));
LOG(INFO, LOG_TAG) << "ServerSettings - buffer: " << serverSettings_->getBufferMs() << ", latency: " << serverSettings_->getLatency()
<< ", volume: " << serverSettings_->getVolume() << ", muted: " << serverSettings_->isMuted() << "\n";
if (stream_ && player_)
{
player_->setVolume(serverSettings_->getVolume() / 100., serverSettings_->isMuted());
stream_->setBufferLen(std::max(0, serverSettings_->getBufferMs() - serverSettings_->getLatency() - settings_.player.latency));
}
}
else if (response->type == message_type::kCodecHeader)
{
headerChunk_ = msg::message_cast<msg::CodecHeader>(std::move(response));
decoder_.reset(nullptr);
stream_ = nullptr;
player_.reset(nullptr);
if (headerChunk_->codec == "pcm") if (response->type == message_type::kWireChunk)
decoder_ = make_unique<decoder::PcmDecoder>(); {
if (stream_ && decoder_)
{
// execute on the io_context to do the (costly) decoding on another thread (if more than one thread is used)
// boost::asio::post(io_context_, [this, response = std::move(response)]() mutable {
auto pcmChunk = msg::message_cast<msg::PcmChunk>(std::move(response));
pcmChunk->format = sampleFormat_;
// LOG(TRACE, LOG_TAG) << "chunk: " << pcmChunk->payloadSize << ", sampleFormat: " << sampleFormat_.toString() << "\n";
if (decoder_->decode(pcmChunk.get()))
{
// LOG(TRACE, LOG_TAG) << ", decoded: " << pcmChunk->payloadSize << ", Duration: " << pcmChunk->durationMs() << ", sec: " <<
// pcmChunk->timestamp.sec << ", usec: " << pcmChunk->timestamp.usec / 1000 << ", type: " << pcmChunk->type << "\n";
stream_->addChunk(std::move(pcmChunk));
}
// });
}
}
else if (response->type == message_type::kServerSettings)
{
serverSettings_ = msg::message_cast<msg::ServerSettings>(std::move(response));
LOG(INFO, LOG_TAG) << "ServerSettings - buffer: " << serverSettings_->getBufferMs() << ", latency: " << serverSettings_->getLatency()
<< ", volume: " << serverSettings_->getVolume() << ", muted: " << serverSettings_->isMuted() << "\n";
if (stream_ && player_)
{
player_->setVolume(serverSettings_->getVolume() / 100., serverSettings_->isMuted());
stream_->setBufferLen(std::max(0, serverSettings_->getBufferMs() - serverSettings_->getLatency() - settings_.player.latency));
}
}
else if (response->type == message_type::kCodecHeader)
{
headerChunk_ = msg::message_cast<msg::CodecHeader>(std::move(response));
decoder_.reset(nullptr);
stream_ = nullptr;
player_.reset(nullptr);
if (headerChunk_->codec == "pcm")
decoder_ = make_unique<decoder::PcmDecoder>();
#if defined(HAS_OGG) && (defined(HAS_TREMOR) || defined(HAS_VORBIS)) #if defined(HAS_OGG) && (defined(HAS_TREMOR) || defined(HAS_VORBIS))
else if (headerChunk_->codec == "ogg") else if (headerChunk_->codec == "ogg")
decoder_ = make_unique<decoder::OggDecoder>(); decoder_ = make_unique<decoder::OggDecoder>();
#endif #endif
#if defined(HAS_FLAC) #if defined(HAS_FLAC)
else if (headerChunk_->codec == "flac") else if (headerChunk_->codec == "flac")
decoder_ = make_unique<decoder::FlacDecoder>(); decoder_ = make_unique<decoder::FlacDecoder>();
#endif #endif
#if defined(HAS_OPUS) #if defined(HAS_OPUS)
else if (headerChunk_->codec == "opus") else if (headerChunk_->codec == "opus")
decoder_ = make_unique<decoder::OpusDecoder>(); decoder_ = make_unique<decoder::OpusDecoder>();
#endif #endif
else else
throw SnapException("codec not supported: \"" + headerChunk_->codec + "\""); throw SnapException("codec not supported: \"" + headerChunk_->codec + "\"");
sampleFormat_ = decoder_->setHeader(headerChunk_.get()); sampleFormat_ = decoder_->setHeader(headerChunk_.get());
LOG(INFO, LOG_TAG) << "Codec: " << headerChunk_->codec << ", sampleformat: " << sampleFormat_.toString() << "\n"; LOG(INFO, LOG_TAG) << "Codec: " << headerChunk_->codec << ", sampleformat: " << sampleFormat_.toString() << "\n";
stream_ = make_shared<Stream>(sampleFormat_, settings_.player.sample_format); stream_ = make_shared<Stream>(sampleFormat_, settings_.player.sample_format);
stream_->setBufferLen(std::max(0, serverSettings_->getBufferMs() - serverSettings_->getLatency() - settings_.player.latency)); stream_->setBufferLen(std::max(0, serverSettings_->getBufferMs() - serverSettings_->getLatency() - settings_.player.latency));
#ifdef HAS_ALSA #ifdef HAS_ALSA
if (!player_) if (!player_)
player_ = createPlayer<AlsaPlayer>(settings_.player, "alsa"); player_ = createPlayer<AlsaPlayer>(settings_.player, "alsa");
#endif #endif
#ifdef HAS_OBOE #ifdef HAS_OBOE
if (!player_) if (!player_)
player_ = createPlayer<OboePlayer>(settings_.player, "oboe"); player_ = createPlayer<OboePlayer>(settings_.player, "oboe");
#endif #endif
#ifdef HAS_OPENSL #ifdef HAS_OPENSL
if (!player_) if (!player_)
player_ = createPlayer<OpenslPlayer>(settings_.player, "opensl"); player_ = createPlayer<OpenslPlayer>(settings_.player, "opensl");
#endif #endif
#ifdef HAS_COREAUDIO #ifdef HAS_COREAUDIO
if (!player_) if (!player_)
player_ = createPlayer<CoreAudioPlayer>(settings_.player, "coreaudio"); player_ = createPlayer<CoreAudioPlayer>(settings_.player, "coreaudio");
#endif #endif
#ifdef HAS_WASAPI #ifdef HAS_WASAPI
if (!player_) if (!player_)
player_ = createPlayer<WASAPIPlayer>(settings_.player, "wasapi"); player_ = createPlayer<WASAPIPlayer>(settings_.player, "wasapi");
#endif #endif
if (!player_ && (settings_.player.player_name == "file")) if (!player_ && (settings_.player.player_name == "file"))
player_ = createPlayer<FilePlayer>(settings_.player, "file"); player_ = createPlayer<FilePlayer>(settings_.player, "file");
if (!player_) if (!player_)
throw SnapException("No audio player support"); throw SnapException("No audio player support");
player_->setVolumeCallback([this](double volume, bool muted) { player_->setVolumeCallback([this](double volume, bool muted) {
static double last_volume(-1); static double last_volume(-1);
static bool last_muted(true); static bool last_muted(true);
if ((volume != last_volume) || (last_muted != muted)) if ((volume != last_volume) || (last_muted != muted))
{
last_volume = volume;
last_muted = muted;
auto info = std::make_shared<msg::ClientInfo>();
info->setVolume(static_cast<uint16_t>(volume * 100.));
info->setMuted(muted);
clientConnection_->send(info, [this](const boost::system::error_code& ec) {
if (ec)
{
LOG(ERROR, LOG_TAG) << "Failed to send client info, error: " << ec.message() << "\n";
reconnect();
return;
}
});
}
});
player_->start();
// Don't change the initial hardware mixer volume on the user's device.
// The player class will send the device's volume to the server instead
if (settings_.player.mixer.mode != ClientSettings::Mixer::Mode::hardware)
{ {
player_->setVolume(serverSettings_->getVolume() / 100., serverSettings_->isMuted()); last_volume = volume;
last_muted = muted;
auto info = std::make_shared<msg::ClientInfo>();
info->setVolume(static_cast<uint16_t>(volume * 100.));
info->setMuted(muted);
clientConnection_->send(info, [this](const boost::system::error_code& ec) {
if (ec)
{
LOG(ERROR, LOG_TAG) << "Failed to send client info, error: " << ec.message() << "\n";
reconnect();
return;
}
});
} }
} });
else if (response->type == message_type::kStreamTags) player_->start();
// Don't change the initial hardware mixer volume on the user's device.
// The player class will send the device's volume to the server instead
if (settings_.player.mixer.mode != ClientSettings::Mixer::Mode::hardware)
{ {
if (meta_) player_->setVolume(serverSettings_->getVolume() / 100., serverSettings_->isMuted());
{
auto stream_tags = msg::message_cast<msg::StreamTags>(std::move(response));
meta_->push(stream_tags->msg);
}
} }
else }
else if (response->type == message_type::kStreamTags)
{
if (meta_)
{ {
LOG(WARNING, LOG_TAG) << "Unexpected message received, type: " << response->type << "\n"; auto stream_tags = msg::message_cast<msg::StreamTags>(std::move(response));
meta_->push(stream_tags->msg);
} }
getNextMessage();
} }
else else
{ {
reconnect(); LOG(WARNING, LOG_TAG) << "Unexpected message received, type: " << response->type << "\n";
} }
getNextMessage();
}); });
} }
@ -241,7 +241,7 @@ void Controller::sendTimeSyncMessage(int quick_syncs)
TimeProvider::getInstance().setDiff(response->latency, response->received - response->sent); TimeProvider::getInstance().setDiff(response->latency, response->received - response->sent);
} }
std::chrono::microseconds next = 1s; std::chrono::microseconds next = TIME_SYNC_INTERVAL;
if (quick_syncs > 0) if (quick_syncs > 0)
{ {
if (--quick_syncs == 0) if (--quick_syncs == 0)