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

v0.2.96

Browse source
This commit is contained in:
badaix 2015-08-15 15:43:22 +02:00
parent 239e93de43
commit 94e6511e56
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/Makefile
View file

@ -1,10 +1,10 @@
VERSION = 0.2.95 VERSION = 0.2.96
TARGET = snapclient TARGET = snapclient
SHELL = /bin/bash SHELL = /bin/bash
CC = /usr/bin/g++ CC = /usr/bin/g++
CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. # -static-libgcc -static-libstdc++ CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I.. # -static-libgcc -static-libstdc++
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc -lFLAC -lavahi-client -lavahi-common 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 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 BIN = snapclient

6
client/snapClient.cpp
View file

@ -155,13 +155,13 @@ int main (int argc, char *argv[])
} }
} }
Controller controller; std::unique_ptr<Controller> controller(new Controller());
if (!g_terminated) if (!g_terminated)
{ {
controller.start(pcmDevice, ip, port, latency); controller->start(pcmDevice, ip, port, latency);
while(!g_terminated) while(!g_terminated)
usleep(100*1000); usleep(100*1000);
controller.stop(); controller->stop();
} }
} }
catch (const std::exception& e) catch (const std::exception& e)

6
server/Makefile
View file

@ -1,10 +1,10 @@
VERSION = 0.2.95 VERSION = 0.2.96
TARGET = snapserver TARGET = snapserver
SHELL = /bin/bash SHELL = /bin/bash
CC = /usr/bin/g++ CC = /usr/bin/g++
CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I..
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common 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 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 BIN = snapserver