revert to using m_parentSet instead of overriding recordParent

inc/osvr/Common/DeviceComponent.h

@@ -45,7 +45,7 @@ namespace common {
 
         /// @brief Called (only) by BaseDevice when being added: effectively
         /// records a "parent pointer" that does not convey ownership.
-        virtual void recordParent(Parent &dev);
+        void recordParent(Parent &dev);
 
         /// @brief Called during mainloop
         void update();
@@ -75,9 +75,9 @@ namespace common {
         /// @brief Implementation-specific (optional) stuff to do during
         /// mainloop
         virtual void m_update();
-        Parent *m_parent;
 
       private:
+        Parent *m_parent;
         MessageHandlerList<BaseDeviceMessageHandleTraits> m_messageHandlers;
     };
 } // namespace common

inc/osvr/Common/GestureComponent.h

@@ -84,8 +84,6 @@ namespace common {
         static OSVR_COMMON_EXPORT shared_ptr<GestureComponent>
         create(OSVR_ChannelCount numSensor = 1);
 
-        void recordParent(Parent &dev);
-
         /// @brief Message from server to client, containing Gesture data.
         messages::GestureRecord gestureRecord;
 

src/osvr/Common/GestureComponent.cpp

@@ -125,21 +125,6 @@ namespace common {
         m_gestureNameMap.registerStringID(OSVR_GESTURE_CLOSED_HAND);
     }
 
-    void GestureComponent::recordParent(Parent &dev) {
-        BOOST_ASSERT_MSG(nullptr == m_parent,
-                         "recordParent should only be called once!");
-        m_parent = &dev;
-        m_parentSet();
-
-        // add a ping handler to re-send gesture map everytime the new
-        // connection(ping) occurs
-        m_commonComponent =
-            m_getParent().addComponent(osvr::common::CommonComponent::create());
-        OSVR_TimeValue now;
-        osvrTimeValueGetNow(&now);
-        m_commonComponent->registerPingHandler([&] { m_sendGestureMap(now); });
-    }
-
     void GestureComponent::sendGestureData(OSVR_GestureState gestureState,
                                            std::string const &gestureName,
                                            OSVR_ChannelCount sensor,
@@ -196,7 +181,7 @@ namespace common {
     GestureComponent::m_handleGestureMapRecord(void *userdata,
                                                vrpn_HANDLERPARAM p) {
         auto self = static_cast<GestureComponent *>(userdata);
-		auto bufReader = readExternalBuffer(p.buffer, p.payload_len);
+        auto bufReader = readExternalBuffer(p.buffer, p.payload_len);
 
         messages::GestureMapRecord::MessageSerialization msg;
         deserialize(bufReader, msg);
@@ -226,6 +211,15 @@ namespace common {
     }
 
     void GestureComponent::m_parentSet() {
+
+        // add a ping handler to re-send gesture map everytime the new
+        // connection(ping) occurs
+        m_commonComponent =
+            m_getParent().addComponent(osvr::common::CommonComponent::create());
+        OSVR_TimeValue now;
+        osvrTimeValueGetNow(&now);
+        m_commonComponent->registerPingHandler([&] { m_sendGestureMap(now); });
+
         m_getParent().registerMessageType(gestureRecord);
         m_getParent().registerMessageType(gestureMapRecord);
     }