diff --git a/client/Makefile b/client/Makefile index 32ca31db..be00cf93 100644 --- a/client/Makefile +++ b/client/Makefile @@ -6,7 +6,7 @@ CC = /usr/bin/g++ CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. # -static-libgcc -static-libstdc++ LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc -lFLAC -lavahi-client -lavahi-common -OBJ = snapClient.o stream.o alsaPlayer.o clientConnection.o timeProvider.o oggDecoder.o pcmDecoder.o flacDecoder.o controller.o browseAvahi.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o +OBJ = snapClient.o stream.o alsaPlayer.o clientConnection.o timeProvider.o decoder/oggDecoder.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o browseAvahi.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o BIN = snapclient all: $(TARGET) diff --git a/client/controller.cpp b/client/controller.cpp index b97e8a34..41878b1f 100644 --- a/client/controller.cpp +++ b/client/controller.cpp @@ -20,9 +20,9 @@ #include #include #include -#include "oggDecoder.h" -#include "pcmDecoder.h" -#include "flacDecoder.h" +#include "decoder/oggDecoder.h" +#include "decoder/pcmDecoder.h" +#include "decoder/flacDecoder.h" #include "alsaPlayer.h" #include "timeProvider.h" #include "common/log.h" diff --git a/client/controller.h b/client/controller.h index 682ffa29..064fb65c 100644 --- a/client/controller.h +++ b/client/controller.h @@ -21,9 +21,9 @@ #include #include +#include "decoder/decoder.h" #include "message/message.h" #include "clientConnection.h" -#include "decoder.h" #include "stream.h" #include "pcmDevice.h" diff --git a/client/decoder.h b/client/decoder/decoder.h similarity index 100% rename from client/decoder.h rename to client/decoder/decoder.h diff --git a/client/flacDecoder.cpp b/client/decoder/flacDecoder.cpp similarity index 100% rename from client/flacDecoder.cpp rename to client/decoder/flacDecoder.cpp diff --git a/client/flacDecoder.h b/client/decoder/flacDecoder.h similarity index 100% rename from client/flacDecoder.h rename to client/decoder/flacDecoder.h diff --git a/client/oggDecoder.cpp b/client/decoder/oggDecoder.cpp similarity index 100% rename from client/oggDecoder.cpp rename to client/decoder/oggDecoder.cpp diff --git a/client/oggDecoder.h b/client/decoder/oggDecoder.h similarity index 100% rename from client/oggDecoder.h rename to client/decoder/oggDecoder.h diff --git a/client/pcmDecoder.cpp b/client/decoder/pcmDecoder.cpp similarity index 100% rename from client/pcmDecoder.cpp rename to client/decoder/pcmDecoder.cpp diff --git a/client/pcmDecoder.h b/client/decoder/pcmDecoder.h similarity index 100% rename from client/pcmDecoder.h rename to client/decoder/pcmDecoder.h diff --git a/server/Makefile b/server/Makefile index 7ef15f26..8f2e3b6f 100644 --- a/server/Makefile +++ b/server/Makefile @@ -6,7 +6,7 @@ CC = /usr/bin/g++ CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -OBJ = snapServer.o controlServer.o flacEncoder.o pcmEncoder.o oggEncoder.o serverSession.o publishAvahi.o pipeReader.o encoderFactory.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o +OBJ = snapServer.o controlServer.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o serverSession.o publishAvahi.o pipeReader.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o BIN = snapserver all: $(TARGET) diff --git a/server/encoder.h b/server/encoder/encoder.h similarity index 100% rename from server/encoder.h rename to server/encoder/encoder.h diff --git a/server/encoderFactory.cpp b/server/encoder/encoderFactory.cpp similarity index 100% rename from server/encoderFactory.cpp rename to server/encoder/encoderFactory.cpp diff --git a/server/encoderFactory.h b/server/encoder/encoderFactory.h similarity index 100% rename from server/encoderFactory.h rename to server/encoder/encoderFactory.h diff --git a/server/flacEncoder.cpp b/server/encoder/flacEncoder.cpp similarity index 100% rename from server/flacEncoder.cpp rename to server/encoder/flacEncoder.cpp diff --git a/server/flacEncoder.h b/server/encoder/flacEncoder.h similarity index 100% rename from server/flacEncoder.h rename to server/encoder/flacEncoder.h diff --git a/server/oggEncoder.cpp b/server/encoder/oggEncoder.cpp similarity index 100% rename from server/oggEncoder.cpp rename to server/encoder/oggEncoder.cpp diff --git a/server/oggEncoder.h b/server/encoder/oggEncoder.h similarity index 100% rename from server/oggEncoder.h rename to server/encoder/oggEncoder.h diff --git a/server/pcmEncoder.cpp b/server/encoder/pcmEncoder.cpp similarity index 100% rename from server/pcmEncoder.cpp rename to server/encoder/pcmEncoder.cpp diff --git a/server/pcmEncoder.h b/server/encoder/pcmEncoder.h similarity index 100% rename from server/pcmEncoder.h rename to server/encoder/pcmEncoder.h diff --git a/server/pipeReader.cpp b/server/pipeReader.cpp index 4a187463..d33e6397 100644 --- a/server/pipeReader.cpp +++ b/server/pipeReader.cpp @@ -22,7 +22,7 @@ #include #include "pipeReader.h" -#include "encoderFactory.h" +#include "encoder/encoderFactory.h" #include "common/log.h" #include "common/snapException.h" diff --git a/server/pipeReader.h b/server/pipeReader.h index a41a6b34..d2c19ad8 100644 --- a/server/pipeReader.h +++ b/server/pipeReader.h @@ -22,7 +22,7 @@ #include #include #include -#include "encoder.h" +#include "encoder/encoder.h" #include "message/sampleFormat.h" #include "message/header.h" diff --git a/server/snapServer.cpp b/server/snapServer.cpp index 32a73e01..fffcf144 100644 --- a/server/snapServer.cpp +++ b/server/snapServer.cpp @@ -28,7 +28,7 @@ #include "common/snapException.h" #include "message/sampleFormat.h" #include "message/message.h" -#include "encoderFactory.h" +#include "encoder/encoderFactory.h" #include "controlServer.h" #include "publishAvahi.h"