From 77826ef57a83c0fa01e7ac03b9eb84f6cf4d955f Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@d8a302eb-03bc-478d-80e4-98257eca68ef> Date: Thu, 28 Aug 2014 07:16:38 +0000 Subject: [PATCH] encoder git-svn-id: svn://elaine/murooma/trunk@215 d8a302eb-03bc-478d-80e4-98257eca68ef --- server/Makefile | 2 +- server/pcmEncoder.cpp | 4 ++-- server/pcmEncoder.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/Makefile b/server/Makefile index a5b85fb6..74acf679 100644 --- a/server/Makefile +++ b/server/Makefile @@ -3,7 +3,7 @@ CC = /usr/bin/g++ CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. LDFLAGS = -lrt -lpthread -lportaudio -lboost_system -lboost_program_options -OBJ = snapServer.o pcmEncoder.o ../common/chunk.o ../common/sampleFormat.o +OBJ = snapServer.o pcmEncoder.o oggEncoder.o ../common/chunk.o ../common/sampleFormat.o BIN = snapserver all: server diff --git a/server/pcmEncoder.cpp b/server/pcmEncoder.cpp index ddabb727..d7302b99 100644 --- a/server/pcmEncoder.cpp +++ b/server/pcmEncoder.cpp @@ -7,10 +7,10 @@ PcmEncoder::PcmEncoder() void PcmEncoder::encode(Chunk* chunk) { - WireChunk* wireChunk = chunk->wireChunk; +/* WireChunk* wireChunk = chunk->wireChunk; for (size_t n=0; nlength; ++n) wireChunk->payload[n] *= 1.5; -// return chunk; +*/ } diff --git a/server/pcmEncoder.h b/server/pcmEncoder.h index 7ee245ed..b054df91 100644 --- a/server/pcmEncoder.h +++ b/server/pcmEncoder.h @@ -1,13 +1,13 @@ #ifndef PCM_ENCODER_H #define PCM_ENCODER_H -#include "common/chunk.h" +#include "encoder.h" class PcmEncoder { public: PcmEncoder(); - void encode(Chunk* chunk); + virtual void encode(Chunk* chunk); };