Blinker

@@ -16,6 +16,8 @@

 #include "Format.h"

 #include "FormatFile.h"

 #include "Module.h"

+#include "ListTracker.h"

+#include "ListTracker_impl.h"

 #include "OutStreamFile.h"

 #include "StreamMgr.h"

 #include "StreamRecv.h"

@@ -31,24 +33,21 @@ namespace Blinker {

 Canvas::Canvas(CallMgr &callMgr, StreamMgr &streamMgr, const Directory &dirBase):

   Module(callMgr, streamMgr, dirBase),

   m_fileFormat(dirBase.getFile("format")),

-  m_dirInputs(dirBase.getSubdir("inputs")),

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

   m_pCanvas(NULL),

-  m_canvasHasFrame(false)

+  m_canvasHasFrame(false),

+  m_inListTracker(*this, dirBase.getSubdir("inputs"))

 {

   // set up

   createCanvas();

-  updateInListFull();

+  m_inListTracker.init();

 }

 /// virtual destructor

 Canvas::~Canvas()

 {

   // clean up

-  while (!m_inList.empty()) {

-    delete m_inList.back().m_pInput;

-    m_inList.pop_back();

-  }

+  m_inListTracker.clear();

   destroyCanvas();

 }

@@ -60,11 +59,8 @@ void Canvas::updateConfig()

     createCanvas();

   }

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

-  if (m_dirInputs.checkModified())

-    updateInListFull();

-  else

-    updateInListLight();

+  // input list update

+  m_inListTracker.updateConfig();

   // output stream name file was modified -> re-get output stream

   if (m_fileOutStream.checkModified())

@@ -100,61 +96,6 @@ void Canvas::destroyCanvas()

   }

 }

-/// light update of input list, i.e. check all entries in current input list

-void Canvas::updateInListLight()

-{

-  // walk through all inputs in input list and check for modification

-  InList::iterator itIn;

-  for (itIn = m_inList.begin(); itIn != m_inList.end(); ++itIn)

-    itIn->m_pInput->updateConfig();

-}

-

-/// full update of input list, i.e. scan subdirs in input list directory

-void Canvas::updateInListFull()

-{

-  // get list of subdirs in input directory

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

-  Subdirlist curSubdirs;

-  m_dirInputs.getEntries(Directory::TypeSubdir, curSubdirs);

-

-  // walk through current input list and subdir list simultaneously

-  Subdirlist::const_iterator itSubdir = curSubdirs.begin();

-  InList::iterator           itIn     = m_inList.begin();

-  while (itSubdir != curSubdirs.end() || itIn != m_inList.end()) {

-

-    // new input inserted

-    if (itIn == m_inList.end() ||

-        (itSubdir != curSubdirs.end() && *itSubdir < itIn->m_name)) {

-      // create input object

-      InEntry inEntry(*itSubdir);

-      inEntry.m_pInput = new Input(*this, m_dirInputs.getSubdir(*itSubdir));

-      if (inEntry.m_pInput)

-        // insert input list entry

-        m_inList.insert(itIn, inEntry);

-      // advance to next subdir

-      ++itSubdir;

-    }

-

-    // input removed

-    else if (itSubdir == curSubdirs.end() || *itSubdir > itIn->m_name) {

-      // remove input

-      delete itIn->m_pInput;

-      itIn = m_inList.erase(itIn);

-      // do not advance to next subdir

-    }

-

-    // input stayed in input list

-    else {

-      // check for update

-      itIn->m_pInput->updateConfig();

-      // advance to next file and next entry

-      ++itSubdir;

-      ++itIn;

-    }

-

-  } // while itSubdir itIn

-}

-

 /// notfication to redraw (called by inputs)

 void Canvas::redraw()

 {

@@ -167,9 +108,10 @@ void Canvas::redraw()

   m_canvasHasFrame = false; // no frame on canvas yet

   // tell all inputs to draw on canvas

-  InList::iterator itIn;

-  for (itIn = m_inList.begin(); itIn != m_inList.end(); ++itIn)

-    if (itIn->m_pInput->draw())

+  InListTracker::ListIt itIn;

+  for (itIn = m_inListTracker.m_list.begin();

+       itIn != m_inListTracker.m_list.end(); ++itIn)

+    if (itIn->m_pObj->draw())

       m_canvasHasFrame = true; // drawing successful -> there is a frame now

   // send current frame to stream

@@ -187,16 +129,5 @@ void Canvas::sendFrame()

     m_fileOutStream.setFrame(NULL);

 }

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

-   # Canvas::InEntry #

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

-

-/// constructor

-Canvas::InEntry::InEntry(const std::string &name):

-  m_name(name),

-  m_pInput(NULL)

-{

-}

-

 } // namespace Blinker

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

 #include "File.h"

 #include "Format.h"

 #include "FormatFile.h"

+#include "ListTracker.h"

 #include "Module.h"

 #include "OutStreamFile.h"

 #include "StreamMgr.h"

@@ -29,15 +30,8 @@ protected:

   /// input to canvas

   class Input;

-  /// input list entry

-  struct InEntry {

-    std::string m_name;    ///< name of input list entry

-    Input       *m_pInput; ///< input object

-    InEntry(const std::string &name); ///< constructor

-  };

-

-  /// input list

-  typedef std::list<InEntry> InList;

+  /// input list tracker

+  typedef ListTracker<Canvas, Input, Directory> InListTracker;

 public:

   /**

@@ -69,12 +63,6 @@ protected:

   /// tear down canvas

   void destroyCanvas();

-  /// light update of input list, i.e. check all entries in current input list

-  void updateInListLight();

-

-  /// full update of input list, i.e. scan subdirs in input list directory

-  void updateInListFull();

-

   /// notfication to redraw (called by inputs)

   void redraw();

@@ -83,11 +71,10 @@ protected:

 protected:

   FormatFile     m_fileFormat;     ///< canvas format file

-  Directory      m_dirInputs;      ///< input stream directory

   OutStreamFile  m_fileOutStream;  ///< output stream name file

   stBlinkenFrame *m_pCanvas;       ///< canvas to put streams on

   bool           m_canvasHasFrame; ///< if there is >= 1 frame on canvas

-  InList         m_inList;         ///< current input list

+  InListTracker  m_inListTracker;  ///< input list tracker

 }; // class Canvas

 } // namespace Blinker

@@ -24,10 +24,13 @@ namespace Blinker {

 /**

  * @brief constructor

  * @param[in] canvas owning canvas

+ * @param[in] name name of input

  * @param[in] dirBase base directory

  */

-Canvas::Input::Input(Canvas &canvas, const Directory &dirBase):

+Canvas::Input::Input(Canvas &canvas, const std::string &name,

+                     const Directory &dirBase):

   m_canvas(canvas),

+  m_name(name),

   m_fileInStream(dirBase.getFile("instream"), canvas.m_streamMgr),

   m_fileSrcPos(dirBase.getFile("srcpos")),

   m_fileSize(dirBase.getFile("size")),

@@ -30,9 +30,10 @@ public:

   /**

    * @brief constructor

    * @param[in] canvas owning canvas

+   * @param[in] name name of input

    * @param[in] dirBase base directory

    */

-  Input(Canvas &canvas, const Directory &dirBase);

+  Input(Canvas &canvas, const std::string &name, const Directory &dirBase);

   /// virtual destructor

   virtual ~Input();

@@ -73,6 +74,7 @@ protected:

 protected:

   Canvas       &m_canvas;      ///< owning canvas

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

   InStreamFile m_fileInStream; ///< input stream name file

   PositionFile m_fileSrcPos;   ///< source position file

   SizeFile     m_fileSize;     ///< size file