Merge

Author: robotconscience

example_client_hello_world/src/ofApp.cpp

@@ -5,6 +5,7 @@ void ofApp::setup(){
     ofBackground(0);
     ofSetLogLevel(OF_LOG_VERBOSE);
     // basic connection:
+    client.setWaitMillis(100);
      client.connect("echo.websocket.org");
     // OR optionally use SSL
 //     client.connect("echo.websocket.org", true);

libs/ofxLibwebsockets/include/ofxLibwebsockets/Client.h

@@ -104,5 +104,6 @@ namespace ofxLibwebsockets {
 
         bool bShouldReconnect;
         uint64_t lastReconnectTime;
+        
     };
 };

libs/ofxLibwebsockets/include/ofxLibwebsockets/Connection.h

@@ -36,6 +36,8 @@ namespace ofxLibwebsockets {
         Connection(Reactor* const _reactor=NULL, Protocol* const _protocol=NULL);
 
         ~Connection();
+        
+        
         void close();
         void send(const std::string& message);
 

libs/ofxLibwebsockets/include/ofxLibwebsockets/Reactor.h

@@ -47,6 +47,8 @@ namespace ofxLibwebsockets {
 
         unsigned int _http(struct libwebsocket *ws, const char* const url);
 
+        void setWaitMillis(int millis);
+        
     protected:
         std::string     document_root;
         unsigned int    waitMillis;

libs/ofxLibwebsockets/src/Reactor.cpp

@@ -41,6 +41,10 @@ namespace ofxLibwebsockets {
         return (idx < protocols.size())? protocols[idx].second : NULL;
     }
 
+    //--------------------------------------------------------------
+    void Reactor::setWaitMillis(int millis){
+        waitMillis = millis;
+    }
     //--------------------------------------------------------------
     void Reactor::close(Connection* const conn){
         if (conn != NULL && conn->ws != NULL){