include/sal/log-areas.dox | 1 +
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 4 ++--
sd/source/ui/remotecontrol/Receiver.cxx | 7 ++++---
sd/source/ui/remotecontrol/Server.cxx | 7 +++----
4 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 1cfa65ccaf73993caa2b6fbae1501232f1d96ae8
Author: Siqi LIU <m...@siqi.fr>
Date: Thu Aug 1 16:25:33 2013 +0200
enable WiFi support for sdremote
Change-Id: I753b94413262cea6dd094b16a7ae03e8952f2522
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 9266ed3..0c9c51f 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -79,7 +79,7 @@ void RemoteServer::execute()
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
if (!xContext.is()/* ||
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)*/)
{
- SAL_INFO("sdremote", "not in experimental mode, disabling TCP server");
+ // SAL_INFO("sdremote", "not in experimental mode, disabling TCP
server");
spServer = NULL;
return;
}
@@ -311,10 +311,9 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient,
OUString aPin )
void SdDLL::RegisterRemotes()
{
- // Disable unless in experimental mode for now
SAL_INFO( "sdremote", "SdDLL::RegisterRemotes called" );
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
- if ( xContext.is() /* &&
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) */)
+ if ( xContext.is() &&
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) )
return;
sd::RemoteServer::setup();
commit e32798d63bdf0c9fbcc13df06c4afdfc5b0f4dd5
Author: Siqi LIU <m...@siqi.fr>
Date: Thu Aug 1 15:23:19 2013 +0200
add new debug area and use SAL_INFO instead for debug info
Change-Id: If719f3340ac585d162e1bb40847ce17e67415869
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 2041e7e..0699da6 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -103,6 +103,7 @@ certain functionality.
@li @c sd.slideshow
@li @c sdremote
@li @c sdremote.bluetooth
+@li @c sdremote.wifi
@section editeng
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 2f44cb1..6835433 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -41,7 +41,7 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
switch (state) {
case AVAHI_ENTRY_GROUP_ESTABLISHED :
/* The entry group has been established successfully */
- std::cerr << "Service " << avahiService->getName().c_str() << "
successfully established.\n";
+ SAL_INFO( "sdremote.wifi", "Service " <<
avahiService->getName().c_str() << " successfully established." );
break;
case AVAHI_ENTRY_GROUP_COLLISION : {
@@ -52,7 +52,7 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
n =
avahi_alternative_service_name(avahiService->getName().c_str());
avahiService->setName(n);
- std::cerr << "Service name collision, renaming service to " <<
avahiService->getName() << std::endl;
+ SAL_INFO( "sdremote.wifi", "Service name collision, renaming
service to " << avahiService->getName() );
/* And recreate the services */
create_services(avahi_entry_group_get_client(g));
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index 40fc734..f5a7617 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -122,18 +122,19 @@ void Receiver::executeCommand( const std::vector<OString>
&aCommand )
else if (aCommand[0].equals( "pointer_started" ))
{
// xSlideShowController->setPointerMode(true);
- std::cerr << "Pointer started, we display the pointer on screen"<<
std::endl;
+ SAL_INFO( "sdremote", "Pointer started, we display the pointer on
screen" );
}
else if (aCommand[0].equals( "pointer_dismissed" ))
{
// xSlideShowController->setPointerMode(false);
- std::cerr << "Pointer dismissed, we hide the pointer on screen"<<
std::endl;
+ SAL_INFO( "sdremote", "Pointer dismissed, we hide the pointer on
screen" );
}
else if (aCommand[0].equals( "pointer_coordination" ))
{
float x = aCommand[1].toFloat();
float y = aCommand[2].toFloat();
- std::cerr << "("<<x<<","<<y<<")"<< std::endl;
+
+ SAL_INFO( "sdremote", "Pointer at ("<<x<<","<<y<<")" );
const ::com::sun::star::geometry::RealPoint2D pos(x,y);
// Same problem here...
// xSlideShowController->setPointerPosition(pos);
commit b9d2671ae11d7b7225b3d5b01a5beb733296c085
Author: Siqi LIU <m...@siqi.fr>
Date: Thu Aug 1 15:22:47 2013 +0200
merge WiFi support into remote control feature toggle
Change-Id: I4b65021698d6cdd576cff3155f9122195f45cc6a
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 846ea9e..9266ed3 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -77,7 +77,7 @@ void RemoteServer::execute()
{
SAL_INFO( "sdremote", "RemoteServer::execute called" );
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
- if (!xContext.is() ||
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
+ if (!xContext.is()/* ||
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)*/)
{
SAL_INFO("sdremote", "not in experimental mode, disabling TCP server");
spServer = NULL;
@@ -314,7 +314,7 @@ void SdDLL::RegisterRemotes()
// Disable unless in experimental mode for now
SAL_INFO( "sdremote", "SdDLL::RegisterRemotes called" );
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
- if ( xContext.is() &&
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) )
+ if ( xContext.is() /* &&
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) */)
return;
sd::RemoteServer::setup();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
