diff options
author | Matthias Huetsch [mhu] <matthias.huetsch@sun.com> | 2010-01-11 14:29:32 +0100 |
---|---|---|
committer | Matthias Huetsch [mhu] <matthias.huetsch@sun.com> | 2010-01-11 14:29:32 +0100 |
commit | 387a1260f55ad1428a23ba01355c3ebec1001b15 (patch) | |
tree | 3330b67c7840ead629d6de06887bdaf9dd979b90 /slideshow/source/engine/animationnodes/animationaudionode.cxx | |
parent | 23134ce87ab5f2a9a763b156cb9fcf28271209d5 (diff) | |
parent | 63c6c5d78c2712b824c9194269d13422d4835487 (diff) |
Update from master repository (to m69).
Diffstat (limited to 'slideshow/source/engine/animationnodes/animationaudionode.cxx')
-rw-r--r-- | slideshow/source/engine/animationnodes/animationaudionode.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index 634dc0342515..24c3a95382bf 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -94,14 +94,16 @@ void AnimationAudioNode::activate_st() // no node duration. Take inherent media time, then scheduleDeactivationEvent( makeDelay( boost::bind( &AnimationNode::deactivate, getSelf() ), - mpPlayer->getDuration() ) ); + mpPlayer->getDuration(), + "AnimationAudioNode::deactivate with delay") ); } } else { // deactivate ASAP: scheduleDeactivationEvent( - makeEvent( boost::bind( &AnimationNode::deactivate, getSelf() ) ) ); + makeEvent( boost::bind( &AnimationNode::deactivate, getSelf() ), + "AnimationAudioNode::deactivate without delay") ); } } @@ -127,7 +129,8 @@ void AnimationAudioNode::deactivate_st( NodeState /*eDestState*/ ) getContext().mrEventQueue.addEvent( makeEvent( boost::bind( &EventMultiplexer::notifyAudioStopped, boost::ref(getContext().mrEventMultiplexer), - getSelf() ) ) ); + getSelf() ), + "AnimationAudioNode::notifyAudioStopped") ); } bool AnimationAudioNode::hasPendingAnimation() const |