From a46b7c61069feac663ea3e2c0e20c677c89a96b8 Mon Sep 17 00:00:00 2001 From: badaix Date: Sun, 25 Oct 2015 13:08:59 +0100 Subject: [PATCH] changed "IP" to "host" --- client/clientConnection.cpp | 4 ++-- client/clientConnection.h | 4 ++-- client/controller.cpp | 5 ++--- client/controller.h | 2 +- client/snapClient.cpp | 14 +++++++------- server/pipeReader.h | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/client/clientConnection.cpp b/client/clientConnection.cpp index 31d1f80b..72e6a5dd 100644 --- a/client/clientConnection.cpp +++ b/client/clientConnection.cpp @@ -29,7 +29,7 @@ using namespace std; -ClientConnection::ClientConnection(MessageReceiver* receiver, const std::string& ip, size_t port) : active_(false), connected_(false), messageReceiver_(receiver), reqId_(1), ip_(ip), port_(port), readerThread_(NULL), sumTimeout_(chronos::msec(0)) +ClientConnection::ClientConnection(MessageReceiver* receiver, const std::string& host, size_t port) : active_(false), connected_(false), messageReceiver_(receiver), reqId_(1), host_(host), port_(port), readerThread_(NULL), sumTimeout_(chronos::msec(0)) { } @@ -59,7 +59,7 @@ void ClientConnection::socketRead(void* _to, size_t _bytes) void ClientConnection::start() { tcp::resolver resolver(io_service_); - tcp::resolver::query query(tcp::v4(), ip_, boost::lexical_cast(port_), boost::asio::ip::resolver_query_base::numeric_service); + tcp::resolver::query query(tcp::v4(), host_, boost::lexical_cast(port_), boost::asio::ip::resolver_query_base::numeric_service); auto iterator = resolver.resolve(query); logO << "Connecting\n"; socket_.reset(new tcp::socket(io_service_)); diff --git a/client/clientConnection.h b/client/clientConnection.h index fe0cd155..3443ece1 100644 --- a/client/clientConnection.h +++ b/client/clientConnection.h @@ -67,7 +67,7 @@ class ClientConnection { public: /// ctor. Received message from the server are passed to MessageReceiver - ClientConnection(MessageReceiver* receiver, const std::string& ip, size_t port); + ClientConnection(MessageReceiver* receiver, const std::string& host, size_t port); virtual ~ClientConnection(); virtual void start(); virtual void stop(); @@ -114,7 +114,7 @@ protected: mutable std::mutex requestMutex_; std::set> pendingRequests_; uint16_t reqId_; - std::string ip_; + std::string host_; size_t port_; std::thread* readerThread_; chronos::msec sumTimeout_; diff --git a/client/controller.cpp b/client/controller.cpp index b56bd1ae..30881c29 100644 --- a/client/controller.cpp +++ b/client/controller.cpp @@ -110,12 +110,11 @@ bool Controller::sendTimeSyncMessage(long after) } -void Controller::start(const PcmDevice& pcmDevice, const std::string& ip, size_t port, size_t latency) +void Controller::start(const PcmDevice& pcmDevice, const std::string& host, size_t port, size_t latency) { - ip_ = ip; pcmDevice_ = pcmDevice; latency_ = latency; - clientConnection_ = new ClientConnection(this, ip, port); + clientConnection_ = new ClientConnection(this, host, port); controllerThread_ = new thread(&Controller::worker, this); } diff --git a/client/controller.h b/client/controller.h index d09af828..d40a4571 100644 --- a/client/controller.h +++ b/client/controller.h @@ -39,7 +39,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& host, size_t port, size_t latency); void stop(); /// Implementation of MessageReceiver. diff --git a/client/snapClient.cpp b/client/snapClient.cpp index b0811fa7..3468d6c0 100644 --- a/client/snapClient.cpp +++ b/client/snapClient.cpp @@ -64,7 +64,7 @@ int main (int argc, char *argv[]) try { string soundcard; - string ip; + string host; // int bufferMs; size_t port; size_t latency; @@ -73,10 +73,10 @@ int main (int argc, char *argv[]) po::options_description desc("Allowed options"); desc.add_options() - ("help,h", "produce help message") + ("help", "produce help message") ("version,v", "show version number") ("list,l", po::bool_switch(&listPcmDevices)->default_value(false), "list pcm devices") - ("ip,i", po::value(&ip), "server IP") + ("host,h", po::value(&host), "server hostname or ip address") ("port,p", po::value(&port)->default_value(1704), "server port") ("soundcard,s", po::value(&soundcard)->default_value("default"), "index or name of the soundcard") ("daemon,d", po::value(&runAsDaemon)->implicit_value(-3), "daemonize, optional process priority [-20..19]") @@ -139,7 +139,7 @@ int main (int argc, char *argv[]) return 1; } - if (!vm.count("ip")) + if (!vm.count("host")) { BrowseAvahi browseAvahi; AvahiResult avahiResult; @@ -149,9 +149,9 @@ int main (int argc, char *argv[]) { if (browseAvahi.browse("_snapcast._tcp", AVAHI_PROTO_INET, avahiResult, 5000)) { - ip = avahiResult.ip_; + host = avahiResult.ip_; port = avahiResult.port_; - logO << "Found server " << ip << ":" << port << "\n"; + logO << "Found server " << host << ":" << port << "\n"; break; } } @@ -166,7 +166,7 @@ int main (int argc, char *argv[]) std::unique_ptr controller(new Controller()); if (!g_terminated) { - controller->start(pcmDevice, ip, port, latency); + controller->start(pcmDevice, host, port, latency); while(!g_terminated) usleep(100*1000); controller->stop(); diff --git a/server/pipeReader.h b/server/pipeReader.h index 00d592a7..1bea1226 100644 --- a/server/pipeReader.h +++ b/server/pipeReader.h @@ -45,7 +45,7 @@ public: /// Reads and decodes PCM data from a named pipe /** - * Reads PCM from a named pipe and passed the data to an encoder. + * Reads PCM from a named pipe and passes the data to an encoder. * Implements EncoderListener to get the encoded data. * Data is passed to the PipeListener */