diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 11:22:51 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 11:22:51 +0000 |
| commit | b82aed8e7f02baa2fd8e97ba4ec36833d0a035f9 (patch) | |
| tree | d1898c26c62c4825dd7bd09ee116a384bee73f4d /avmedia/source | |
| parent | c703f03e506d6fd8c0d8e8fde6608a8b4cbab021 (diff) | |
cleanup gstreamer component
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/gstreamer/avmediagstreamer.component | 6 | ||||
| -rwxr-xr-x | avmedia/source/gstreamer/gstuno.cxx | 35 | ||||
| -rwxr-xr-x | avmedia/source/gstreamer/makefile.mk | 12 |
3 files changed, 15 insertions, 38 deletions
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component new file mode 100644 index 000000000000..97a8c83709e1 --- /dev/null +++ b/avmedia/source/gstreamer/avmediagstreamer.component @@ -0,0 +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.avmedia.Manager_GStreamer"> + <service name="com.sun.star.media.Manager_GStreamer"/> + </implementation> +</component> diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index 36ac2182fa00..4695ba646a47 100755 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -39,46 +39,11 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) ); } -// ------------------------------------------ -// - component_getImplementationEnvironment - -// ------------------------------------------ - extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.media.Manager_GStreamer/UNO/SERVICES/com.sun.star.media.Manager_GStreamer" )) ) ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - -// ------------------------ -// - component_getFactory - -// ------------------------ - extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk index 2f52b9cc4732..2f3a7e9cb8a4 100755 --- a/avmedia/source/gstreamer/makefile.mk +++ b/avmedia/source/gstreamer/makefile.mk @@ -70,8 +70,14 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp -.ENDIF - -.ENDIF +.ENDIF # UNX / WNT .INCLUDE : target.mk + +ALLTAR : $(MISC)/avmediagstreamer.component +$(MISC)/avmediagstreamer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component + $(XSLTPROC) --nonet \ + --stringparam uri '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \ + -o $@ $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component + +.ENDIF # ENABLE_GSTREAMER |