INTEGRATION: CWS presfixes01 (1.2.2); FILE MERGED

2005/01/30 15:51:03 dbo 1.2.2.1: #i39662# sound pausing
Issue number:
Submitted by:
Reviewed by:

1 files changed, 11 insertions, 5 deletions

diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index 28f5cb463c2e..63f522391444 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: animationaudionode.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2005-01-21 17:01:24 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 13:49:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,8 +94,10 @@ namespace presentation
 
             try
             {
-                mpPlayer.reset( new SoundPlayer( aSoundURL,
-                                                 getContext().mxComponentContext ) );
+                mpPlayer = SoundPlayer::create(
+                    getContext().mrEventMultiplexer,
+                    aSoundURL,
+                    getContext().mxComponentContext );
             }
             catch( lang::NoSupportException& )
             {
@@ -108,7 +110,11 @@ namespace presentation
 
         void AnimationAudioNode::dispose()
         {
-            mpPlayer.reset();
+            if (mpPlayer.get() != 0) {
+                mpPlayer->stopPlayback();
+                mpPlayer->dispose();
+                mpPlayer.reset();
+            }
 
             mxAudioNode.clear();