summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-11-03 14:55:34 +0000
committerRüdiger Timm <rt@openoffice.org>2004-11-03 14:55:34 +0000
commit54e6479b19917a2feaf14e4c133490a0933af4c9 (patch)
tree9064fdd8f9ad67e0e983cbe8ddfab6a24bd5d44c /avmedia
parent1a16e157857c5511c0485a52f82a825df5aef155 (diff)
INTEGRATION: CWS jmf3 (1.1.1.1.2); FILE MERGED
2004/10/01 12:43:26 ka 1.1.1.1.2.1: #i33252#: update frame after repositoning
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/win/player.cxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 08b35d88f25f..658207121bc2 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: player.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: ka $ $Date:
+ * last change: $Author: rt $ $Date:
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -155,7 +155,7 @@ bool Player::create( const ::rtl::OUString& rURL )
mpEV = NULL;
}
- if( SUCCEEDED( hR = mpGB->RenderFile( rURL, NULL ) ) &
+ if( SUCCEEDED( hR = mpGB->RenderFile( rURL, NULL ) ) &&
SUCCEEDED( hR = mpGB->QueryInterface( IID_IMediaControl, (void**) &mpMC ) ) &&
SUCCEEDED( hR = mpGB->QueryInterface( IID_IMediaEventEx, (void**) &mpME ) ) &&
SUCCEEDED( hR = mpGB->QueryInterface( IID_IMediaSeeking, (void**) &mpMS ) ) &&
@@ -283,7 +283,14 @@ void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
if( mpMP )
+ {
+ const bool bPlaying = isPlaying();
+
mpMP->put_CurrentPosition( fTime );
+
+ if( !bPlaying && mpMC )
+ mpMC->StopWhenReady();
+ }
}
// ------------------------------------------------------------------------------