From 94e6511e56977e7a86a820187005a29e6a65583a Mon Sep 17 00:00:00 2001 From: badaix Date: Sat, 15 Aug 2015 15:43:22 +0200 Subject: [PATCH] v0.2.96 --- client/Makefile | 6 +++--- client/snapClient.cpp | 6 +++--- server/Makefile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/Makefile b/client/Makefile index 128c2b0f..dd1df855 100644 --- a/client/Makefile +++ b/client/Makefile @@ -1,10 +1,10 @@ -VERSION = 0.2.95 +VERSION = 0.2.96 TARGET = snapclient SHELL = /bin/bash 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 +CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I.. # -static-libgcc -static-libstdc++ +LDFLAGS = -lrt -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 decoder/oggDecoder.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o browseAvahi.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o BIN = snapclient diff --git a/client/snapClient.cpp b/client/snapClient.cpp index 0fecd82b..a7f43b62 100644 --- a/client/snapClient.cpp +++ b/client/snapClient.cpp @@ -155,13 +155,13 @@ int main (int argc, char *argv[]) } } - Controller controller; + std::unique_ptr controller(new Controller()); if (!g_terminated) { - controller.start(pcmDevice, ip, port, latency); + controller->start(pcmDevice, ip, port, latency); while(!g_terminated) usleep(100*1000); - controller.stop(); + controller->stop(); } } catch (const std::exception& e) diff --git a/server/Makefile b/server/Makefile index 113c45d1..8cc5669d 100644 --- a/server/Makefile +++ b/server/Makefile @@ -1,10 +1,10 @@ -VERSION = 0.2.95 +VERSION = 0.2.96 TARGET = snapserver SHELL = /bin/bash 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 +CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I.. +LDFLAGS = -lrt -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common 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