From b0eef21a2c04fdf6e5375be866fd52d8ced235d0 Mon Sep 17 00:00:00 2001 From: Joakim Kilby Date: Mon, 6 Jul 2015 18:49:17 +0200 Subject: [PATCH] removing obsolete functions and lua scripts --- .../openspace/network/parallelconnection.h | 4 --- src/network/parallelconnection.cpp | 36 ------------------- 2 files changed, 40 deletions(-) diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h index 61483a418d..02fc6fcde5 100644 --- a/include/openspace/network/parallelconnection.h +++ b/include/openspace/network/parallelconnection.h @@ -83,10 +83,6 @@ namespace openspace{ void setPassword(const std::string &password); - void sendScript(const std::string script); - - void initDone(); - void signalDisconnect(); void preSynchronization(); diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp index 38cb2844c4..f4e47817a1 100644 --- a/src/network/parallelconnection.cpp +++ b/src/network/parallelconnection.cpp @@ -1013,24 +1013,6 @@ namespace openspace { void ParallelConnection::setPassword(const std::string& pwd){ _passCode = hash(pwd); } - - void ParallelConnection::sendScript(const std::string script){ - uint16_t msglen = static_cast(script.length()); - std::vector buffer; - buffer.reserve(headerSize() + sizeof(msglen) + msglen); - - //write header - writeHeader(buffer, MessageTypes::Script); - - //size of message - buffer.insert(buffer.end(), reinterpret_cast(&msglen), reinterpret_cast(&msglen) + sizeof(msglen)); - - //actual message - buffer.insert(buffer.end(), script.begin(), script.end()); - - //send message - queueMessage(buffer); - } bool ParallelConnection::initNetworkAPI(){ #if defined(__WIN32__) @@ -1254,18 +1236,6 @@ namespace openspace { //minor and major version (as uint8_t -> 1 byte) + two bytes for the chars 'O' and 'S' + 4 bytes for type of message return 2 * sizeof(uint8_t) + 2 + sizeof(uint32_t); } - - void ParallelConnection::initDone(){ - //create buffer and reserve size - std::vector buffer; - buffer.reserve(headerSize()); - - //write header - writeHeader(buffer, MessageTypes::InitializationCompleted); - - //queue script - queueMessage(buffer); - } scripting::ScriptEngine::LuaLibrary ParallelConnection::luaLibrary() { return { @@ -1313,12 +1283,6 @@ namespace openspace { "", "Request to be the host for this session" }, - { - "initialized", - &luascriptfunctions::initialized, - "", - "Request to be the host for this session" - }, } }; }