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

Rename experimental.tcp to tcp

Browse source
This commit is contained in:
badaix 2019-11-28 22:31:03 +01:00
parent fd616956cb
commit 3cb9902bbe
4 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/etc/snapserver.conf
View file

@ -82,8 +82,12 @@
# stream URI of the PCM input stream, can be configured multiple times
# Format: TYPE://host/path?name=NAME[&codec=CODEC][&sampleformat=SAMPLEFORMAT]
# Available types are:
# pipe: pipe:///<path/to/pipe>?name=<name>
# tcp server: tcp://<listen IP, e.g. 127.0.0.1>:<port>?name=<name>[&mode=server]
# tcp client: tcp://<server IP, e.g. 127.0.0.1>:<port>?name=<name>&mode=client
stream = pipe:///tmp/snapfifo?name=default
#stream = experimental.tcp://127.0.0.1?name=mopidy_tcp
#stream = tcp://127.0.0.1?name=mopidy_tcp
# Default sample format
#sampleformat = 48000:16:2

2
server/streamreader/asio_stream.hpp
View file

@ -96,6 +96,7 @@ template <typename ReadStream>
void AsioStream<ReadStream>::start()
{
encoder_->init(this, sampleFormat_);
active_ = true;
check_state();
connect();
}
@ -104,6 +105,7 @@ void AsioStream<ReadStream>::start()
template <typename ReadStream>
void AsioStream<ReadStream>::stop()
{
active_ = false;
timer_.cancel();
idle_timer_.cancel();
disconnect();

2
server/streamreader/stream_manager.cpp
View file

@ -79,7 +79,7 @@ PcmStreamPtr StreamManager::addStream(const std::string& uri)
{
stream = make_shared<AirplayStream>(pcmListener_, ioc_, streamUri);
}
else if (streamUri.scheme == "experimental.tcp")
else if (streamUri.scheme == "tcp")
{
stream = make_shared<TcpStream>(pcmListener_, ioc_, streamUri);
}

6
server/streamreader/tcp_stream.cpp
View file

@ -64,6 +64,9 @@ TcpStream::TcpStream(PcmListener* pcmListener, boost::asio::io_context& ioc, con
void TcpStream::connect()
{
if (!active_)
return;
auto self = shared_from_this();
if (is_server_)
@ -109,4 +112,7 @@ void TcpStream::disconnect()
{
if (stream_)
stream_->close();
if (acceptor_)
acceptor_->cancel();
reconnect_timer_.cancel();
}