code cleanup

git-svn-id: svn://elaine/murooma/trunk@337 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2015-01-01 18:15:20 +00:00
parent 2ea718dee0
commit 0a20924e66
15 changed files with 332 additions and 325 deletions

View file

@ -14,7 +14,7 @@ class Controller : public MessageReceiver
{
public:
Controller();
void start(const PcmDevice& pcmDevice, const std::string& _ip, size_t _port, size_t latency);
void start(const PcmDevice& pcmDevice, const std::string& ip, size_t port, size_t latency);
void stop();
virtual void onMessageReceived(ClientConnection* connection, const msg::BaseMessage& baseMessage, char* buffer);
virtual void onException(ClientConnection* connection, const std::exception& exception);
@ -22,12 +22,12 @@ public:
private:
void worker();
std::atomic<bool> active_;
std::thread* controllerThread;
ClientConnection* clientConnection;
Stream* stream;
std::string ip;
std::shared_ptr<msg::SampleFormat> sampleFormat;
Decoder* decoder;
std::thread* controllerThread_;
ClientConnection* clientConnection_;
Stream* stream_;
std::string ip_;
std::shared_ptr<msg::SampleFormat> sampleFormat_;
Decoder* decoder_;
PcmDevice pcmDevice_;
size_t latency_;
};