diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:31:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:31:02 +0000 |
| commit | d9b9ca78f402ae1ce4ffbb1a64f0b27f9c22df47 (patch) | |
| tree | ce736b6af1611b66b498ce38de84c6e14826647d /avmedia | |
| parent | 8a02c06f0e933ed5cbf520ceb9e5b7420abb8d07 (diff) | |
INTEGRATION: CWS jmf5 (1.1.1.1.20); FILE MERGED
2005/02/16 13:40:15 ka 1.1.1.1.20.3: #i41813#: use correct decoding for URLs
2005/01/20 15:20:06 ka 1.1.1.1.20.2: #i37255#: added FrameGrabber implementation
2005/01/19 14:36:15 ka 1.1.1.1.20.1: #i37255#: added FrameGrabber
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/win/manager.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx index 970b0b415540..cdaff95b42df 100644 --- a/avmedia/source/win/manager.cxx +++ b/avmedia/source/win/manager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: manager.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: ka $ $Date: 2004-08-23 09:04:41 $ + * last change: $Author: vg $ $Date: 2005-03-23 12:31:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,8 @@ #include "manager.hxx" #include "player.hxx" +#include <tools/urlobj.hxx> + #define AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_DirectX" #define AVMEDIA_WIN_MANAGER_SERVICENAME "com.sun.star.media.Manager" @@ -85,13 +87,14 @@ Manager::~Manager() // ------------------------------------------------------------------------------ -uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& aURL ) +uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL ) throw (uno::RuntimeException) { - Player* pPlayer( new Player ); + Player* pPlayer( new Player( mxMgr ) ); uno::Reference< media::XPlayer > xRet( pPlayer ); + const INetURLObject aURL( rURL ); - if( !pPlayer->create( aURL ) ) + if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) xRet = uno::Reference< media::XPlayer >(); return xRet; |