diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-07-08 09:47:40 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-26 10:50:21 +0100 |
| commit | e2376b3db0050cb3a9f902aeaa9616d00945011e (patch) | |
| tree | ccaef3be9d803c5eaa33ead73e5fe09736f0d8be /avmedia | |
| parent | 8c6b8a7ca42d8c103a0439d1d15eb6c68ebc5e43 (diff) | |
Insert vlc at the top of the service list to try for media.
Change-Id: I2abde3c4431e104f30c22a3066bb6fb243151e2d
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/inc/mediamisc.hxx | 9 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 1 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcuno.cxx | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 1e4393404f8e..b87fe432df3e 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -21,14 +21,15 @@ class ResMgr; #define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() ) +#define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC" #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 MACOSX -#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_OLD "com.sun.star.comp.avmedia.Manager_GStreamer_0_10" -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" +#define AVMEDIA_MANAGER_SERVICE_NAME_OLD "com.sun.star.comp.avmedia.Manager_GStreamer_0_10" +#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 71e57792c64f..e8b4e896753e 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -56,6 +56,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const OUStri uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); static const char * aServiceManagers[] = { + AVMEDIA_MANAGER_SERVICE_PREFERRED, AVMEDIA_MANAGER_SERVICE_NAME, // a fallback path just for gstreamer which has // two significant versions deployed at once ... diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx index 0c9690e81334..5421f62b3cdc 100644 --- a/avmedia/source/vlc/vlcuno.cxx +++ b/avmedia/source/vlc/vlcuno.cxx @@ -37,6 +37,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory( uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; + fprintf (stderr, "Create VLC Media component: '%s'\n", pImplName); if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 ) { const OUString aServiceName( SERVICE_NAME ); |