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

socket stuff

Browse source 
git-svn-id: svn://elaine/murooma/trunk@273 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-20 16:18:02 +00:00
parent feabfee936
commit 3116ec0257
9 changed files with 266 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

9
server/snapServer.cpp
View file

@ -8,7 +8,6 @@
#include "../server/pcmEncoder.h"
#include "../server/oggEncoder.h"
#include "common/message.h"
#include "streamServer.h"
#include "controlServer.h"
@ -88,8 +87,8 @@ int main(int argc, char* argv[])
controlServer->setHeader(encoder->getHeader());
controlServer->start();
StreamServer* server = new StreamServer(port + 1);
server->start();
// StreamServer* server = new StreamServer(port + 1);
// server->start();
while (!g_terminated)
{
@ -116,7 +115,7 @@ int main(int argc, char* argv[])
chunk->timestamp.usec = tvChunk.tv_usec;
double chunkDuration = encoder->encode(chunk.get());
if (chunkDuration > 0)
server->send(chunk);
controlServer->send(chunk);
//cout << chunk->tv_sec << ", " << chunk->tv_usec / 1000 << "\n";
// addUs(tvChunk, 1000*chunk->getDuration());
addUs(tvChunk, chunkDuration * 1000);
@ -140,7 +139,7 @@ int main(int argc, char* argv[])
close(fd);
}
server->stop();
// server->stop();
}
catch (const std::exception& e)
{