diff options
| author | ka <kai.ahrens@sun.com> | 2010-06-10 22:37:56 +0200 |
|---|---|---|
| committer | ka <kai.ahrens@sun.com> | 2010-06-10 22:37:56 +0200 |
| commit | c3655b7b8bbfe2b677c1e783d30801b965376beb (patch) | |
| tree | 330230447b766e14cfb8409a7820aea8a691696d /avmedia | |
| parent | b1c60fae23e95b7ffd399a8df45e78ee19d60fa0 (diff) | |
avmedia101: code cleanup
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index a8ef536ac133..94a6c36ed064 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -82,27 +82,25 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: { static const ServiceManager aServiceManagers[] = { - { "AVMEDIA_MANAGER_SERVICE_NAME", AVMEDIA_MANAGER_SERVICE_IS_JAVABASED }, - { "AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1", AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 } + { AVMEDIA_MANAGER_SERVICE_NAME, AVMEDIA_MANAGER_SERVICE_IS_JAVABASED }, + { AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1, AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 } }; - uno::Reference< media::XManager > xManager; - - for( sal_uInt32 i = 0; ( i < ( sizeof( aServiceManagers ) / sizeof( ServiceManager ) ) ) && !xManager.is(); ++i ) + for( sal_uInt32 i = 0; !xPlayer.is() && ( i < ( sizeof( aServiceManagers ) / sizeof( ServiceManager ) ) ); ++i ) { const String aServiceName( aServiceManagers[ i ].pServiceName, RTL_TEXTENCODING_ASCII_US ); if( aServiceName.Len() ) { + OSL_TRACE( "Trying to create media manager service %s", aServiceManagers[ i ].pServiceName ); + try { - xManager = uno::Reference< media::XManager >( xFactory->createInstance( aServiceName ), - uno::UNO_QUERY ); + uno::Reference< media::XManager > xManager( xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); if( xManager.is() ) { - xPlayer = uno::Reference< media::XPlayer >( xManager->createPlayer( rURL ), - uno::UNO_QUERY ); + xPlayer = uno::Reference< media::XPlayer >( xManager->createPlayer( rURL ), uno::UNO_QUERY ); } } catch( ... ) @@ -110,11 +108,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: } } - if( !xPlayer.is() ) - { - xManager.clear(); - } - else + if( xPlayer.is() ) { rbJavaBased = aServiceManagers[ i ].bIsJavaBased; } @@ -124,7 +118,6 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: return xPlayer; } - // --------------------------------------------------------------------- void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL ) |