subdirectory for encoder/decoder

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)

client/controller.cpp

@@ -20,9 +20,9 @@
 #include <iostream>
 #include <string>
 #include <memory>
-#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"

client/controller.h

@@ -21,9 +21,9 @@
 
 #include <thread>
 #include <atomic>
+#include "decoder/decoder.h"
 #include "message/message.h"
 #include "clientConnection.h"
-#include "decoder.h"
 #include "stream.h"
 #include "pcmDevice.h"
 

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)

server/pipeReader.cpp

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

server/pipeReader.h

@@ -22,7 +22,7 @@
 #include <thread>
 #include <atomic>
 #include <string>
-#include "encoder.h"
+#include "encoder/encoder.h"
 #include "message/sampleFormat.h"
 #include "message/header.h"
 

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"