diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-26 17:41:22 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-26 17:41:56 +0100 |
| commit | 9b4d493fb468b5a8b067f106b73f7378b8802df4 (patch) | |
| tree | 9ccf6c50ed87e8e90994af4a8f061f4b62a22042 /avmedia | |
| parent | 87597b5d3d021be52f80639ef0487cf35a91ba85 (diff) | |
fix mangled gstreamer service name, fixing embedded video
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/avmediagstreamer.component | 2 | ||||
| -rw-r--r-- | avmedia/source/inc/mediamisc.hxx | 8 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component index cd25a6b0cc26..efcb94d74bed 100644 --- a/avmedia/source/gstreamer/avmediagstreamer.component +++ b/avmedia/source/gstreamer/avmediagstreamer.component @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <component loader="com.sun.star.loader.SharedLibrary" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.media.Manager_GStreamer"> - <service name="com.sun.star.media.Manager_GStreamer"/> + <service name="com.sun.star.comp.avmedia.Manager_GStreamer"/> </implementation> </component> diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index f7bf8de83df1..8f129bb89122 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -31,20 +31,20 @@ class ResMgr; #define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() ) #ifdef GSTREAMER -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer" +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" #else #ifdef WNT -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" #else #ifdef QUARTZ -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime" +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime" #else -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" #endif #endif diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index 6c2db96b16a3..77ec02b5846c 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -80,9 +80,15 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: xPlayer = uno::Reference< ::com::sun::star::media::XPlayer >( xManager->createPlayer( rURL ), uno::UNO_QUERY ); } + else + OSL_FAIL( "failed to create media player service " AVMEDIA_MANAGER_SERVICE_NAME ); } - catch( ... ) + catch( const uno::Exception &e ) { + (void)e; + OSL_FAIL( OSL_FORMAT( "couldn't create media player '%s', exception '%s'", + AVMEDIA_MANAGER_SERVICE_NAME, + rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ) ); } } |