Revert preparation event support

TeleMidia · Jan 6, 2023 · c8b991d · c8b991d
1 parent 23c213f
commit c8b991d
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 442 deletions.
diff --git a/lib/Event.cpp b/lib/Event.cpp
@@ -75,11 +75,6 @@ Event::getFullId ()
       return obj_id + "<" + _id + ">";
     case Event::LOOKAT:
       return obj_id + "<lookat>";
-    case Event::PREPARATION:
-      if (_id == "@lambda")
-        return obj_id + "$" + _id.substr (1, _id.length () - 1);
-      else
-        return obj_id + "$" + _id;
     default:
       g_assert_not_reached ();
     }
@@ -254,8 +249,6 @@ Event::getEventTypeAsString (Event::Type type)
       return "attribution";
     case Event::SELECTION:
       return "selection";
-    case Event::PREPARATION:
-      return "preparation";
     case Event::LOOKAT:
       return "lookAt";
     default:

diff --git a/lib/Event.h b/lib/Event.h
@@ -57,15 +57,8 @@ class Event
      * directed to the object.
      */
     SELECTION,
-
-    /**
-     * @brief Preparation event.
-     *
-     * Stands for the preparation of a specific time interval of the object.
-     */
-    PREPARATION,
-
-    /**
+
+     /**
      * @brief lookAt event.
      *
      * Stands for the user viewport is on the objet.

diff --git a/lib/Formatter.cpp b/lib/Formatter.cpp
@@ -375,7 +375,7 @@ Formatter::sendTick (uint64_t total, uint64_t diff, uint64_t frame)
   // Formatter::sendKeyEvent() applies here.  The difference is that ticks
   // should only be propagated to objects that are occurring.
   for (auto obj : *_doc->getObjects ())
-    if (obj->isOccurring () || obj->isPreparing ())
+    if (obj->isOccurring ())
       buf.push_back (obj);
   for (auto obj : buf)
     obj->sendTick (total, diff, frame);

diff --git a/lib/Media.cpp b/lib/Media.cpp
@@ -31,7 +31,6 @@ GINGA_NAMESPACE_BEGIN
 Media::Media (const string &id) : Object (id)
 {
   _player = nullptr;
-  _currentPreparationEvent = nullptr;
 }
 
 Media::~Media ()
@@ -142,20 +141,6 @@ Media::sendTick (Time total, Time diff, Time frame)
 {
   Time dur;
 
-  if (this->isPreparing ())
-    {
-      g_assert_nonnull (_player);
-
-      if (_player->getPrepared () )
-      {
-        TRACE ("_player->getPrepared true");
-        Event *currentPreparation = this->getCurrentPreparationEvent ();
-        g_assert_nonnull (currentPreparation);
-        _doc->evalAction (currentPreparation, Event::STOP);
-        return;
-      }
-    }
-
   // Update object time.
   Object::sendTick (total, diff, frame);
 
@@ -202,11 +187,19 @@ Media::beforeTransition (Event *evt, Event::Transition transition)
                   { // Lambda
                     Formatter *fmt;
 
-                    createPlayer ();
-
+                    g_assert (_doc->getData ("formatter", (void **) &fmt));
+                    g_assert_null (_player);
+                    _player = Player::createPlayer (
+                        fmt, this, _properties["uri"], _properties["type"]);
                     if (unlikely (_player == nullptr))
                       return false; // fail
 
+                    for (auto it : _properties)
+                      _player->setProperty (it.first, it.second);
+
+                    g_assert_nonnull (_player);
+                    // Start underlying player.
+                    // TODO: Check player failure.
                     _player->start (); // Just lambda events reaches this!
                   }
                 else
@@ -313,9 +306,6 @@ Media::beforeTransition (Event *evt, Event::Transition transition)
     case Event::SELECTION:
       break; // nothing to do
 
-    case Event::PREPARATION:
-      break; // nothing to do
-
     case Event::LOOKAT:
       break; // nothing to do
 
@@ -470,41 +460,6 @@ Media::afterTransition (Event *evt, Event::Transition transition)
           }
         break;
       }
-    case Event::PREPARATION:
-      {
-        switch (transition)
-          {
-          case Event::START:
-            TRACE ("start %s", evt->getFullId ().c_str ());
-
-            createPlayer ();
-
-            if(evt->getId() != "@lambda")
-              {
-                Time begin, end;
-                evt->getInterval(&begin, &end);
-
-                string offsetStart = xstrbuild ("%" G_GUINT64_FORMAT, begin / GINGA_SECOND);
-
-                string offsetEnd = xstrbuild ("%" G_GUINT64_FORMAT, end / GINGA_SECOND);
-
-                _player->setProperty("offsetBuffer", offsetStart);
-                _player->setProperty("offsetEndBuffer",offsetEnd);
-              }
-
-            _player->startPreparation();
-            _isPreparing = true;
-            _currentPreparationEvent = evt;
-            break;
-          case Event::STOP:
-            TRACE ("stop %s", evt->getFullId ().c_str ());
-            _isPreparing = false;
-            break;
-          default:
-            g_assert_not_reached ();
-          }
-        break;
-      }
     case Event::LOOKAT:
       switch (transition)
         {
@@ -525,27 +480,6 @@ Media::afterTransition (Event *evt, Event::Transition transition)
   return true;
 }
 
-Event *
-Media::getCurrentPreparationEvent ()
-{
-  return _currentPreparationEvent;
-}
-
-void
-Media::createPlayer ()
-{
-  if (_player)
-    return;
-  Formatter *fmt;
-  g_assert (_doc->getData ("formatter", (void **) &fmt));
-  g_assert_null (_player);
-  _player = Player::createPlayer (fmt, this, _properties["uri"],
-                                  _properties["type"]);
-  g_assert_nonnull (_player);
-  for (auto it : _properties)
-    _player->setProperty (it.first, it.second);
-}
-
 // Public.
 
 bool

diff --git a/lib/Media.h b/lib/Media.h
@@ -40,15 +40,12 @@ class Media : public Object
 
   // Media:
   virtual bool isFocused ();
-  virtual Event *getCurrentPreparationEvent ();
   virtual bool getZ (int *, int *);
   virtual void redraw (cairo_t *);
 
 protected:
   Player *_player; // underlying player
-  Event *_currentPreparationEvent;
 
-  void createPlayer ();
   void doStop () override;
 };
 

diff --git a/lib/Object.cpp b/lib/Object.cpp
@@ -35,7 +35,6 @@ Object::Object (const string &id) : _id (id)
   _doc = nullptr;
   _parent = nullptr;
   _time = GINGA_TIME_NONE;
-  _isPreparing = false;
 
   this->addPresentationEvent ("@lambda", 0, GINGA_TIME_NONE);
   _lambda = this->getPresentationEvent ("@lambda");
@@ -137,11 +136,6 @@ Object::toString ()
                        + Event::getEventStateAsString (evt->getState ())
                        + ')');
         break;
-      case Event::PREPARATION:
-        prep.push_back (evt->getId () + " ("
-                        + Event::getEventStateAsString (evt->getState ())
-                        + ')');
-        break;
       default:
         g_assert_not_reached ();
       }
@@ -288,36 +282,6 @@ Object::addSelectionEvent (const string &key)
   _events.insert (evt);
 }
 
-Event *
-Object::getPreparationEvent (const string &key)
-{
-  return this->getEvent (Event::PREPARATION, key);
-}
-
-void
-Object::addPreparationEvent (const string &id)
-{
-  Event *evt;
-  if (this->getPreparationEvent (id))
-    return;
-
-  evt = new Event (Event::PREPARATION, this, id);
-  _events.insert (evt);
-}
-
-void
-Object::addPreparationEvent (const string &id, Time begin, Time end)
-{
-  Event *evt;
-
-  if (this->getPreparationEvent (id))
-    return;
-
-  evt = new Event (Event::PREPARATION, this, id);
-  evt->setInterval (begin, end);
-  _events.insert (evt);
-}
-
 Event *
 Object::getLookAtEvent (const string &id)
 {
@@ -349,12 +313,6 @@ Object::isOccurring ()
   return _lambda->getState () == Event::OCCURRING;
 }
 
-bool
-Object::isPreparing ()
-{
-  return _isPreparing;
-}
-
 bool
 Object::isPaused ()
 {

diff --git a/lib/Object.h b/lib/Object.h
@@ -57,9 +57,6 @@ class Object
   void addPresentationEvent (const string &, const string &);
   Event *getSelectionEvent (const string &);
   void addSelectionEvent (const string &);
-  Event *getPreparationEvent (const string &);
-  void addPreparationEvent (const string &);
-  void addPreparationEvent (const string &, Time, Time);
   Event *getLookAtEvent (const string &);
   void addLookAtEvent (const string &);
 
@@ -110,10 +107,7 @@ class Object
    */
   virtual bool afterTransition (Event *, Event::Transition) = 0;
 
-  virtual bool isPreparing ();
-
 protected:
-  bool _isPreparing;
   string _id;                                  // id
   Document *_doc;                              // parent document
   Composition *_parent;                        // parent object

diff --git a/lib/Parser.cpp b/lib/Parser.cpp
@@ -894,22 +894,12 @@ static map<string, pair<Event::Type, Event::Transition> >
       { "onLookAway", { Event::LOOKAT, Event::STOP } },
       { "onBeginSelection", { Event::SELECTION, Event::START } },
       { "onEndSelection", { Event::SELECTION, Event::STOP } },
-      { "onBeginPreparation", { Event::PREPARATION, Event::START } },
-      { "onEndPreparation", { Event::PREPARATION, Event::STOP } },
-      { "onAbortPreparation", { Event::PREPARATION, Event::ABORT } },
-      { "onPausePreparation", { Event::PREPARATION, Event::PAUSE } },
-      { "onResumePreparation", { Event::PREPARATION, Event::RESUME } },
       { "start", { Event::PRESENTATION, Event::START } }, // actions
       { "stop", { Event::PRESENTATION, Event::STOP } },
       { "abort", { Event::PRESENTATION, Event::ABORT } },
       { "pause", { Event::PRESENTATION, Event::PAUSE } },
       { "resume", { Event::PRESENTATION, Event::RESUME } },
       { "set", { Event::ATTRIBUTION, Event::START } },
-      { "startPreparation", { Event::PREPARATION, Event::START } },
-      { "stopPreparation", { Event::PREPARATION, Event::STOP } },
-      { "abortPreparation", { Event::PREPARATION, Event::ABORT } },
-      { "pausePreparation", { Event::PREPARATION, Event::PAUSE } },
-      { "resumePreparation", { Event::PREPARATION, Event::RESUME } },
     };
 
 /// Index reserved role table.
@@ -933,7 +923,6 @@ static map<string, Event::Type> parser_syntax_event_type_table = {
   { "attribution", Event::ATTRIBUTION },
   { "selection", Event::SELECTION },
   { "lookat", Event::LOOKAT },
-  { "preparation", Event::PREPARATION },
 };
 
 /// Known transitions.
@@ -2776,19 +2765,6 @@ borderColor='%s'}",
                     act.event->setParameter ("key", act.value);
                     break;
                   }
-                case Event::PREPARATION:
-                  {
-                    string eventId = evt->getId ();
-
-                    if (eventId == "@lambda")
-                      {
-                        obj->addPreparationEvent (eventId);
-                      }
-
-                    act.event = obj->getPreparationEvent (eventId);
-                    g_assert_nonnull (act.event);
-                    break;
-                  }
                 case Event::LOOKAT:
                   {
                     string eventId = evt->getId ();
@@ -4097,7 +4073,6 @@ ParserState::pushArea (ParserState *st, ParserElt *elt)
         }
 
       media->addPresentationEvent (id, begin, end);
-      media->addPreparationEvent (id, begin, end);
     }
 
   return true;