Wait until we know that Faceshift didn't connect before we attempt to

initialize Visage.

interface/interface_en.ts

@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3557"/>
+        <location filename="src/Application.cpp" line="3560"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3558"/>
+        <location filename="src/Application.cpp" line="3561"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>

interface/src/Application.cpp

@@ -1525,6 +1525,9 @@ void Application::init() {
     }
     qDebug("Loaded settings");
     
+    // initialize Visage after loading the menu settings
+    _visage.init();
+    
     // fire off an immediate domain-server check in now that settings are loaded
     NodeList::getInstance()->sendDomainServerCheckIn();
 

interface/src/Menu.cpp

@@ -277,7 +277,7 @@ Menu::Menu() :
                                            SLOT(setTCPEnabled(bool)));
 #ifdef HAVE_VISAGE
     addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Visage, 0, true,
-        appInstance->getVisage(), SLOT(setEnabled(bool)));
+        appInstance->getVisage(), SLOT(updateEnabled()));
 #endif
 
     addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);

interface/src/devices/Faceshift.cpp

@@ -49,12 +49,18 @@ Faceshift::Faceshift() :
     connect(&_tcpSocket, SIGNAL(connected()), SLOT(noteConnected()));
     connect(&_tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(noteError(QAbstractSocket::SocketError)));
     connect(&_tcpSocket, SIGNAL(readyRead()), SLOT(readFromSocket()));
+    connect(&_tcpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SIGNAL(connectionStateChanged()));
 
     connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams()));
 
     _udpSocket.bind(FACESHIFT_PORT);
 }
 
+bool Faceshift::isConnectedOrConnecting() const {
+    return _tcpSocket.state() == QAbstractSocket::ConnectedState ||
+        (_tcpRetryCount == 0 && _tcpSocket.state() != QAbstractSocket::UnconnectedState);
+}
+
 bool Faceshift::isActive() const {
     const quint64 ACTIVE_TIMEOUT_USECS = 1000000;
     return (usecTimestampNow() - _lastTrackingStateReceived) < ACTIVE_TIMEOUT_USECS;

interface/src/devices/Faceshift.h

@@ -27,6 +27,8 @@ public:
 
     Faceshift();
 
+    bool isConnectedOrConnecting() const; 
+
     bool isActive() const;
 
     const glm::quat& getHeadRotation() const { return _headRotation; }
@@ -66,6 +68,10 @@ public:
     void updateFakeCoefficients(float leftBlink, float rightBlink, float browUp,
         float jawOpen, std::vector<float>& coefficients) const;
     
+signals:
+
+    void connectionStateChanged();
+
 public slots:
     
     void setTCPEnabled(bool enabled);

interface/src/devices/Visage.cpp

@@ -109,6 +109,11 @@ static const QMultiHash<QByteArray, QPair<int, float> >& getActionUnitNameMap()
 
 const float TRANSLATION_SCALE = 20.0f;
 
+void Visage::init() {
+    connect(Application::getInstance()->getFaceshift(), SIGNAL(connectionStateChanged()), SLOT(updateEnabled()));
+    updateEnabled();
+}
+
 void Visage::update() {
 #ifdef HAVE_VISAGE
     _active = (_tracker->getTrackingData(_data) == TRACK_STAT_OK);
@@ -153,12 +158,18 @@ void Visage::reset() {
     _headOrigin += _headTranslation / TRANSLATION_SCALE;
 }
 
+void Visage::updateEnabled() {
+    setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Visage) &&
+        !(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift) &&
+            Application::getInstance()->getFaceshift()->isConnectedOrConnecting()));
+}
+
 void Visage::setEnabled(bool enabled) {
 #ifdef HAVE_VISAGE
     if (_enabled == enabled) {
         return;
     }
-    if (_enabled = enabled) {
+    if ((_enabled = enabled)) {
         _tracker->trackFromCam();
     } else {
         _tracker->stop();

interface/src/devices/Visage.h

@@ -32,6 +32,8 @@ public:
     Visage();
     virtual ~Visage();
     
+    void init();
+    
     bool isActive() const { return _active; }
     
     const glm::quat& getHeadRotation() const { return _headRotation; }
@@ -47,7 +49,7 @@ public:
 
 public slots:
 
-    void setEnabled(bool enabled);
+    void updateEnabled();
     
 private:
 
@@ -57,6 +59,8 @@ private:
     QMultiHash<int, QPair<int, float> > _actionUnitIndexMap; 
 #endif
     
+    void setEnabled(bool enabled);
+    
     bool _enabled;
     bool _active;
     glm::quat _headRotation;