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

stream is shared_ptr

Browse source
This commit is contained in:
badaix 2016-11-13 15:57:49 +01:00
parent 0c5646679e
commit 3fe88b7440
10 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/controller.cpp
View file

@ -92,7 +92,7 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
logO << "Codec: " << headerChunk_->codec << "\n";
decoder_.reset(nullptr);
stream_.reset(nullptr);
stream_ = nullptr;
player_.reset(nullptr);
if (headerChunk_->codec == "pcm")
@ -109,15 +109,15 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
sampleFormat_ = decoder_->setHeader(headerChunk_.get());
logState << "sampleformat: " << sampleFormat_.rate << ":" << sampleFormat_.bits << ":" << sampleFormat_.channels << "\n";
stream_.reset(new Stream(sampleFormat_));
stream_ = make_shared<Stream>(sampleFormat_);
stream_->setBufferLen(serverSettings_->getBufferMs() - latency_);
#ifdef HAS_ALSA
player_.reset(new AlsaPlayer(pcmDevice_, stream_.get()));
player_.reset(new AlsaPlayer(pcmDevice_, stream_));
#elif HAS_OPENSL
player_.reset(new OpenslPlayer(pcmDevice_, stream_.get()));
player_.reset(new OpenslPlayer(pcmDevice_, stream_));
#elif HAS_COREAUDIO
player_.reset(new CoreAudioPlayer(pcmDevice_, stream_.get()));
player_.reset(new CoreAudioPlayer(pcmDevice_, stream_));
#else
throw SnapException("No audio player support");
#endif