diff --git a/common/utils.h b/common/utils.h index 98298509..96f1f63b 100644 --- a/common/utils.h +++ b/common/utils.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/server/Makefile b/server/Makefile index 86ea5963..78b7ea41 100644 --- a/server/Makefile +++ b/server/Makefile @@ -13,7 +13,7 @@ CXX = /usr/bin/g++ CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/popl/include LDFLAGS = -lrt -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -OBJ = snapServer.o config.o controlServer.o controlSession.o streamServer.o streamSession.o json/jsonrpc.o pcmreader/pcmReader.o pcmreader/pipeReader.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o publishAvahi.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o +OBJ = snapServer.o config.o controlServer.o controlSession.o streamServer.o streamSession.o json/jsonrpc.o pcmreader/pcmReaderFactory.o pcmreader/pcmReader.o pcmreader/pipeReader.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o publishAvahi.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o BIN = snapserver all: $(TARGET) diff --git a/server/pcmreader/pcmReader.cpp b/server/pcmreader/pcmReader.cpp index 83a22664..bd9b2a9c 100644 --- a/server/pcmreader/pcmReader.cpp +++ b/server/pcmreader/pcmReader.cpp @@ -23,13 +23,70 @@ #include "pcmReader.h" #include "../encoder/encoderFactory.h" -#include "common/log.h" +#include "common/utils.h" #include "common/snapException.h" +#include "common/log.h" using namespace std; +ReaderUri::ReaderUri(const std::string& uri) +{ +// https://en.wikipedia.org/wiki/Uniform_Resource_Identifier +// scheme:[//[user:password@]host[:port]][/]path[?query][#fragment] + size_t pos; + this->uri = uri; + string tmp(uri); + + pos = tmp.find(':'); + if (pos == string::npos) + throw invalid_argument("missing ':'"); + scheme = tmp.substr(0, pos); + tmp = tmp.substr(pos + 1); +// logD << "scheme: '" << scheme << "' tmp: '" << tmp << "'\n"; + + if (tmp.find("//") != 0) + throw invalid_argument("missing host separator: '//'"); + tmp = tmp.substr(2); + + pos = tmp.find('/'); + if (pos == string::npos) + throw invalid_argument("missing path separator: '/'"); + host = tmp.substr(0, pos); + tmp = tmp.substr(pos + 1); + path = tmp; +// logD << "host: '" << host << "' tmp: '" << tmp << "' path: '" << path << "'\n"; + + pos = tmp.find('?'); + if (pos == string::npos) + return; + + path = tmp.substr(0, pos); + tmp = tmp.substr(pos + 1); + string queryStr = tmp; +// logD << "path: '" << path << "' tmp: '" << tmp << "' query: '" << queryStr << "'\n"; + + pos = tmp.find('#'); + if (pos != string::npos) + { + queryStr = tmp.substr(0, pos); + tmp = tmp.substr(pos + 1); + fragment = tmp; +// logD << "query: '" << queryStr << "' fragment: '" << fragment << "' tmp: '" << tmp << "'\n"; + } + + vector keyValueList = split(queryStr, '&'); + for (auto& kv: keyValueList) + { + pos = kv.find('='); + if (pos != string::npos) + query[kv.substr(0, pos)] = kv.substr(pos+1); + } + +// for (auto& kv: query) +// logD << "key: '" << kv.first << "' value: '" << kv.second << "'\n"; +} PcmReader::PcmReader(PcmListener* pcmListener, const msg::SampleFormat& sampleFormat, const std::string& codec, const std::string& fifoName, size_t pcmReadMs) : pcmListener_(pcmListener), sampleFormat_(sampleFormat), pcmReadMs_(pcmReadMs) @@ -42,7 +99,6 @@ PcmReader::PcmReader(PcmListener* pcmListener, const msg::SampleFormat& sampleFo PcmReader::~PcmReader() { stop(); - close(fd_); } diff --git a/server/pcmreader/pcmReader.h b/server/pcmreader/pcmReader.h index cb8a9375..6cec5866 100644 --- a/server/pcmreader/pcmReader.h +++ b/server/pcmreader/pcmReader.h @@ -22,6 +22,7 @@ #include #include #include +#include #include "../encoder/encoder.h" #include "message/sampleFormat.h" #include "message/header.h" @@ -42,6 +43,26 @@ public: }; +struct ReaderUri +{ + ReaderUri(const std::string& uri); + std::string uri; + std::string scheme; +/* struct Authority + { + std::string username; + std::string password; + std::string host; + size_t port; + }; + Authority authority; +*/ + std::string host; + std::string path; + std::map query; + std::string fragment; +}; + /// Reads and decodes PCM data /** diff --git a/server/pcmreader/pcmReaderFactory.cpp b/server/pcmreader/pcmReaderFactory.cpp new file mode 100644 index 00000000..de806cf0 --- /dev/null +++ b/server/pcmreader/pcmReaderFactory.cpp @@ -0,0 +1,54 @@ +/*** + This file is part of snapcast + Copyright (C) 2015 Johannes Pohl + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +***/ + +#include "common/utils.h" +#include "pcmReaderFactory.h" +#include "pipeReader.h" + + +using namespace std; + + +PcmReader* PcmReaderFactory::createPcmReader(const std::string& uri) const +{ + PcmReader* pcmReader = NULL; +/* + std::string codec(codecSettings); + std::string codecOptions; + if (codec.find(":") != std::string::npos) + { + codecOptions = trim_copy(codec.substr(codec.find(":") + 1)); + codec = trim_copy(codec.substr(0, codec.find(":"))); + } + if (codec == "ogg") + encoder = new OggEncoder(codecOptions); + else if (codec == "pcm") + encoder = new PcmEncoder(codecOptions); + else if (codec == "flac") + encoder = new FlacEncoder(codecOptions); + else + { + cout << "unknown codec: " << codec << "\n"; + return NULL; + } +*/ + return pcmReader; +} + + + diff --git a/server/pcmreader/pcmReaderFactory.h b/server/pcmreader/pcmReaderFactory.h new file mode 100644 index 00000000..e2e80404 --- /dev/null +++ b/server/pcmreader/pcmReaderFactory.h @@ -0,0 +1,14 @@ +#ifndef PCM_READER_FACTORY_H +#define PCM_READER_FACTORY_H + +#include +#include "pcmReader.h" + +class PcmReaderFactory +{ +public: + PcmReader* createPcmReader(const std::string& uri) const; +}; + + +#endif diff --git a/server/pcmreader/pipeReader.cpp b/server/pcmreader/pipeReader.cpp index 6dd33b42..7125e114 100644 --- a/server/pcmreader/pipeReader.cpp +++ b/server/pcmreader/pipeReader.cpp @@ -44,6 +44,7 @@ PipeReader::PipeReader(PcmListener* pcmListener, const msg::SampleFormat& sample PipeReader::~PipeReader() { + close(fd_); } diff --git a/server/snapServer.cpp b/server/snapServer.cpp index 8f7e19a4..85b2b390 100644 --- a/server/snapServer.cpp +++ b/server/snapServer.cpp @@ -46,6 +46,7 @@ int main(int argc, char* argv[]) try { StreamServerSettings settings; + std::string pcmStream = "pipe:///tmp/snapfifo"; int processPriority(-3); Switch helpSwitch("h", "help", "produce help message"); @@ -54,7 +55,7 @@ int main(int argc, char* argv[]) Value controlPortValue("", "controlPort", "Remote control port", settings.controlPort, &settings.controlPort); Value sampleFormatValue("s", "sampleformat", "sample format", settings.sampleFormat.getFormat()); Value codecValue("c", "codec", "transport codec [flac|ogg|pcm][:options]\nType codec:? to get codec specific options", settings.codec, &settings.codec); - Value fifoValue("f", "fifo", "name of the input fifo file", settings.fifoName, &settings.fifoName); + Value fifoValue("f", "fifo", "name of the input fifo file", pcmStream, &pcmStream); Implicit daemonOption("d", "daemon", "daemonize\noptional process priority [-20..19]", 0, &processPriority); Value bufferValue("b", "buffer", "buffer [ms]", settings.bufferMs, &settings.bufferMs); Value pipeBufferValue("", "pipeReadBuffer", "pipe read buffer [ms]", settings.pipeReadMs, &settings.pipeReadMs); @@ -99,6 +100,15 @@ int main(int argc, char* argv[]) exit(EXIT_SUCCESS); } + if (!fifoValue.isSet()) + settings.pcmStreams.push_back(fifoValue.getValue()); + + for (size_t n=0; nstart(); - pcmReader_ .reset(new PipeReader(this, settings_.sampleFormat, settings_.codec, settings_.fifoName, settings_.pipeReadMs)); + settings_.pcmStreams[0] = "/tmp/snapfifo"; + pcmReader_.reset(new PipeReader(this, settings_.sampleFormat, settings_.codec, settings_.pcmStreams[0], settings_.pipeReadMs)); pcmReader_->start(); acceptor_ = make_shared(*io_service_, tcp::endpoint(tcp::v4(), settings_.port)); startAccept(); diff --git a/server/streamServer.h b/server/streamServer.h index 52bfa7f2..defde9b0 100644 --- a/server/streamServer.h +++ b/server/streamServer.h @@ -46,7 +46,6 @@ struct StreamServerSettings StreamServerSettings() : port(1704), controlPort(1705), - fifoName("/tmp/snapfifo"), codec("flac"), bufferMs(1000), sampleFormat("48000:16:2"), @@ -55,7 +54,7 @@ struct StreamServerSettings } size_t port; size_t controlPort; - std::string fifoName; + std::vector pcmStreams; std::string codec; int32_t bufferMs; msg::SampleFormat sampleFormat;