Repository.mk | 2 +- avmedia/source/vlc/vlcmanager.cxx | 13 ++++++++++++- avmedia/source/vlc/vlcuno.cxx | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-)
New commits: commit a3b56a9b963189cb22e7d34e87f860412ed3332f Author: Michael Meeks <michael.me...@collabora.com> Date: Tue Sep 10 10:57:49 2013 +0100 avmedia: vlc - cleanup debug churn. Change-Id: Id0a3e0ecb49b11e119188b6ccce04269917442b8 diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 4179ce2..1c7c645 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -1,3 +1,12 @@ +/* -*- 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/. + */ + #include <boost/algorithm/string.hpp> #include <boost/lexical_cast.hpp> #include "vlcmanager.hxx" @@ -43,7 +52,6 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) std::vector<std::string> verComponents; const std::string str(Common::Version()); - std::cout << str << std::endl; boost::split(verComponents, str, boost::is_any_of(". ")); @@ -52,8 +60,11 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) || (boost::lexical_cast<int>(verComponents[1]) == 0 && boost::lexical_cast<int>(verComponents[2]) < 8)) { + SAL_WARN("avmedia", "VLC version '" << str << "' is too old"); m_is_vlc_found = false; } + else + SAL_INFO("avmedia", "VLC version '" << str << "' is acceptable"); } if (m_is_vlc_found) diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx index d41b2df..312b85a 100644 --- a/avmedia/source/vlc/vlcuno.cxx +++ b/avmedia/source/vlc/vlcuno.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) { - fprintf (stderr, "create VLC Media player !\n"); + SAL_INFO("avmedia", "create VLC Media player !\n"); static uno::Reference< uno::XInterface > manager( *new ::avmedia::vlc::Manager( rxFact ) ); return manager; } @@ -37,7 +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); + SAL_INFO("avmedia", "Create VLC Media component: '" << pImplName << "'\n"); if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 ) { const OUString aServiceName( SERVICE_NAME ); commit d8655d03583a775f9cf986e053b67032b6d433e0 Author: Michael Meeks <michael.me...@collabora.com> Date: Tue Sep 10 10:57:25 2013 +0100 tubes: auto-package DSO as part of calc. Change-Id: Iee3005e9a7bc97d491012eb0c81c9f8e49d423c7 diff --git a/Repository.mk b/Repository.mk index df62e78..cff654b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -156,6 +156,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ scui \ solver \ $(if $(DISABLE_SCRIPTING),,vbaobj) \ + $(if $(ENABLE_TELEPATHY),tubes) \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ @@ -332,7 +333,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ textfd \ tk \ tl \ - $(if $(ENABLE_TELEPATHY),tubes) \ ucpexpand1 \ ucpext \ ucpcmis1 \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits