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

dont resolve

Browse source 
git-svn-id: svn://elaine/murooma/trunk@239 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-06 19:56:10 +00:00
parent b61c6f0217
commit 0ca2460971
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/Makefile
View file

@ -3,7 +3,7 @@ CC = /usr/bin/g++
CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -g -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -g -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc
OBJ = snapClient.o stream.o player.o serverConnection.o oggDecoder.o pcmDecoder.o ../common/pcmChunk.o ../common/log.o ../common/sampleFormat.o OBJ = snapClient.o stream.o player.o serverConnection.o oggDecoder.o pcmDecoder.o controller.o ../common/pcmChunk.o ../common/log.o ../common/sampleFormat.o
BIN = snapclient BIN = snapclient
all: client all: client

12
client/serverConnection.cpp
View file

@ -27,13 +27,17 @@ void ServerConnection::socketRead(tcp::socket* socket, void* to, size_t bytes)
} }
void ServerConnection::start(MessageReceiver* receiver, const std::string& ip, int port) void ServerConnection::start(MessageReceiver* receiver, const std::string& ip, size_t port)
{ {
messageReceiver = receiver; messageReceiver = receiver;
tcp::resolver resolver(io_service); endpt.address(boost::asio::ip::address::from_string(ip));
endpt.port((port));
std::cout << "Endpoint IP: " << endpt.address().to_string() << std::endl;
std::cout << "Endpoint Port: " << endpt.port() << std::endl;
/* tcp::resolver resolver(io_service);
tcp::resolver::query query(tcp::v4(), ip, boost::lexical_cast<string>(port)); tcp::resolver::query query(tcp::v4(), ip, boost::lexical_cast<string>(port));
iterator = resolver.resolve(query); iterator = resolver.resolve(query);
receiverThread = new thread(&ServerConnection::worker, this); */ receiverThread = new thread(&ServerConnection::worker, this);
} }
@ -99,7 +103,7 @@ void ServerConnection::worker()
try try
{ {
tcp::socket s(io_service); tcp::socket s(io_service);
s.connect(*iterator); s.connect(endpt);//address, port);//*iterator);
struct timeval tv; struct timeval tv;
tv.tv_sec = 5; tv.tv_sec = 5;
tv.tv_usec = 0; tv.tv_usec = 0;

8
client/serverConnection.h
View file

@ -24,15 +24,17 @@ class ServerConnection : public MessageReceiver
{ {
public: public:
ServerConnection(Stream* stream); ServerConnection(Stream* stream);
void start(MessageReceiver* receiver, const std::string& ip, int port); void start(MessageReceiver* receiver, const std::string& ip, size_t port);
void stop(); void stop();
virtual void onMessageReceived(BaseMessage* message); virtual void onMessageReceived(BaseMessage* message);
private: private:
MessageReceiver* messageReceiver;
BaseMessage* getNextMessage(tcp::socket* socket);
void socketRead(tcp::socket* socket, void* to, size_t bytes); void socketRead(tcp::socket* socket, void* to, size_t bytes);
void worker(); void worker();
boost::asio::ip::tcp::endpoint endpt;
MessageReceiver* messageReceiver;
BaseMessage* getNextMessage(tcp::socket* socket);
boost::asio::io_service io_service; boost::asio::io_service io_service;
tcp::resolver::iterator iterator; tcp::resolver::iterator iterator;
std::atomic<bool> active_; std::atomic<bool> active_;

3
client/snapClient.cpp
View file

@ -15,6 +15,7 @@
#include "stream.h" #include "stream.h"
#include "player.h" #include "player.h"
#include "serverConnection.h" #include "serverConnection.h"
#include "controller.h"
@ -69,7 +70,7 @@ int main (int argc, char *argv[])
serverConnection.start(&serverConnection, ip, port); serverConnection.start(&serverConnection, ip, port);
while(true) while(true)
usleep(1000); usleep(10000);
return 0; return 0;
} }