3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-03 09:47:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove metadata pipe on behalf of shairport sync

Browse source
This commit is contained in:
badaix 2020-12-05 20:26:48 +01:00
parent ad538d5178
commit 296a2f4dea
4 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/streamreader/airplay_stream.cpp
View file

@ -21,6 +21,7 @@
#include "common/aixlog.hpp"
#include "common/snap_exception.hpp"
#include "common/utils.hpp"
#include "common/utils/file_utils.hpp"
#include "common/utils/string_utils.hpp"
using namespace std;
@ -209,6 +210,15 @@ void AirplayStream::do_connect()
}
void AirplayStream::do_disconnect()
{
ProcessStream::do_disconnect();
// Shairpot-sync created but does not remove the pipe
if (utils::file::exists(pipePath_) && (remove(pipePath_.c_str()) != 0))
LOG(INFO, LOG_TAG) << "Failed to remove metadata pipe \"" << pipePath_ << "\": " << errno << "\n";
}
void AirplayStream::pipeReadLine()
{
if (!pipe_fd_ || !pipe_fd_->is_open())
@ -236,8 +246,7 @@ void AirplayStream::pipeReadLine()
{
// For some reason, EOF is returned until the first metadata is written to the pipe.
// If shairport-sync has not finished setting up the pipe, bad file descriptor is returned.
LOG(INFO, LOG_TAG) << "Waiting for metadata, retrying in 2500ms"
<< "\n";
LOG(INFO, LOG_TAG) << "Waiting for metadata, retrying in 2500ms\n";
wait(pipe_open_timer_, 2500ms, [this] { pipeReadLine(); });
}
else