Blinker

@@ -13,8 +13,11 @@

 #include "Directory.h"

 #include "File.h"

 #include "Module.h"

+#include "ListTracker.h"

+#include "ListTracker_impl.h"

 #include "OutStreamFile.h"

 #include "Player.h"

+#include "PlayerMovie.h"

 #include "StreamMgr.h"

 #include "Time.h"

 #include "TimeCallee.h"

@@ -31,13 +34,15 @@ Player::Player(CallMgr &callMgr, StreamMgr &streamMgr,

                const Directory &dirBase):

   Module(callMgr, streamMgr, dirBase),

   m_fileOutStream(dirBase.getFile("outstream"), streamMgr),

-  m_dirPlaylist(dirBase.getSubdir("playlist")),

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

   m_curValid(false),

-  m_curEntry(m_playlist.begin()),

-  m_curFrame(0)

+  m_curEntry(m_playlistTracker.m_list.begin()),

+  m_curFrame(0),

+  m_curChange(false)

 {

   // load playlist

-  updatePlaylistFull();

+  m_playlistTracker.init();

+  checkCurChanged();

 }

 /// virtual destructor

@@ -47,10 +52,7 @@ Player::~Player()

   m_callMgr.cancelTimeCall(this);

   // free all movies

-  while (!m_playlist.empty()) {

-    m_playlist.back().freeMovie();

-    m_playlist.pop_back();

-  }

+  m_playlistTracker.clear();

 }

 /// check for update of configuration

@@ -62,11 +64,9 @@ void Player::updateConfig()

     sendFrame();

   }

-  // playlist update (directory modified -> full, otherwise -> light)

-  if (m_dirPlaylist.checkModified())

-    updatePlaylistFull();

-  else

-    updatePlaylistLight();

+  // playlist update

+  m_playlistTracker.updateConfig();

+  checkCurChanged();

 }

 /// callback when requested time reached

@@ -86,105 +86,19 @@ void Player::timeCall()

   procFrame();

 }

-/// light update of playlist, i.e. stat all files in current playlist

-void Player::updatePlaylistLight()

+/// check if current movie changed and react

+void Player::checkCurChanged()

 {

-  // walk through all files in playlist and check for modification

-  Playlist::iterator itEntry = m_playlist.begin();

-  bool               bCurChg = false;

-  while (itEntry != m_playlist.end()) {

-

-    // movie changed

-    if (itEntry->m_file.checkModified()) {

-      // check if changed movie is current movie

-      if (itEntry == m_curEntry) {

-        // advance current movie to next movie

-        ++m_curEntry;

-        bCurChg = true;

-      }

-      // re-load entry

-      itEntry->freeMovie();

-      if (!itEntry->loadMovie()) {

-        // loading movie failed -> remove entry

-        itEntry = m_playlist.erase(itEntry);

-        // do not advance to next file

-        continue;

-      }

-    }

-

-    // advance to next file

-    ++itEntry;

+  // current movie changed

+  if (m_curChange) {

+    m_curChange = false;

-  } // while itEntry

-

-  // current movie entry changed

-  if (bCurChg) {

     // go to begin of new current movie and start playing now

     m_curFrame = 0;

     m_nextTime = Time::now();

     procFrame();

-  }

-}

-

-/// full update of playlist, i.e. scan files in playlist directory

-void Player::updatePlaylistFull()

-{

-  // get list of files in playlist directory

-  typedef std::list<std::string> Filelist;

-  Filelist curFiles;

-  m_dirPlaylist.getEntries(Directory::TypeFile, curFiles);

-

-  // walk through current playlist and file list simultaneously

-  bool                     bWasEmpty = m_playlist.empty();

-  Filelist::const_iterator itFile    = curFiles.begin();

-  Playlist::iterator       itEntry   = m_playlist.begin();

-  bool                     bCurChg   = false;

-  while (itFile != curFiles.end() || itEntry != m_playlist.end()) {

-

-    // new movie inserted

-    if (itEntry == m_playlist.end() ||

-        (itFile != curFiles.end() && *itFile < itEntry->m_name)) {

-      // load movie

-      Entry entry(*itFile, m_dirPlaylist.getFile(*itFile));

-      if (entry.loadMovie())

-        // insert playlist entry

-        m_playlist.insert(itEntry, entry);

-      // advance to next file

-      ++itFile;

-    }

-

-    // movie removed

-    // movie changed (=> remove and re-insert in next iteration)

-    else if (itFile == curFiles.end() || *itFile > itEntry->m_name ||

-             itEntry->m_file.checkModified()) {

-      // check if movie to remove is current movie

-      if (itEntry == m_curEntry) {

-        // advance current movie to next movie

-        ++m_curEntry;

-        bCurChg = true;

-      }

-      // remove entry

-      itEntry->freeMovie();

-      itEntry = m_playlist.erase(itEntry);

-      // do not advance to next file

-    }

-    // movie stayed in playlist and did not change

-    else {

-      // advance to next file and next entry

-      ++itFile;

-      ++itEntry;

-    }

-

-  } // while itFile itEntry

-

-  // current movie entry changed - or - playlist was empty and is not now

-  if (bCurChg || (bWasEmpty && !m_playlist.empty())) {

-    // go to begin of new current movie and start playing now

-    m_curFrame = 0;

-    m_nextTime = Time::now();

-    procFrame();

-  }

+  } // if (m_curChange)

 }

 /// process current frame

@@ -196,8 +110,8 @@ void Player::procFrame()

   bool wrapped = false;

   while (true) {

     // playlist finished -> re-start from beginning

-    while (m_curEntry == m_playlist.end()) {

-      m_curEntry = m_playlist.begin();

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

+      m_curEntry = m_playlistTracker.m_list.begin();

       m_curFrame = 0;

       // detect empty playlist or playlist with only empty movies

       if (wrapped) {

@@ -209,7 +123,7 @@ void Player::procFrame()

     if (!m_curValid)

       break;

     // movie not yet finished -> done

-    if (m_curFrame < BlinkenMovieGetFrameCnt(m_curEntry->m_pMovie))

+    if (m_curFrame < BlinkenMovieGetFrameCnt(m_curEntry->m_pObj->m_pMovie))

       break;

     // movie finished -> next movie

     ++m_curEntry;

@@ -223,7 +137,7 @@ void Player::procFrame()

   if (m_curValid) {

     // calculate time for next frame

     stBlinkenFrame *pFrame =

-      BlinkenMovieGetFrame(m_curEntry->m_pMovie, m_curFrame);

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

     Time duration;

     duration.fromMs(BlinkenFrameGetDuration(pFrame));

     m_nextTime += duration;

@@ -238,7 +152,7 @@ void Player::sendFrame()

   // frame avalable -> send it

   if (m_curValid) {

     stBlinkenFrame *pFrame =

-      BlinkenMovieGetFrame(m_curEntry->m_pMovie, m_curFrame);

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

     m_fileOutStream.setFrame(pFrame);

   }

   // no frame available -> send this information

@@ -246,34 +160,5 @@ void Player::sendFrame()

     m_fileOutStream.setFrame(NULL);

 }

-/* #################

-   # Player::Entry #

-   ################# */

-

-/// constructor

-Player::Entry::Entry(const std::string &name, const File &file):

-  m_name(name),

-  m_file(file),

-  m_pMovie(NULL)

-{

-}

-

-/// load movie from current file

-bool Player::Entry::loadMovie()

-{

-  freeMovie();

-  m_pMovie = BlinkenMovieLoad(m_file.getPath().c_str());

-  return m_pMovie;

-}

-

-/// free current movie

-void Player::Entry::freeMovie()

-{

-  if (m_pMovie) {

-    BlinkenMovieFree(m_pMovie);

-    m_pMovie = NULL;

-  }

-}

-

 } // namespace Blinker

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

 #include "Directory.h"

 #include "File.h"

 #include "Module.h"

+#include "ListTracker.h"

 #include "OutStreamFile.h"

 #include "StreamMgr.h"

 #include "Time.h"

@@ -26,18 +27,14 @@ namespace Blinker {

 class Player: public Module, public TimeCallee

 {

 protected:

-  /// playlist entry

-  struct Entry {

-    std::string     m_name;    ///< name of playlist entry

-    File            m_file;    ///< file object (to check for updates)

-    stBlinkenMovie *m_pMovie;  ///< movie object

-    Entry(const std::string &name, const File &file); ///< constructor

-    bool loadMovie(); ///< load movie from current file

-    void freeMovie(); ///< free current movie

-  };

-

-  /// playlist

-  typedef std::list<Entry> Playlist;

+  /// movie in playlist

+  class Movie;

+

+  /// playlist tracker

+  typedef ListTracker<Player, Movie, File> PlaylistTracker;

+

+  /// playlist iterator

+  typedef PlaylistTracker::ListIt PlaylistIt;

 public:

   /**

@@ -66,11 +63,8 @@ public:

   virtual void timeCall();

 protected:

-  /// light update of playlist, i.e. stat all files in current playlist

-  void updatePlaylistLight();

-

-  /// full update of playlist, i.e. scan files in playlist directory

-  void updatePlaylistFull();

+  /// check if current movie changed and react

+  void checkCurChanged();

   /// process current frame

   void procFrame();

@@ -80,11 +74,11 @@ protected:

 protected:

   OutStreamFile   m_fileOutStream;   ///< output stream name file

-  Directory                m_dirPlaylist;   ///< playlist directory

-  Playlist                 m_playlist;      ///< current playlist

+  PlaylistTracker m_playlistTracker; ///< current playlist

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

-  Playlist::const_iterator m_curEntry;      ///< current playlist entry

+  PlaylistIt      m_curEntry;        ///< current playlist entry

   int             m_curFrame;        ///< current frame in movie

+  bool            m_curChange;       ///< current movie changed

   Time            m_nextTime;        ///< when to show next frame

 }; // class Player

@@ -0,0 +1,90 @@

+/* Blinker

+   Copyright 2011 Stefan Schuermans <stefan@blinkenarea.org>

+   Copyleft GNU public license - http://www.gnu.org/copyleft/gpl.html

+   a blinkenarea.org project */

+

+#include <string>

+

+#include <BlinkenLib/BlinkenFrame.h>

+#include <BlinkenLib/BlinkenMovie.h>

+

+#include "File.h"

+#include "Player.h"

+#include "PlayerMovie.h"

+

+namespace Blinker {

+

+/**

+ * @brief constructor

+ * @param[in] player owning player module

+ * @param[in] name name of movie

+ * @param[in] file movie file

+ */

+Player::Movie::Movie(Player &player, const std::string &name,

+                     const File &file):

+  m_player(player),

+  m_name(name),

+  m_file(file),

+  m_pMovie(NULL)

+{

+  load();

+  ifOnlyGoHere();

+}

+

+/// destructor

+Player::Movie::~Movie()

+{

+  ifCurGoNext();

+  free();

+}

+

+/// check for update of configuration

+void Player::Movie::updateConfig()

+{

+  // movie file was modified

+  if (m_file.checkModified()) {

+    ifCurGoNext();

+    load();

+    ifOnlyGoHere();

+  }

+}

+

+/// load movie from current file

+void Player::Movie::load()

+{

+  free();

+  m_pMovie = BlinkenMovieLoad(m_file.getPath().c_str());

+}

+

+/// free current movie

+void Player::Movie::free()

+{

+  if (m_pMovie) {

+    BlinkenMovieFree(m_pMovie);

+    m_pMovie = NULL;

+  }

+}

+

+/// if this is the only movie in playlist go to begin of this movie

+void Player::Movie::ifOnlyGoHere()

+{

+  /* The implementation of ListTracker will first set up the entry and then

+     insert it into the list. Thus, we are the only movie if we see an empty

+     playlist here. */

+  if (m_player.m_playlistTracker.m_list.empty() && m_pMovie) {

+    m_player.m_curEntry = m_player.m_playlistTracker.m_list.begin();

+    m_player.m_curChange = true;

+  }

+}

+

+/// if this is current movie go to begin of next movie

+void Player::Movie::ifCurGoNext()

+{

+  if (m_player.m_curEntry->m_pObj == this) {

+    ++m_player.m_curEntry;

+    m_player.m_curChange = true;

+  }

+}

+

+} // namespace Blinker

+

@@ -0,0 +1,71 @@

+/* Blinker

+   Copyright 2011 Stefan Schuermans <stefan@blinkenarea.org>

+   Copyleft GNU public license - http://www.gnu.org/copyleft/gpl.html

+   a blinkenarea.org project */

+

+#ifndef PLAYERMOVIE_H

+#define PLAYERMOVIE_H

+

+#include <string>

+

+#include <BlinkenLib/BlinkenFrame.h>

+#include <BlinkenLib/BlinkenMovie.h>

+

+#include "File.h"

+#include "Player.h"

+

+namespace Blinker {

+

+/// movie in player's playlist

+class Player::Movie

+{

+public:

+  /**

+   * @brief constructor

+   * @param[in] player owning player module

+   * @param[in] name name of movie

+   * @param[in] file movie file

+   */

+  Movie(Player &player, const std::string &name,

+        const File &file);

+

+  /// destructor

+  ~Movie();

+

+private:

+  /// copy constructor disabled

+  Movie(const Movie &that);

+

+  /// assignment operator disabled

+  const Movie & operator=(const Movie &that);

+

+public:

+  /// check for update of configuration

+  void updateConfig();

+

+protected:

+  /// load movie from current file

+  void load();

+

+  /// free current movie

+  void free();

+

+  /// if this is the only movie in playlist go to begin of this movie

+  void ifOnlyGoHere();

+

+  /// if this is current movie go to begin of next movie

+  void ifCurGoNext();

+

+protected:

+  Player         &m_player; ///< owning player module

+  std::string    m_name;    ///< name of movie

+  File           m_file;    ///< movie file

+

+public:

+  stBlinkenMovie *m_pMovie; ///< loaded movie object

+}; // class Player::Movie

+

+} // namespace Blinker

+

+#endif // #ifndef PLAYERMOVIE_H

+