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

Added defines for OGG, AVAHI, ALSA, OPENSL, DAEMON

Browse source
This commit is contained in:
badaix 2016-03-23 19:37:04 +01:00
parent 750df78090
commit 54f0ad5a51
5 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/controller.cpp
View file

@ -19,7 +19,7 @@
#include <iostream>
#include <string>
#include <memory>
#ifndef ANDROID
#ifdef HAS_OGG
#include "decoder/oggDecoder.h"
#endif
#include "decoder/pcmDecoder.h"
@ -101,7 +101,7 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
if (headerChunk_->codec == "pcm")
decoder_.reset(new PcmDecoder());
#ifndef ANDROID
#ifdef HAS_OGG
else if (headerChunk_->codec == "ogg")
decoder_.reset(new OggDecoder());
#endif
@ -116,10 +116,12 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
stream_.reset(new Stream(sampleFormat_));
stream_->setBufferLen(serverSettings_->bufferMs - latency_);
#ifndef ANDROID
#ifdef HAS_ALSA
player_.reset(new AlsaPlayer(pcmDevice_, stream_.get()));
#else
#elif HAS_OPENSL
player_.reset(new OpenslPlayer(pcmDevice_, stream_.get()));
#else
throw SnapException("No ALSA or OPENSL support");
#endif
player_->setVolume(serverSettings_->volume / 100.);
player_->setMute(serverSettings_->muted);