Kaydet (Commit) 791e2f66 authored tarafından Michael Meeks's avatar Michael Meeks

initial vlc component build / conditionals and hookup.

Change-Id: I12e4a368e18a58099160ee65eebe837744e11378
üst 4426b03a
......@@ -484,6 +484,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_VLC),avmediavlc) \
$(if $(ENABLE_GSTREAMER),avmediagst) \
$(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
$(if $(ENABLE_DIRECTX),avmediawin) \
......
# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Library_Library,avmediavlc))
$(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmediavlc))
$(eval $(call gb_Library_set_include,avmediavlc,\
$$(INCLUDE) \
-I$(SRCDIR)/avmedia/source/inc \
$(VLC_CFLAGS) \
))
$(eval $(call gb_Library_add_libs,avmediavlc,$(VLC_LIBS)))
$(eval $(call gb_Library_use_external,avmediavlc,boost_headers))
$(eval $(call gb_Library_use_sdk_api,avmediavlc))
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_defs,avmediavlc,\
-DWINNT
))
endif
$(eval $(call gb_Library_use_libraries,avmediavlc,\
comphelper \
cppu \
cppuhelper \
sal \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,avmediavlc,\
avmedia/source/vlc/vlcuno \
))
# vim: set noet sw=4 ts=4:
......@@ -26,6 +26,12 @@ $(eval $(call gb_Module_add_targets,avmedia,\
))
endif
ifeq ($(ENABLE_VLC),TRUE)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediavlc \
))
endif
ifeq ($(OS),MACOSX)
ifneq ($(CPUNAME),X86_64)
$(eval $(call gb_Module_add_targets,avmedia,\
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->
<component loader="com.sun.star.loader.SharedLibrary" prefix="avmediavlc" xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.media.Manager_VLC">
<service name="com.sun.star.comp.avmedia.Manager_VLC"/>
</implementation>
</component>
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _VLCCOMMON_HXX
#define _VLCCOMMON_HXX
#include <vlc/libvlc.h>
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/media/XManager.hpp>
#endif // _VLCCOMMOM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "vlccommon.hxx"
using namespace ::com::sun::star;
#define IMPL_NAME "com.sun.star.comp.media.Manager_VLC"
#define SERVICE_NAME "com.sun.star.comp.avmedia.Manager_VLC"
static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
{
fprintf (stderr, "create VLC Media player !\n");
(void) rxFact;
return uno::Reference< uno::XInterface >(); // *new ::avmedia::vlc::Manager( rxFact ) );
}
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
{
const OUString aServiceName( SERVICE_NAME );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
IMPL_NAME, create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) );
}
if( xFactory.is() )
{
xFactory->acquire();
pRet = xFactory.get();
}
return pRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -204,6 +204,9 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_GSTREAMER_0_10), \
avmedia/source/gstreamer/avmediagstreamer_0_10 \
) \
$(if $(ENABLE_VLC), \
avmedia/source/gstreamer/avmediavlc \
) \
$(if $(ENABLE_KAB), \
connectivity/source/drivers/kab/kab1 \
) \
......
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