avmedia/source/gstreamer/avmediagstreamer.component | 2 +- avmedia/source/inc/mediamisc.hxx | 8 ++++---- avmedia/source/viewer/mediawindowbase_impl.cxx | 8 +++++++- 3 files changed, 12 insertions(+), 6 deletions(-)
New commits: commit 9b4d493fb468b5a8b067f106b73f7378b8802df4 Author: Michael Meeks <michael.me...@suse.com> Date: Wed Oct 26 17:41:22 2011 +0100 fix mangled gstreamer service name, fixing embedded video diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component index cd25a6b..efcb94d 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 f7bf8de..8f129bb 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 6c2db96..77ec02b 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() ) ); } } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits