Kaydet (Commit) 9b4d493f authored tarafından Michael Meeks's avatar Michael Meeks

fix mangled gstreamer service name, fixing embedded video

üst 87597b5d
<?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>
......@@ -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
......
......@@ -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() ) );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment