From a66af77b23d843caf84799da3acc14da7c39161d Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 18 Feb 2015 12:40:59 -0800
Subject: [PATCH] Update DDE face tracker to work with menu item

---
 interface/src/Application.cpp            |  1 +
 interface/src/devices/DdeFaceTracker.cpp | 84 ++++++++++--------------
 interface/src/devices/DdeFaceTracker.h   | 11 ++--
 3 files changed, 41 insertions(+), 55 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4f771ccbf0..ac73920399 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1728,6 +1728,7 @@ void Application::init() {
 
     // initialize our face trackers after loading the menu settings
     DependencyManager::get<Faceshift>()->init();
+    DependencyManager::get<DdeFaceTracker>()->init();
     DependencyManager::get<Visage>()->init();
 
     Leapmotion::init();
diff --git a/interface/src/devices/DdeFaceTracker.cpp b/interface/src/devices/DdeFaceTracker.cpp
index d8766ca0ab..c4797c4018 100644
--- a/interface/src/devices/DdeFaceTracker.cpp
+++ b/interface/src/devices/DdeFaceTracker.cpp
@@ -44,58 +44,40 @@ struct Packet{
 };
 
 DdeFaceTracker::DdeFaceTracker() :
-_lastReceiveTimestamp(0),
-_reset(false),
-_leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
-_rightBlinkIndex(1),
-_leftEyeOpenIndex(8),
-_rightEyeOpenIndex(9),
-_browDownLeftIndex(14),
-_browDownRightIndex(15),
-_browUpCenterIndex(16),
-_browUpLeftIndex(17),
-_browUpRightIndex(18),
-_mouthSmileLeftIndex(28),
-_mouthSmileRightIndex(29),
-_jawOpenIndex(21)
+    DdeFaceTracker(QHostAddress::Any, DDE_FEATURE_POINT_SERVER_PORT)
+{
+
+}
+
+DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
+    _lastReceiveTimestamp(0),
+    _reset(false),
+    _leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
+    _rightBlinkIndex(1),
+    _leftEyeOpenIndex(8),
+    _rightEyeOpenIndex(9),
+    _browDownLeftIndex(14),
+    _browDownRightIndex(15),
+    _browUpCenterIndex(16),
+    _browUpLeftIndex(17),
+    _browUpRightIndex(18),
+    _mouthSmileLeftIndex(28),
+    _mouthSmileRightIndex(29),
+    _jawOpenIndex(21),
+    _host(host),
+    _port(port)
 {
     _blendshapeCoefficients.resize(NUM_EXPRESSION);
     
     connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams()));
     connect(&_udpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketErrorOccurred(QAbstractSocket::SocketError)));
     connect(&_udpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SLOT(socketStateChanged(QAbstractSocket::SocketState)));
-    
-    bindTo(DDE_FEATURE_POINT_SERVER_PORT);
-}
-
-DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
-_lastReceiveTimestamp(0),
-_reset(false),
-_leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
-_rightBlinkIndex(1),
-_leftEyeOpenIndex(8),
-_rightEyeOpenIndex(9),
-_browDownLeftIndex(14),
-_browDownRightIndex(15),
-_browUpCenterIndex(16),
-_browUpLeftIndex(17),
-_browUpRightIndex(18),
-_mouthSmileLeftIndex(28),
-_mouthSmileRightIndex(29),
-_jawOpenIndex(21)
-{
-    _blendshapeCoefficients.resize(NUM_EXPRESSION);
-    
-    connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams()));
-    connect(&_udpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketErrorOccurred(QAbstractSocket::SocketError)));
-    connect(&_udpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SIGNAL(socketStateChanged(QAbstractSocket::SocketState)));
-    
-    bindTo(host, port);
 }
 
 DdeFaceTracker::~DdeFaceTracker() {
-    if(_udpSocket.isOpen())
+    if (_udpSocket.isOpen()) {
         _udpSocket.close();
+    }
 }
 
 void DdeFaceTracker::init() {
@@ -110,15 +92,15 @@ void DdeFaceTracker::update() {
     
 }
 
-void DdeFaceTracker::bindTo(quint16 port) {
-    bindTo(QHostAddress::Any, port);
-}
-
-void DdeFaceTracker::bindTo(const QHostAddress& host, quint16 port) {
-    if(_udpSocket.isOpen()) {
+void DdeFaceTracker::setEnabled(bool enabled) {
+    if (enabled) {
+        if (_udpSocket.isOpen()) {
+            _udpSocket.close();
+        }
+        _udpSocket.bind(_host, _port);
+    } else {
         _udpSocket.close();
     }
-    _udpSocket.bind(host, port);
 }
 
 bool DdeFaceTracker::isActive() const {
@@ -135,7 +117,7 @@ void DdeFaceTracker::socketStateChanged(QAbstractSocket::SocketState socketState
     QString state;
     switch(socketState) {
         case QAbstractSocket::BoundState:
-            state = "Bounded";
+            state = "Bound";
             break;
         case QAbstractSocket::ClosingState:
             state = "Closing";
@@ -156,7 +138,7 @@ void DdeFaceTracker::socketStateChanged(QAbstractSocket::SocketState socketState
             state = "Unconnected";
             break;
     }
-    qDebug() << "[Info] DDE Face Tracker Socket: " << socketState;
+    qDebug() << "[Info] DDE Face Tracker Socket: " << state;
 }
 
 void DdeFaceTracker::readPendingDatagrams() {
diff --git a/interface/src/devices/DdeFaceTracker.h b/interface/src/devices/DdeFaceTracker.h
index 71a743cce0..bd5d066732 100644
--- a/interface/src/devices/DdeFaceTracker.h
+++ b/interface/src/devices/DdeFaceTracker.h
@@ -28,9 +28,6 @@ public:
     void reset();
     void update();
     
-    //sockets
-    void bindTo(quint16 port);
-    void bindTo(const QHostAddress& host, quint16 port);
     bool isActive() const;
     
     float getLeftBlink() const { return getBlendshapeCoefficient(_leftBlinkIndex); }
@@ -47,7 +44,10 @@ public:
     float getMouthSize() const { return getBlendshapeCoefficient(_jawOpenIndex); }
     float getMouthSmileLeft() const { return getBlendshapeCoefficient(_mouthSmileLeftIndex); }
     float getMouthSmileRight() const { return getBlendshapeCoefficient(_mouthSmileRightIndex); }
-    
+
+public slots:
+    void setEnabled(bool enabled);
+
 private slots:
     
     //sockets
@@ -59,6 +59,9 @@ private:
     DdeFaceTracker();
     DdeFaceTracker(const QHostAddress& host, quint16 port);
     ~DdeFaceTracker();
+
+    QHostAddress _host;
+    quint16 _port;
     
     float getBlendshapeCoefficient(int index) const;
     void decodePacket(const QByteArray& buffer);