tplay: graph manager now has a "do_end_of_play" command that has the …

…effect of stopping the application due to playlist exhaustion (closes #47).
tizonia · Apr 17, 2014 · 6dc26d8 · 6dc26d8
1 parent 8500400
commit 6dc26d8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/tplay/src/tizgraphmgrfsm.hpp b/tplay/src/tizgraphmgrfsm.hpp
@@ -501,6 +501,19 @@ namespace tiz
         }
       };
 
+      struct do_end_of_play
+      {
+        template <class FSM,class EVT,class SourceState,class TargetState>
+        void operator()(EVT const& evt, FSM& fsm, SourceState& , TargetState& )
+        {
+          GMGR_FSM_LOG ();
+          if (fsm.pp_ops_ && *(fsm.pp_ops_))
+            {
+              (*(fsm.pp_ops_))->do_end_of_play ();
+            }
+        }
+      };
+
       // guard conditions
       struct is_fatal_error
       {
@@ -540,6 +553,7 @@ namespace tiz
         boost::msm::front::Row < starting                , err_evt                 , restarting              , boost::msm::front::none, boost::msm::front::euml::Not_<
                                                                                                                                           is_fatal_error>  >,
         boost::msm::front::Row < starting                , err_evt                 , stopped                 , do_report_fatal_error  , is_fatal_error     >,
+        boost::msm::front::Row < starting                , graph_unlded_evt        , stopped                 , do_end_of_play                              >,
         //    +------------------------------------------+-------------------------+-------------------------+------------------------+--------------------+
         boost::msm::front::Row < running                 , next_evt                , boost::msm::front::none , do_next                                     >,
         boost::msm::front::Row < running                 , prev_evt                , boost::msm::front::none , do_prev                                     >,

diff --git a/tplay/src/tizgraphmgrops.cpp b/tplay/src/tizgraphmgrops.cpp
@@ -237,6 +237,11 @@ void graphmgr::ops::do_report_fatal_error (const OMX_ERRORTYPE error,
   error_cback_ (error, msg);
 }
 
+void graphmgr::ops::do_end_of_play ()
+{
+  error_cback_ (OMX_ErrorNoMore, "Playlist exhausted.");
+}
+
 bool graphmgr::ops::is_fatal_error (const OMX_ERRORTYPE error,
                                     const std::string &msg) const
 {

diff --git a/tplay/src/tizgraphmgrops.hpp b/tplay/src/tizgraphmgrops.hpp
@@ -100,6 +100,7 @@ namespace tiz
       virtual void do_pause ();
       virtual void do_report_fatal_error (const OMX_ERRORTYPE error,
                                           const std::string &msg);
+      virtual void do_end_of_play ();
       virtual bool is_fatal_error (const OMX_ERRORTYPE error,
                                    const std::string &msg) const;
 

diff --git a/tplay/src/tizgraphops.cpp b/tplay/src/tizgraphops.cpp
@@ -454,11 +454,14 @@ bool graph::ops::is_end_of_play () const
 
   assert (playlist_);
 
-  if (playlist_->loop_playback ()
-      || !(playlist_->before_begin () || playlist_->past_end ()))
-  {
-    rc = false;
-  }
+  if (!playlist_->empty ())
+    {
+      if (playlist_->loop_playback ()
+          || !(playlist_->before_begin () || playlist_->past_end ()))
+        {
+          rc = false;
+        }
+    }
 
   TIZ_LOG (TIZ_PRIORITY_TRACE, "is_end_of_play [%s]...", rc ? "YES" : "NO");
   return rc;

diff --git a/tplay/src/tizplaylist.cpp b/tplay/src/tizplaylist.cpp
@@ -348,6 +348,11 @@ int tiz::playlist::size () const
   return uri_list_.size ();
 }
 
+bool tiz::playlist::empty () const
+{
+  return uri_list_.empty ();
+}
+
 bool tiz::playlist::single_format () const
 {
   if (!uri_list_.empty ())

diff --git a/tplay/src/tizplaylist.hpp b/tplay/src/tizplaylist.hpp
@@ -62,6 +62,7 @@ namespace tiz
     const uri_lst_t &get_uri_list () const;
     int current_index () const;
     int size () const;
+    bool empty () const;
     bool single_format () const;
     bool before_begin () const;
     bool past_end () const;