added fileReader for testing purposes

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/readerUri.o pcmreader/streamManager.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/readerUri.o pcmreader/streamManager.o pcmreader/pcmReader.o pcmreader/pipeReader.o pcmreader/fileReader.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)

server/pcmreader/fileReader.cpp

@@ -0,0 +1,109 @@
+/***
+    This file is part of snapcast
+    Copyright (C) 2014-2016  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 <http://www.gnu.org/licenses/>.
+***/
+
+#include <memory>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "fileReader.h"
+#include "../encoder/encoderFactory.h"
+#include "common/log.h"
+#include "common/snapException.h"
+
+
+using namespace std;
+
+
+
+
+FileReader::FileReader(PcmListener* pcmListener, const ReaderUri& uri) : PcmReader(pcmListener, uri)
+{
+	ifs.open(uri_.path.c_str(), std::ifstream::in|std::ifstream::binary);
+	if (!ifs.good())
+	{
+		logE << "failed to open PCM file: \"" + uri_.path + "\"\n";
+		throw SnapException("failed to open PCM file: \"" + uri_.path + "\"");
+	}
+}
+
+
+FileReader::~FileReader()
+{
+	ifs.close();
+}
+
+
+void FileReader::worker()
+{
+	timeval tvChunk;
+	std::unique_ptr<msg::PcmChunk> chunk(new msg::PcmChunk(sampleFormat_, pcmReadMs_));
+
+	ifs.seekg (0, ifs.end);
+	size_t length = ifs.tellg();
+	ifs.seekg (0, ifs.beg);
+
+	while (active_)
+	{
+		gettimeofday(&tvChunk, NULL);
+		tvEncodedChunk_ = tvChunk;
+		long nextTick = chronos::getTickCount();
+		try
+		{
+			while (active_)
+			{
+				chunk->timestamp.sec = tvChunk.tv_sec;
+				chunk->timestamp.usec = tvChunk.tv_usec;
+				size_t toRead = chunk->payloadSize;
+				size_t count = 0;
+
+				size_t pos = ifs.tellg();
+				size_t left = length - pos;
+				if (left < toRead)
+				{
+					ifs.read(chunk->payload, left);
+					ifs.seekg (0, ifs.beg);
+					count = left;
+				}
+				ifs.read(chunk->payload + count, toRead - count);
+
+				encoder_->encode(chunk.get());
+				nextTick += pcmReadMs_;
+				chronos::addUs(tvChunk, pcmReadMs_ * 1000);
+				long currentTick = chronos::getTickCount();
+
+				if (nextTick >= currentTick)
+				{
+//					logO << "sleep: " << nextTick - currentTick << "\n";
+					usleep((nextTick - currentTick) * 1000);
+				}
+				else
+				{
+					gettimeofday(&tvChunk, NULL);
+					tvEncodedChunk_ = tvChunk;
+					pcmListener_->onResync(this, currentTick - nextTick);
+					nextTick = currentTick;
+				}
+			}
+		}
+		catch(const std::exception& e)
+		{
+			logE << "Exception: " << e.what() << std::endl;
+		}
+	}
+}

server/pcmreader/fileReader.h

@@ -0,0 +1,45 @@
+/***
+    This file is part of snapcast
+    Copyright (C) 2014-2016  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 <http://www.gnu.org/licenses/>.
+***/
+
+#ifndef FILE_READER_H
+#define FILE_READER_H
+
+#include "pcmReader.h"
+#include <fstream>
+
+
+/// Reads and decodes PCM data from a file
+/**
+ * Reads PCM from a file and passes the data to an encoder.
+ * Implements EncoderListener to get the encoded data.
+ * Data is passed to the PcmListener
+ */
+class FileReader : public PcmReader
+{
+public:
+	/// ctor. Encoded PCM data is passed to the PipeListener
+	FileReader(PcmListener* pcmListener, const ReaderUri& uri);
+	virtual ~FileReader();
+
+protected:
+	void worker();
+	std::ifstream ifs;
+};
+
+
+#endif

server/pcmreader/pcmReader.h

@@ -70,7 +70,6 @@ public:
 
 protected:
 	virtual void worker() = 0;
-	int fd_;
 	timeval tvEncodedChunk_;
 	std::atomic<bool> active_;
 	std::thread readerThread_;

server/pcmreader/pipeReader.h

@@ -38,6 +38,7 @@ public:
 
 protected:
 	void worker();
+	int fd_;
 };
 
 

server/pcmreader/streamManager.cpp

@@ -19,6 +19,7 @@
 #include "common/utils.h"
 #include "streamManager.h"
 #include "pipeReader.h"
+#include "fileReader.h"
 #include "common/log.h"
 
 
@@ -54,6 +55,11 @@ PcmReader* StreamManager::addStream(const std::string& uri)
 		streams_.push_back(make_shared<PipeReader>(pcmListener_, readerUri));//, sampleFormat, codec, pcmReadMs);
 		return streams_.back().get();
 	}
+	else if (readerUri.scheme == "file")
+	{
+		streams_.push_back(make_shared<FileReader>(pcmListener_, readerUri));//, sampleFormat, codec, pcmReadMs);
+		return streams_.back().get();
+	}
 
 	return NULL;
 }