3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-04-30 18:57:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix automatic port selection

Browse source 
- shairport-sync sends a different message since 3.0 when the port cannot be opened (945483d9c3)
- to send logs to stderr, the --use-stderr parameter is needed since 3.3 (https://github.com/mikebrady/shairport-sync/blob/master/RELEASENOTES.md#version-33)
This commit is contained in:
Christian Flach 2020-01-29 11:38:50 +01:00
parent 2158c3e085
commit 05575f46e6
No known key found for this signature in database
GPG key ID: 02D48802CD830869
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/streamreader/airplay_stream.cpp
View file

@ -62,7 +62,7 @@ AirplayStream::AirplayStream(PcmListener* pcmListener, boost::asio::io_context&
port_ = cpt::stoul(uri_.getQuery("port", "5000"));
string devicename = uri_.getQuery("devicename", "Snapcast");
params_wo_port_ = "--name=\"" + devicename + "\" --output=stdout";
params_wo_port_ = "--name=\"" + devicename + "\" --output=stdout --use-stderr";
params_wo_port_ += " --metadata-pipename " + pipePath_;
params_ = params_wo_port_ + " --port=" + cpt::to_string(port_);
@ -152,10 +152,11 @@ void AirplayStream::pipeReadLine()
{
int fd = open(pipePath_.c_str(), O_RDONLY | O_NONBLOCK);
pipe_fd_ = std::make_unique<boost::asio::posix::stream_descriptor>(ioc_, fd);
LOG(INFO, LOG_TAG) << "Metadata pipe opened\n";
}
catch (const std::exception& e)
{
LOG(ERROR, LOG_TAG) << "Error opening pipe: " << e.what() << "\n";
LOG(ERROR, LOG_TAG) << "Error opening metadata pipe, retrying in 500ms. Error: " << e.what() << "\n";
pipe_fd_ = nullptr;
wait(pipe_open_timer_, 500ms, [this] { pipeReadLine(); });
return;
@ -166,7 +167,7 @@ void AirplayStream::pipeReadLine()
boost::asio::async_read_until(*pipe_fd_, streambuf_pipe_, delimiter, [this, delimiter](const std::error_code& ec, std::size_t bytes_transferred) {
if (ec)
{
LOG(ERROR, LOG_TAG) << "Error while reading from pipe: " << ec.message() << "\n";
LOG(ERROR, LOG_TAG) << "Error while reading from metadata pipe: " << ec.message() << "\n";
return;
}
@ -241,9 +242,9 @@ void AirplayStream::onStderrMsg(const std::string& line)
if (line.empty())
return;
LOG(INFO, LOG_TAG) << "(" << getName() << ") " << line << "\n";
if (line.find("Is another Shairport Sync running on this device") != string::npos)
if (line.find("Is another instance of Shairport Sync running on this device") != string::npos)
{
LOG(ERROR, LOG_TAG) << "Seem there is another Shairport Sync runnig on port " << port_ << ", switching to port " << port_ + 1 << "\n";
LOG(ERROR, LOG_TAG) << "It seems there is another Shairport Sync runnig on port " << port_ << ", switching to port " << port_ + 1 << "\n";
++port_;
params_ = params_wo_port_ + " --port=" + cpt::to_string(port_);
}