Blinker

@@ -90,7 +90,7 @@ void Canvas::createCanvas()

   // create frame

   m_pCanvas = BlinkenFrameNew(m_format.m_height, m_format.m_width,

                               m_format.m_channels, m_format.m_maxval, 1);

-  m_canvasHasFrame = 0;

+  m_canvasHasFrame = false;

 }

 /// tear down canvas

@@ -99,7 +99,7 @@ void Canvas::destroyCanvas()

   if (m_pCanvas) {

     BlinkenFrameFree(m_pCanvas);

     m_pCanvas = NULL;

-    m_canvasHasFrame = 0;

+    m_canvasHasFrame = false;

   }

 }

@@ -176,7 +176,7 @@ void Canvas::releaseOutStream()

 {

   // send no frame information

   if (m_pOutStream)

-    m_pOutStream->setNoFrame();

+    m_pOutStream->setFrame(NULL);

   // unreference output stream

   m_pOutStream = NULL;

@@ -213,7 +213,7 @@ void Canvas::sendFrame()

       m_pOutStream->setFrame(m_pCanvas);

     // no frame available -> send this information

     else

-      m_pOutStream->setNoFrame();

+      m_pOutStream->setFrame(NULL);

   }

 }

@@ -70,7 +70,7 @@ void Canvas::Input::updateConfig()

 /**

  * @brief set current frame

  * @param[in] stream stream name

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 void Canvas::Input::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

 {

@@ -81,18 +81,6 @@ void Canvas::Input::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

   (void)stream; // unused

 }

-/**

- * @brief set current frame to none

- * @param[in] stream stream name

- */

-void Canvas::Input::setNoFrame(const std::string &stream)

-{

-  // notify canvas to redraw

-  m_canvas.redraw();

-

-  (void)stream; // unused

-}

-

 /**

  * @brief draw current frame to canvas

  * @return if a frame was available and it was drawn

@@ -105,8 +93,11 @@ bool Canvas::Input::draw()

   if (!m_haveDestPos || !m_canvas.m_pCanvas)

     return false;

-  // get current frame from stream (levae if no stream or no frame)

-  if (!m_pInStream || !m_pInStream->getCurFrame(pFrame))

+  // get current frame from stream (leave if no stream or no frame)

+  if (!m_pInStream)

+    return false;

+  m_pInStream->getCurFrame(pFrame);

+  if (!pFrame)

     return false;

   // no source position -> use top left

@@ -49,16 +49,10 @@ public:

   /**

    * @brief set current frame

    * @param[in] stream stream name

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(const std::string &stream, stBlinkenFrame *pFrame);

-  /**

-   * @brief set current frame to none

-   * @param[in] stream stream name

-   */

-  virtual void setNoFrame(const std::string &stream);

-

   /**

    * @brief draw current frame to canvas

    * @return if a frame was available and it was drawn

@@ -212,7 +212,7 @@ void Player::releaseOutStream()

 {

   // send no frame information

   if (m_pOutStream)

-    m_pOutStream->setNoFrame();

+    m_pOutStream->setFrame(NULL);

   // unreference output stream

   m_pOutStream = NULL;

@@ -276,7 +276,7 @@ void Player::sendFrame()

     }

     // no frame available -> send this information

     else

-      m_pOutStream->setNoFrame();

+      m_pOutStream->setFrame(NULL);

   }

 }

@@ -6,6 +6,7 @@

 #include <iostream>

 #include <stdlib.h>

 #include <string>

+#include <string.h>

 #include <BlinkenLib/BlinkenFrame.h>

@@ -56,23 +57,19 @@ void Printer::updateConfig()

 /**

  * @brief set current frame

  * @param[in] stream stream name

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 void Printer::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

 {

+  if (pFrame) {

     char *str = BlinkenFrameToString(pFrame);

-  std::cout << str;

+    for (int i = strlen(str) - 2; i >= 0 && str[i] != '\n'; --i)

+      str[i] = 0; // remove last line (delay)

+    std::cout << "frame" << std::endl << str;

     free(str);

-  (void)stream; // unused

-}

-

-/**

- * @brief set current frame to none

- * @param[in] stream stream name

- */

-void Printer::setNoFrame(const std::string &stream)

-{

+  } else {

     std::cout << "no frame" << std::endl;

+  }

   (void)stream; // unused

 }

@@ -49,16 +49,10 @@ public:

   /**

    * @brief set current frame

    * @param[in] stream stream name

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(const std::string &stream, stBlinkenFrame *pFrame);

-  /**

-   * @brief set current frame to none

-   * @param[in] stream stream name

-   */

-  virtual void setNoFrame(const std::string &stream);

-

 protected:

   /// get input stream and attach to it

   void getInStream();

@@ -139,7 +139,7 @@ void Priority::releaseOutStream()

 {

   // send no frame information

   if (m_pOutStream)

-    m_pOutStream->setNoFrame();

+    m_pOutStream->setFrame(NULL);

   // unreference output stream

   m_pOutStream = NULL;

@@ -179,7 +179,7 @@ void Priority::selectLower()

   }

   // no input has got a frame -> send no frame

-  noFrame();

+  frame(NULL);

 }

 /// send current frame to output stream

@@ -193,12 +193,12 @@ void Priority::curFrame()

     frame(pFrame);

   // no frame available -> send this information

   else

-    noFrame();

+    frame(NULL);

 }

 /**

  * @brief set current frame (also called by inputs)

- * @param[in] pFrame new frame to use

+ * @param[in] pFrame new frame to use (NULL for none)

  */

 void Priority::frame(stBlinkenFrame *pFrame)

 {

@@ -206,13 +206,6 @@ void Priority::frame(stBlinkenFrame *pFrame)

     m_pOutStream->setFrame(pFrame);

 }

-/// set current frame to "no frame"

-void Priority::noFrame()

-{

-  if (m_pOutStream)

-    m_pOutStream->setNoFrame();

-}

-

 /* #####################

    # Priority::InEntry #

    ##################### */

@@ -90,13 +90,10 @@ protected:

   /**

    * @brief set current frame (also called by inputs)

-   * @param[in] pFrame new frame to use

+   * @param[in] pFrame new frame to use (NULL for none)

    */

   void frame(stBlinkenFrame *pFrame);

-  /// set current frame to "no frame"

-  void noFrame();

-

 protected:

   Directory      m_dirInputs;      ///< input stream directory

   SettingFile    m_fileOutStream;  ///< output stream name file

@@ -55,7 +55,7 @@ void Priority::Input::updateConfig()

 /**

  * @brief set current frame

  * @param[in] stream stream name

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 void Priority::Input::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

 {

@@ -63,16 +63,6 @@ void Priority::Input::setFrame(const std::string &stream, stBlinkenFrame *pFrame

   (void)stream; // unused

 }

-/**

- * @brief set current frame to none

- * @param[in] stream stream name

- */

-void Priority::Input::setNoFrame(const std::string &stream)

-{

-  noFrame();

-  (void)stream; // unused

-}

-

 /**

  * @brief get current frame

  * @param[out] pFrame current frame

@@ -102,7 +92,7 @@ void Priority::Input::getInStream()

 void Priority::Input::releaseInStream()

 {

   // set current frame to none

-  noFrame();

+  frame(NULL);

   // detach from input stream

   if (m_pInStream)

@@ -115,13 +105,16 @@ void Priority::Input::releaseInStream()

 /**

  * @brief set current frame

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 void Priority::Input::frame(stBlinkenFrame *pFrame)

 {

   // save new frame

   m_pFrame = pFrame;

+  // there is a frame now

+  if (pFrame) {

+

     // if we are current input

     if (m_priority.m_itCurIn != m_priority.m_inList.rend() &&

         m_priority.m_itCurIn->m_pInput == this)

@@ -133,19 +126,18 @@ void Priority::Input::frame(stBlinkenFrame *pFrame)

         m_priority.m_itCurIn->m_name < m_name)

       // tell priority based selector to select us as input

       m_priority.select(this);

-}

-/// set current frame to none

-void Priority::Input::noFrame()

-{

-  // forget frame

-  m_pFrame = NULL;

+  }

+  // there is no frame

+  else {

     // if we are current input

     if (m_priority.m_itCurIn != m_priority.m_inList.rend() &&

         m_priority.m_itCurIn->m_pInput == this)

       // tell priority based selector to select lower priority input

       m_priority.selectLower();

+

+  }

 }

 } // namespace Blinker

@@ -48,16 +48,10 @@ public:

   /**

    * @brief set current frame

    * @param[in] stream stream name

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(const std::string &stream, stBlinkenFrame *pFrame);

-  /**

-   * @brief set current frame to none

-   * @param[in] stream stream name

-   */

-  virtual void setNoFrame(const std::string &stream);

-

   /**

    * @brief get current frame

    * @param[out] pFrame current frame

@@ -74,13 +68,10 @@ protected:

   /**

    * @brief set current frame

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   void frame(stBlinkenFrame *pFrame);

-  /// set current frame to none

-  void noFrame();

-

 protected:

   Priority       &m_priority;    ///< owning priority based selector

   std::string    m_name;         ///< name of input (i.e. priority)

@@ -71,7 +71,7 @@ void Resizer::updateConfig()

 /**

  * @brief set current frame

  * @param[in] stream stream name

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 void Resizer::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

 {

@@ -79,16 +79,6 @@ void Resizer::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

   (void)stream; // unused

 }

-/**

- * @brief set current frame to none

- * @param[in] stream stream name

- */

-void Resizer::setNoFrame(const std::string &stream)

-{

-  procNoFrame();

-  (void)stream; // unused

-}

-

 /// get input stream and attach to it

 void Resizer::getInStream()

 {

@@ -141,7 +131,7 @@ void Resizer::releaseOutStream()

 {

   // send no frame information

   if (m_pOutStream)

-    m_pOutStream->setNoFrame();

+    m_pOutStream->setFrame(NULL);

   // unreference stream

   m_pOutStream = NULL;

@@ -151,18 +141,17 @@ void Resizer::releaseOutStream()

 /// send current frame to output stream

 void Resizer::sendFrame()

 {

-  stBlinkenFrame *pFrame;

+  stBlinkenFrame *pFrame = NULL;

   // get current frame from input stream and process it

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

+  if (m_pInStream)

+    m_pInStream->getCurFrame(pFrame);

   procFrame(pFrame);

-  else

-    procNoFrame();

 }

 /**

  * @brief process frame

- * @param[in] pFrame frame to process

+ * @param[in] pFrame frame to process (NULL for none)

  */

 void Resizer::procFrame(stBlinkenFrame *pFrame)

 {

@@ -172,9 +161,9 @@ void Resizer::procFrame(stBlinkenFrame *pFrame)

   if (!m_pOutStream)

     return;

-  // no format -> pass "no frame"

-  if (!m_haveFormat) {

-    m_pOutStream->setNoFrame();

+  // no frame or no format -> pass "no frame"

+  if (!pFrame || !m_haveFormat) {

+    m_pOutStream->setFrame(NULL);

     return;

   }

@@ -190,7 +179,7 @@ void Resizer::procFrame(stBlinkenFrame *pFrame)

   // clone frame

   pProcFrame = BlinkenFrameClone(pFrame);

   if (!pProcFrame){

-    m_pOutStream->setNoFrame();

+    m_pOutStream->setFrame(NULL);

     return;

   }

@@ -205,13 +194,5 @@ void Resizer::procFrame(stBlinkenFrame *pFrame)

   BlinkenFrameFree(pProcFrame);

 }

-/// process "no frame"

-void Resizer::procNoFrame()

-{

-  // pass "no frame" to output stream

-  if (m_pOutStream)

-    m_pOutStream->setNoFrame();

-}

-

 } // namespace Blinker

@@ -50,16 +50,10 @@ public:

   /**

    * @brief set current frame

    * @param[in] stream stream name

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(const std::string &stream, stBlinkenFrame *pFrame);

-  /**

-   * @brief set current frame to none

-   * @param[in] stream stream name

-   */

-  virtual void setNoFrame(const std::string &stream);

-

 protected:

   /// get input stream and attach to it

   void getInStream();

@@ -81,13 +75,10 @@ protected:

   /**

    * @brief process frame

-   * @param[in] pFrame frame to process

+   * @param[in] pFrame frame to process (NULL for none)

    */

   void procFrame(stBlinkenFrame *pFrame);

-  /// process "no frame"

-  void procNoFrame();

-

 protected:

   SettingFile m_fileInStream;  ///< input stream name file

   SettingFile m_fileFormat;    ///< format file

@@ -71,7 +71,7 @@ void Scaler::updateConfig()

 /**

  * @brief set current frame

  * @param[in] stream stream name

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 void Scaler::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

 {

@@ -79,16 +79,6 @@ void Scaler::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

   (void)stream; // unused

 }

-/**

- * @brief set current frame to none

- * @param[in] stream stream name

- */

-void Scaler::setNoFrame(const std::string &stream)

-{

-  procNoFrame();

-  (void)stream; // unused

-}

-

 /// get input stream and attach to it

 void Scaler::getInStream()

 {

@@ -141,7 +131,7 @@ void Scaler::releaseOutStream()

 {

   // send no frame information

   if (m_pOutStream)

-    m_pOutStream->setNoFrame();

+    m_pOutStream->setFrame(NULL);

   // unreference stream

   m_pOutStream = NULL;

@@ -151,18 +141,17 @@ void Scaler::releaseOutStream()

 /// send current frame to output stream

 void Scaler::sendFrame()

 {

-  stBlinkenFrame *pFrame;

+  stBlinkenFrame *pFrame = NULL;

   // get current frame from input stream and process it

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

+  if (m_pInStream)

+    m_pInStream->getCurFrame(pFrame);

   procFrame(pFrame);

-  else

-    procNoFrame();

 }

 /**

  * @brief process frame

- * @param[in] pFrame frame to process

+ * @param[in] pFrame frame to process (NULL for none)

  */

 void Scaler::procFrame(stBlinkenFrame *pFrame)

 {

@@ -172,9 +161,9 @@ void Scaler::procFrame(stBlinkenFrame *pFrame)

   if (!m_pOutStream)

     return;

-  // no size -> pass "no frame"

-  if (!m_haveSize) {

-    m_pOutStream->setNoFrame();

+  // no frame or no size -> pass "no frame"

+  if (!pFrame || !m_haveSize) {

+    m_pOutStream->setFrame(NULL);

     return;

   }

@@ -188,7 +177,7 @@ void Scaler::procFrame(stBlinkenFrame *pFrame)

   // clone frame

   pProcFrame = BlinkenFrameClone(pFrame);

   if (!pProcFrame) {

-    m_pOutStream->setNoFrame();

+    m_pOutStream->setFrame(NULL);

     return;

   }

@@ -202,13 +191,5 @@ void Scaler::procFrame(stBlinkenFrame *pFrame)

   BlinkenFrameFree(pProcFrame);

 }

-/// process "no frame"

-void Scaler::procNoFrame()

-{

-  // pass "no frame" to output stream

-  if (m_pOutStream)

-    m_pOutStream->setNoFrame();

-}

-

 } // namespace Blinker

@@ -50,16 +50,10 @@ public:

   /**

    * @brief set current frame

    * @param[in] stream stream name

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(const std::string &stream, stBlinkenFrame *pFrame);

-  /**

-   * @brief set current frame to none

-   * @param[in] stream stream name

-   */

-  virtual void setNoFrame(const std::string &stream);

-

 protected:

   /// get input stream and attach to it

   void getInStream();

@@ -81,13 +75,10 @@ protected:

   /**

    * @brief process frame

-   * @param[in] pFrame frame to process

+   * @param[in] pFrame frame to process (NULL for none)

    */

   void procFrame(stBlinkenFrame *pFrame);

-  /// process "no frame"

-  void procNoFrame();

-

 protected:

   SettingFile m_fileInStream;  ///< input stream name file

   SettingFile m_fileSize;      ///< size file

@@ -74,16 +74,10 @@ public:

   /**

    * @brief set current frame

    * @param[in] stream stream name

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(const std::string &stream, stBlinkenFrame *pFrame);

-  /**

-   * @brief set current frame to none

-   * @param[in] stream stream name

-   */

-  virtual void setNoFrame(const std::string &stream);

-

   /// callback when requsted time reached

   virtual void timeCall();

@@ -130,7 +124,7 @@ protected:

    *        i.e. scan files in playlist directory

    * @param[in] dirDests static destinations directory for protocol

    * @param[in] destList static destinations for protocol

-   * @param[in] pNoFrameData "no frame" protocaol data

+   * @param[in] pNoFrameData "no frame" protocol data

    */

   void updateDestsFull(Directory &dirDests, DestList &destList,

                        const std::string *pNoFrameData);

@@ -162,20 +156,13 @@ protected:

   /**

    * @brief convert frame to protocol data

-   * @param[in] pFrame frame

+   * @param[in] pFrame frame (NULL for none)

    * @param[in] proto Blinken protocol identifier

    * @param[out] data protcol data

    */

   static void frame2data(stBlinkenFrame *pFrame, etBlinkenProto proto,

                          std::string &data);

-  /**

-   * @brief get "no frame" protocol data

-   * @param[in] proto Blinken protocol identifier

-   * @param[out] data protcol data

-   */

-  static void noFrame2data(etBlinkenProto proto, std::string &data);

-

   /// receive data from socket

   void receiveFromSock();

@@ -48,9 +48,9 @@ Sender<ADDR, SOCK>::Sender(CallMgr &callMgr, StreamMgr &streamMgr,

   m_pSock(NULL)

 {

   // initialize protocol data buffers

-  noFrame2data(BlinkenProtoBlp, m_noFrameDataBlp);

-  noFrame2data(BlinkenProtoEblp, m_noFrameDataEblp);

-  noFrame2data(BlinkenProtoMcuf, m_noFrameDataMcuf);

+  frame2data(NULL, BlinkenProtoBlp, m_noFrameDataBlp);

+  frame2data(NULL, BlinkenProtoEblp, m_noFrameDataEblp);

+  frame2data(NULL, BlinkenProtoMcuf, m_noFrameDataMcuf);

   m_dataBlp = m_noFrameDataBlp;

   m_dataEblp = m_noFrameDataEblp;

   m_dataMcuf = m_noFrameDataMcuf;

@@ -121,7 +121,7 @@ void Sender<ADDR, SOCK>::updateConfig()

 /**

  * @brief set current frame

  * @param[in] stream stream name

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 template<typename ADDR, typename SOCK>

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

@@ -138,24 +138,6 @@ void Sender<ADDR, SOCK>::setFrame(const std::string &stream,

   (void)stream; // unused

 }

-/**

- * @brief set current frame to none

- * @param[in] stream stream name

- */

-template<typename ADDR, typename SOCK>

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

-{

-  // 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

-}

-

 /// callback when requsted time reached

 template<typename ADDR, typename SOCK>

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

@@ -448,7 +430,7 @@ void Sender<ADDR, SOCK>::sendProto(const std::string &data,

 /**

  * @brief convert frame to protocol data

- * @param[in] pFrame frame

+ * @param[in] pFrame frame (NULL for none)

  * @param[in] proto Blinken protocol identifier

  * @param[out] data protocol data

  */

@@ -460,24 +442,9 @@ void Sender<ADDR, SOCK>::frame2data(stBlinkenFrame *pFrame,

   int len;

   // convert frame to protcol data

+  if (pFrame)

     len = BlinkenFrameToNetwork(pFrame, proto, buf, sizeof(buf));

-  if (len < 0)

-    len = 0;

-  data.assign(buf, len);

-}

-

-/**

- * @brief get "no frame" protocol data

- * @param[in] proto Blinken protocol identifier

- * @param[out] data protcol data

- */

-template<typename ADDR, typename SOCK>

-void Sender<ADDR, SOCK>::noFrame2data(etBlinkenProto proto, std::string &data)

-{

-  char buf[16];

-  int len;

-

-  // obtain "no frame" protcol data

+  else

     len = BlinkenProtoMakePacket(proto, BlinkenPacketStreamEnd,

                                  buf, sizeof(buf));

   if (len < 0)

@@ -35,10 +35,7 @@ void Stream::attach(StreamRecv *recv)

   m_recvs.insert(recv);

   // send current frame to receiver

-  if (m_pFrame)

   recv->setFrame(m_name, m_pFrame);

-  else

-    recv->setNoFrame(m_name);

 }

 /**

@@ -52,55 +49,39 @@ void Stream::detach(StreamRecv *recv)

 /**

  * @brief set current frame

- * @param[in] pFrame current frame

+ * @param[in] pFrame current frame (NULL for none)

  */

 void Stream::setFrame(stBlinkenFrame *pFrame)

 {

   // leave if frame is already set to an identical one

-  if (m_pFrame && !BlinkenFrameCompare(pFrame, m_pFrame))

+  if (pFrame && m_pFrame && !BlinkenFrameCompare(pFrame, m_pFrame))

     return;

-

-  // update local copy of current frame

-  if (m_pFrame)

-    BlinkenFrameFree(m_pFrame);

-  m_pFrame = BlinkenFrameClone(pFrame);

-  if (!m_pFrame)

-    return; // out of memory: do not pass NULL pointer to receivers

-

-  // pass frame to all receivers

-  Recvs::iterator it;

-  for (it = m_recvs.begin(); it != m_recvs.end(); ++it)

-    (*it)->setFrame(m_name, m_pFrame);

-}

-

-/// set current frame to none

-void Stream::setNoFrame()

-{

-  // leave if frame is already set to none

-  if (!m_pFrame)

+  if (!pFrame && !m_pFrame)

     return;

-  // set current frame to none

+  // update local copy of current frame

   if (m_pFrame) {

     BlinkenFrameFree(m_pFrame);

     m_pFrame = NULL;

   }

+  if (pFrame) {

+    m_pFrame = BlinkenFrameClone(pFrame);

+    // in case of NULL returned: out of memory - got on without frame

+  }

-  // pass "no frame" to all receivers

+  // pass frame to all receivers

   Recvs::iterator it;

   for (it = m_recvs.begin(); it != m_recvs.end(); ++it)

-    (*it)->setNoFrame(m_name);

+    (*it)->setFrame(m_name, m_pFrame);

 }

 /**

  * @brief get current frame

- * @param[out] pFrame current frame

- * @return if a current frame exists

+ * @param[out] pFrame current frame (NULL for none)

  */

-bool Stream::getCurFrame(stBlinkenFrame *&pFrame)

+void Stream::getCurFrame(stBlinkenFrame *&pFrame)

 {

   pFrame = m_pFrame;

-  return m_pFrame;

 }

 } // namespace Blinker

@@ -44,19 +44,15 @@ public:

   /**

    * @brief set current frame

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(stBlinkenFrame *pFrame);

-  /// set current frame to none

-  virtual void setNoFrame();

-

   /**

    * @brief get current frame

-   * @param[out] pFrame current frame

-   * @return if a current frame exists

+   * @param[out] pFrame current frame (NULL for none)

    */

-  bool getCurFrame(stBlinkenFrame *&pFrame);

+  void getCurFrame(stBlinkenFrame *&pFrame);

 protected:

   /// stream name

@@ -26,15 +26,9 @@ public:

   /**

    * @brief set current frame

    * @param[in] stream stream name

-   * @param[in] pFrame current frame

+   * @param[in] pFrame current frame (NULL for none)

    */

   virtual void setFrame(const std::string &stream, stBlinkenFrame *pFrame) = 0;

-

-  /**

-   * @brief set current frame to none

-   * @param[in] stream stream name

-   */

-  virtual void setNoFrame(const std::string &stream) = 0;

 }; // class StreamRecv

 } // namespace Blinker