mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avmedia: vlc - cleanup debug churn.

Browse Source 
Change-Id: Id0a3e0ecb49b11e119188b6ccce04269917442b8
This commit is contained in:
Michael Meeks
2013-09-10 10:57:49 +01:00
parent d8655d0358
commit a3b56a9b96
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
avmedia/source/vlc/vlcmanager.cxx
View File

@@ -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/algorithm/string.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include "vlcmanager.hxx" #include "vlcmanager.hxx"
@@ -43,7 +52,6 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
std::vector<std::string> verComponents; std::vector<std::string> verComponents;
const std::string str(Common::Version()); const std::string str(Common::Version());
std::cout << str << std::endl;
boost::split(verComponents, boost::split(verComponents,
str, str,
boost::is_any_of(". ")); 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[1]) == 0
&& boost::lexical_cast<int>(verComponents[2]) < 8)) && boost::lexical_cast<int>(verComponents[2]) < 8))
{ {
SAL_WARN("avmedia", "VLC version '" << str << "' is too old");
m_is_vlc_found = false; m_is_vlc_found = false;
} }
else
SAL_INFO("avmedia", "VLC version '" << str << "' is acceptable");
} }
if (m_is_vlc_found) if (m_is_vlc_found)

4
avmedia/source/vlc/vlcuno.cxx
View File

@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) 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 ) ); static uno::Reference< uno::XInterface > manager( *new ::avmedia::vlc::Manager( rxFact ) );
return manager; return manager;
} }
@@ -37,7 +37,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory(
uno::Reference< lang::XSingleServiceFactory > xFactory; uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0; 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 ) if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
{ {
const OUString aServiceName( SERVICE_NAME ); const OUString aServiceName( SERVICE_NAME );