INTEGRATION: CWS presfixes01 (1.2.2); FILE MERGED

2005/02/17 23:56:51 thb 1.2.2.3: #i42499# Made de-spriting of shape effects happen in new Activity::dequeued() method; removed Activity::end() method; fixed calculation of XSlideShow::update() wait interval; slightly modified pres time handling, pres time is now held during _all_ queue processing, including EventQueue (generated funny bounce and break effects, because delayed activities got out of sync); clarified documentation
2005/01/30 16:00:57 dbo 1.2.2.2: #i37777#
- using single presentation time base
- activities queue detects and sets timing lag (calcTimeLag())
Issue number:
Submitted by:
Reviewed by:
2005/01/26 11:28:54 dbo 1.2.2.1: #i39787# cleanup, minor changes
Issue number:
Submitted by:
Reviewed by:

1 files changed, 4 insertions, 8 deletions

diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index ac72d4623c51..ff50a99dbb3d 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rehearsetimingsactivity.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2005-02-16 15:34:58 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 13:43:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,10 +116,11 @@ public:
     // Disposable:
     virtual void dispose();
     // Activity:
+    virtual double calcTimeLag() const;
     virtual bool perform();
     virtual bool isActive() const;
     virtual bool needsScreenUpdate() const;
-    virtual void end();
+    virtual void dequeued();
 
 private:
     RehearseTimingsActivity(
@@ -174,11 +175,6 @@ private:
                   cppcanvas::CustomSpriteSharedPtr> > ViewsVecT;
     ViewsVecT m_views;
 
-    // interims solution only:
-    template <typename PairT>
-    static typename PairT::second_type const & mySelect2nd( PairT const & p ) {
-        return p.second;
-    }
     template <typename FuncT>
     FuncT for_each_sprite( FuncT func ) const {
         ViewsVecT::const_iterator iPos( m_views.begin() );