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
This commit is contained in:
Vladimir Glazounov 2005-03-23 11:31:02 +00:00
parent 8a02c06f0e
commit d9b9ca78f4

View file

@ -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;