Blinker

@@ -39,6 +39,7 @@ Player::Player(const std::string &name, Mgrs &mgrs,

   m_fileInSync(dirBase.getFile("insync"), mgrs.m_syncMgr),

   m_playlistTracker(*this, dirBase.getSubdir("playlist")),

   m_curValid(false),

+  m_unknownMovie(false),

   m_curEntry(m_playlistTracker.m_list.begin()),

   m_curFrame(0),

   m_curFrameStart(0),

@@ -117,7 +118,7 @@ void Player::setFrame(const std::string &stream, stBlinkenFrame *pFrame)

  */

 void Player::sendInfo(const std::string &sync, Info &info)

 {

-  bool change = false, seekPos = true;

+  bool change = false;

   // halt player if pause flag is set

   if (info.pause)

@@ -126,16 +127,13 @@ void Player::sendInfo(const std::string &sync, Info &info)

   // seek to other movie if not correct one

   if (m_curEntry == m_playlistTracker.m_list.end() ||

       !checkName(m_curEntry->m_name, info.name)) {

-    // movie found -> change has been done

-    if (seekToMovie(info.name))

+    // movie found -> seek to it

+    seekToMovie(info.name);

     change = true;

-    // movie not found -> do not seek to position (wrong movie anyway)

-    else

-      seekPos = false;

   }

   // seek to requested position in movie

-  if (m_curValid && seekPos) {

+  if (m_curValid) {

     if (seekToPos(info.pos))

       change = true;

   }

@@ -243,11 +241,13 @@ void Player::procFrame()

   while (true) {

     // playlist finished -> re-start from beginning

     while (m_curEntry == m_playlistTracker.m_list.end()) {

+      if (!m_unknownMovie) // do not go to first movie if "playing" unkn. movie

         m_curEntry = m_playlistTracker.m_list.begin();

       m_curFrame = 0;

       m_curFrameStart = 0;

       m_curFrameEnd = 0;

       // detect empty playlist or playlist with only empty movies

+      //   also leave here in case of "playing" unknown movie

       if (wrapped) {

         m_curValid = false;

         break;

@@ -301,9 +301,8 @@ void Player::sendFrame()

 /**

  * @brief seek to movie by name

  * @param[in] name name of movie to seek to (name cmp according to SyncRecv)

- * @return true if movie was found and seeked to, false otherwise

  */

-bool Player::seekToMovie(const std::string &name)

+void Player::seekToMovie(const std::string &name)

 {

   // find movie by name

   PlaylistIt it = m_playlistTracker.m_list.begin();

@@ -313,12 +312,17 @@ bool Player::seekToMovie(const std::string &name)

     ++it;

   }

-  // movie not found -> give up, return error

-  if (it == m_playlistTracker.m_list.end())

-    return false;

+  // movie not found -> invalidate current movie, "play unkown movie"

+  if (it == m_playlistTracker.m_list.end()) {

+    m_curValid = false;

+    m_unknownMovie = true;

+    m_curEntry = m_playlistTracker.m_list.end();

+    return;

+  }

   // seek to movie

   m_curValid = false;

+  m_unknownMovie = false;

   m_curEntry = it;

   m_curFrame = 0;

   m_remainTime = Time::zero;

@@ -333,8 +337,6 @@ bool Player::seekToMovie(const std::string &name)

   m_curFrameStart = Time::zero;

   m_curFrameEnd = m_remainTime;

   m_nextTime = Time::now() + m_remainTime;

-

-  return true;

 }

 /**

@@ -357,14 +359,14 @@ bool Player::seekToPos(const Time &tgtPos)

   // seek to earlier position in movie if needed

   if (pos > tgtPos + m_maxDeviation) {

     Time goback = pos - tgtPos;

-    if (seekBackwards(goback))

+    seekBackwards(goback);

     change = true;

   } // if (pos > tgtPos + m_maxDeviation)

   // seek to later position in movie if needed

   if (pos + m_maxDeviation < tgtPos) {

     Time go = tgtPos - pos;

-    if (seekForwards(go))

+    seekForwards(go);

     change = true;

   } // if (pos + m_maxDeviation < tgtPos)

@@ -374,12 +376,9 @@ bool Player::seekToPos(const Time &tgtPos)

 /**

  * @brief seek backwards in current movie

  * @param[in] goback time to seek backwards in current movie

- * @return true if movie position has been changed, false otherwise

  */

-bool Player::seekBackwards(Time goback)

+void Player::seekBackwards(Time goback)

 {

-  bool change = false;

-

   // time of current frame

   Time frame = m_curFrameEnd - m_curFrameStart;

@@ -413,19 +412,14 @@ bool Player::seekBackwards(Time goback)

     shown = frame;

   } // while (goback > Time::zero)

-

-  return change;

 }

 /**

  * @brief seek forwards in current movie

  * @param[in] go time to seek forwards in current movie

- * @return true if movie position has been changed, false otherwise

  */

-bool Player::seekForwards(Time go)

+void Player::seekForwards(Time go)

 {

-  bool change = false;

-

   // frame count of current movie

   int frameCnt = BlinkenMovieGetFrameCnt(m_curEntry->m_pObj->m_pMovie);

@@ -433,7 +427,6 @@ bool Player::seekForwards(Time go)

   Time frame = m_curFrameEnd - m_curFrameStart;

   while (go > Time::zero) {

-    change = true;

     // correct by just showing current frame some time shorter

     if (go <= m_remainTime) {

@@ -446,10 +439,11 @@ bool Player::seekForwards(Time go)

     m_remainTime = Time::zero;

     // go to begin of next frame

-    if (m_curFrame >= frameCnt)

-      break;

+    //   end of movie -> // stay at last frame (go to begin of last frame)

+    if (m_curFrame + 1 < frameCnt) {

       m_curFrame++;

       m_curFrameStart = m_curFrameEnd;

+    }

     frame = Time::zero;

     stBlinkenFrame *pFrame =

       BlinkenMovieGetFrame(m_curEntry->m_pObj->m_pMovie, m_curFrame);

@@ -459,8 +453,6 @@ bool Player::seekForwards(Time go)

     m_remainTime = frame;

   } // while (go > Time::zero)

-

-  return change;

 }

 } // namespace Blinker

@@ -99,9 +99,8 @@ protected:

   /**

    * @brief seek to movie by name

    * @param[in] name name of movie to seek to (name cmp according to SyncRecv)

-   * @return true if movie was found and seeked to, false otherwise

    */

-  bool seekToMovie(const std::string &name);

+  void seekToMovie(const std::string &name);

   /**

    * @brief seek to position in current movie

@@ -113,16 +112,14 @@ protected:

   /**

    * @brief seek backwards in current movie

    * @param[in] goback time to seek backwards in current movie

-   * @return true if movie position has been changed, false otherwise

    */

-  bool seekBackwards(Time goback);

+  void seekBackwards(Time goback);

   /**

    * @brief seek forwards in current movie

    * @param[in] go time to seek forwards in current movie

-   * @return true if movie position has been changed, false otherwise

    */

-  bool seekForwards(Time go);

+  void seekForwards(Time go);

 protected:

   OutStreamFile   m_fileOutStream;   ///< output stream name file

@@ -131,6 +128,7 @@ protected:

   InSyncFile      m_fileInSync;      ///< input sync stream

   PlaylistTracker m_playlistTracker; ///< current playlist

   bool            m_curValid;        ///< if there is a current frame

+  bool            m_unknownMovie;    ///< unknown movie is playing (via sync)

   PlaylistIt      m_curEntry;        ///< current playlist entry

   int             m_curFrame;        ///< current frame in movie

   Time            m_curFrameStart;   /**< start time of current frame