Blinker

@@ -138,11 +138,8 @@ protected:

   /// remove timed-out dynamic destinations

   void removeTimedOutDynDests();

-  /**

-   * @brief send frame to all destinations

-   * @param[in] pFrame frame to send

-   */

-  void sendAllFrame(stBlinkenFrame *pFrame);

+  /// send current protocol data to all destinations

+  void sendAllProto();

   /// send "no frame" to all destinations

   void sendAllNoFrame();

@@ -157,27 +154,11 @@ protected:

                  const DynDests dynDests);

   /**

-   * @brief send current frame to address

-   * @param[in] addr address to send to

-   * @param[in] proto Blinken protocol identifier

-   TODO: still needed?

-   */

-  void sendCurFrame(const ADDR &addr, etBlinkenProto proto) const;

-

-  /**

-   * @brief send "no frame" to address

-   * @param[in] addr address to send to

-   * @param[in] proto Blinken protocol identifier

-   TODO: still needed?

-   */

-  void sendNoFrame(const ADDR &addr, etBlinkenProto proto) const;

-

-  /**

-   * @brief send frame to address

+   * @brief send protocol data to address

    * @param[in] data protcol data of frame

    * @param[in] addr address to send to

    */

-  void sendFrame(const std::string &data, const ADDR &addr) const;

+  void sendProto(const std::string &data, const ADDR &addr) const;

   /**

    * @brief convert frame to protocol data

@@ -127,8 +127,13 @@ template<typename ADDR, typename SOCK>

 void Sender<ADDR, SOCK>::setFrame(const std::string &stream,

                                   stBlinkenFrame *pFrame)

 {

-  // send frame to all destinations

-  sendAllFrame(pFrame);

+  // convert new frame to protocol data

+  frame2data(pFrame, BlinkenProtoBlp, m_dataBlp);

+  frame2data(pFrame, BlinkenProtoEblp, m_dataEblp);

+  frame2data(pFrame, BlinkenProtoMcuf, m_dataMcuf);

+

+  // send new protocol data to all destinations

+  sendAllProto();

   (void)stream; // unused

 }

@@ -140,8 +145,13 @@ void Sender<ADDR, SOCK>::setFrame(const std::string &stream,

 template<typename ADDR, typename SOCK>

 void Sender<ADDR, SOCK>::setNoFrame(const std::string &stream)

 {

-  // send "no frame" to all destinations

-  sendAllNoFrame();

+  // set protocol data

+  m_dataBlp = m_noFrameDataBlp;

+  m_dataEblp = m_noFrameDataEblp;

+  m_dataMcuf = m_noFrameDataMcuf;

+

+  // send new protocol data to all destinations

+  sendAllProto();

   (void)stream; // unused

 }

@@ -150,18 +160,8 @@ void Sender<ADDR, SOCK>::setNoFrame(const std::string &stream)

 template<typename ADDR, typename SOCK>

 void Sender<ADDR, SOCK>::timeCall()

 {

-  stBlinkenFrame *pFrame;

-  std::string data;

-

-  // get current frame from stream

-  if (m_pInStream && m_pInStream->getCurFrame(pFrame))

-    // repeat frame to all destinations

-    sendAllFrame(pFrame);

-

-  // no stream of no current frame

-  else

-    // repeat "no frame" to all destinations

-    sendAllNoFrame();

+  // repeat current protocol data to all destinations

+  sendAllProto();

 }

 /**

@@ -266,7 +266,7 @@ void Sender<ADDR, SOCK>::destroySock()

   sendAllNoFrame();

   // clear dynamic destinations

-  // (they registered with this socket adn this socket is gone)

+  // (they registered with this socket and this socket is gone)

   m_dynDestsBlp.clear();

   m_dynDestsEblp.clear();

   m_dynDestsMcuf.clear();

@@ -378,29 +378,17 @@ void Sender<ADDR, SOCK>::removeTimedOutDynDests()

       ++itDyn;

 }

-/**

- * @brief send frame to all destinations

- * @param[in] pFrame frame to send

- */

+/// send current protocol data to all destinations

 template<typename ADDR, typename SOCK>

-void Sender<ADDR, SOCK>::sendAllFrame(stBlinkenFrame *pFrame)

+void Sender<ADDR, SOCK>::sendAllProto()

 {

   // remove timed-out dynamic destinations

   removeTimedOutDynDests();

-  // convert frame to protocol data and send to all static/dynamic destinations

-  if (!m_destListBlp.empty() || !m_dynDestsBlp.empty()) {

-    frame2data(pFrame, BlinkenProtoBlp, m_dataBlp);

+  // send current protocol data to all static/dynamic destinations

   sendDests(&m_dataBlp, m_destListBlp, m_dynDestsBlp);

-  }

-  if (!m_destListEblp.empty() || !m_dynDestsEblp.empty()) {

-    frame2data(pFrame, BlinkenProtoEblp, m_dataEblp);

   sendDests(&m_dataEblp, m_destListEblp, m_dynDestsEblp);

-  }

-  if (!m_destListMcuf.empty() || !m_dynDestsMcuf.empty()) {

-    frame2data(pFrame, BlinkenProtoMcuf, m_dataMcuf);

   sendDests(&m_dataMcuf, m_destListMcuf, m_dynDestsMcuf);

-  }

   // request time callback in one second

   m_callMgr.requestTimeCall(this, Time::now() + Time(1));

@@ -414,18 +402,9 @@ void Sender<ADDR, SOCK>::sendAllNoFrame()

   removeTimedOutDynDests();

   // get "no frame" protocol data and send to all static/dynamic destinations

-  if (!m_destListBlp.empty() || !m_dynDestsBlp.empty()) {

-    noFrame2data(BlinkenProtoBlp, m_dataBlp);

-    sendDests(&m_dataBlp, m_destListBlp, m_dynDestsBlp);

-  }

-  if (!m_destListEblp.empty() || !m_dynDestsEblp.empty()) {

-    noFrame2data(BlinkenProtoEblp, m_dataEblp);

-    sendDests(&m_dataEblp, m_destListEblp, m_dynDestsEblp);

-  }

-  if (!m_destListMcuf.empty() || !m_dynDestsMcuf.empty()) {

-    noFrame2data(BlinkenProtoMcuf, m_dataMcuf);

-    sendDests(&m_dataMcuf, m_destListMcuf, m_dynDestsMcuf);

-  }

+  sendDests(&m_noFrameDataBlp, m_destListBlp, m_dynDestsBlp);

+  sendDests(&m_noFrameDataEblp, m_destListEblp, m_dynDestsEblp);

+  sendDests(&m_noFrameDataMcuf, m_destListMcuf, m_dynDestsMcuf);

   // request time callback in one second

   m_callMgr.requestTimeCall(this, Time::now() + Time(1));

@@ -450,63 +429,16 @@ void Sender<ADDR, SOCK>::sendDests(const std::string *pData,

   // send data to all dynamic destinations

   typename DynDests::const_iterator itDyn;

   for (itDyn = dynDests.begin(); itDyn != dynDests.end(); ++itDyn)

-    sendFrame(*pData, itDyn->first);

-}

-

-/**

- * @brief send current frame to address

- * @param[in] addr address to send to

- * @param[in] proto Blinken protocol identifier

- */

-template<typename ADDR, typename SOCK>

-void Sender<ADDR, SOCK>::sendCurFrame(const ADDR &addr,

-                                      etBlinkenProto proto) const

-{

-  stBlinkenFrame *pFrame;

-  std::string data;

-

-  // get current frame from stream

-  if (m_pInStream && m_pInStream->getCurFrame(pFrame)) {

-    // convert frame to protocal data

-    frame2data(pFrame, proto, data);

-    // send frame to address

-    sendFrame(data, addr);

-  }

-

-  // no stream of no current frame

-  else {

-    // get "no frame" ad protocal data

-    noFrame2data(proto, data);

-    // send "no frame" to address

-    sendFrame(data, addr);

-  }

-}

-

-/**

- * @brief send "no frame" to address

- * @param[in] addr address to send to

- * @param[in] proto Blinken protocol identifier

- */

-template<typename ADDR, typename SOCK>

-void Sender<ADDR, SOCK>::sendNoFrame(const ADDR &addr,

-                                     etBlinkenProto proto) const

-{

-  std::string data;

-

-  // get "no frame" ad protocal data

-  noFrame2data(proto, data);

-

-  // send "no frame" to address

-  sendFrame(data, addr);

+    sendProto(*pData, itDyn->first);

 }

 /**

- * @brief send frame to address

+ * @brief send protocol data to address

  * @param[in] data protocol data of frame

  * @param[in] addr address to send to

  */

 template<typename ADDR, typename SOCK>

-void Sender<ADDR, SOCK>::sendFrame(const std::string &data,

+void Sender<ADDR, SOCK>::sendProto(const std::string &data,

                                    const ADDR &addr) const

 {

   if (m_pSock) {

@@ -580,15 +512,15 @@ void Sender<ADDR, SOCK>::receiveFromSock()

       switch (proto) {

         case BlinkenProtoBlp:

           m_dynDestsBlp[addr] = Time::now();

-          sendCurFrame(addr, BlinkenProtoBlp);

+          sendProto(m_dataBlp, addr);

           break;

         case BlinkenProtoEblp:

           m_dynDestsEblp[addr] = Time::now();

-          sendCurFrame(addr, BlinkenProtoEblp);

+          sendProto(m_dataEblp, addr);

           break;

         case BlinkenProtoMcuf:

           m_dynDestsMcuf[addr] = Time::now();

-          sendCurFrame(addr, BlinkenProtoMcuf);

+          sendProto(m_dataMcuf, addr);

           break;

         default:

           break;