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

moved json.hpp to externals

Browse source
This commit is contained in:
badaix 2016-04-03 14:38:11 +02:00
parent 478dcff713
commit a386a4ec89
12 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/Makefile
View file

@ -10,7 +10,7 @@ else
endif endif
CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/popl/include CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -I../externals/asio/asio/include -I../externals/popl/include
OBJ = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o OBJ = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
ifeq ($(TARGET), ANDROID) ifeq ($(TARGET), ANDROID)

2
client/player/player.h
View file

@ -23,7 +23,7 @@
#include <thread> #include <thread>
#include <atomic> #include <atomic>
#include <vector> #include <vector>
#include "../stream.h" #include "stream.h"
#include "pcmDevice.h" #include "pcmDevice.h"
#include "common/endian.h" #include "common/endian.h"
#include "common/log.h" #include "common/log.h"

0
server/json/json.hpp → externals/json.hpp vendored
View file

2
server/Makefile
View file

@ -9,7 +9,7 @@ else
TARGET_DIR ?= /usr TARGET_DIR ?= /usr
endif endif
CXXFLAGS += -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/popl/include CXXFLAGS += -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -I../externals/asio/asio/include -I../externals/popl/include
ifeq ($(TARGET), OPENWRT) ifeq ($(TARGET), OPENWRT)

2
server/config.h
View file

@ -23,7 +23,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <sys/time.h> #include <sys/time.h>
#include "json/json.hpp" #include "externals/json.hpp"
#include "common/utils.h" #include "common/utils.h"

2
server/json/jsonrpc.h
View file

@ -21,7 +21,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "json.hpp" #include "externals/json.hpp"
#include "jsonrpcException.h" #include "jsonrpcException.h"

2
server/json/jsonrpcException.h
View file

@ -20,7 +20,7 @@
#define JSON_RPC_EXCEPTION_H #define JSON_RPC_EXCEPTION_H
#include <string> #include <string>
#include "json.hpp" #include "externals/json.hpp"
#include "common/snapException.h" #include "common/snapException.h"

2
server/streamreader/fileStream.cpp
View file

@ -22,7 +22,7 @@
#include <unistd.h> #include <unistd.h>
#include "fileStream.h" #include "fileStream.h"
#include "../encoder/encoderFactory.h" #include "encoder/encoderFactory.h"
#include "common/log.h" #include "common/log.h"
#include "common/snapException.h" #include "common/snapException.h"

2
server/streamreader/pcmStream.cpp
View file

@ -21,7 +21,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include "../encoder/encoderFactory.h" #include "encoder/encoderFactory.h"
#include "common/snapException.h" #include "common/snapException.h"
#include "common/compat.h" #include "common/compat.h"
#include "pcmStream.h" #include "pcmStream.h"

4
server/streamreader/pcmStream.h
View file

@ -24,8 +24,8 @@
#include <string> #include <string>
#include <map> #include <map>
#include "streamUri.h" #include "streamUri.h"
#include "../encoder/encoder.h" #include "encoder/encoder.h"
#include "../json/json.hpp" #include "externals/json.hpp"
#include "message/sampleFormat.h" #include "message/sampleFormat.h"
#include "message/header.h" #include "message/header.h"

2
server/streamreader/pipeStream.cpp
View file

@ -23,7 +23,7 @@
#include <cerrno> #include <cerrno>
#include "pipeStream.h" #include "pipeStream.h"
#include "../encoder/encoderFactory.h" #include "encoder/encoderFactory.h"
#include "common/log.h" #include "common/log.h"
#include "common/snapException.h" #include "common/snapException.h"
#include "common/compat.h" #include "common/compat.h"

2
server/streamreader/streamUri.h
View file

@ -21,7 +21,7 @@
#include <string> #include <string>
#include <map> #include <map>
#include "../json/json.hpp" #include "externals/json.hpp"
using json = nlohmann::json; using json = nlohmann::json;