[Libreoffice-commits] core.git: sd/source

[Michael Meeks]

 sd/source/ui/remotecontrol/Communicator.cxx  |    4 ++++
 sd/source/ui/remotecontrol/ImagePreparer.cxx |    6 ++++--
 sd/source/ui/remotecontrol/Listener.cxx      |    1 +
 sd/source/ui/remotecontrol/Receiver.cxx      |    1 -
 sd/source/ui/remotecontrol/Server.cxx        |    1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 43dbc8088ba6f4f51ca455b1af41251d69befe86
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Aug 2 00:34:31 2013 +0200

    android: improve remote control debugging.

diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index 1d90fea..775d721 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -106,6 +106,9 @@ void Communicator::execute()
             aCommand.clear();
         }
     }
+
+    SAL_INFO ("sdremote", "Exiting transmission loop\n");
+
     disposeListener();
 
     pTransmitter->notifyFinished();
@@ -114,6 +117,7 @@ void Communicator::execute()
 
     delete mpSocket;
 
+
     RemoteServer::removeCommunicator( this );
 }
 
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 14d62d7..a87cccd 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -51,6 +51,7 @@ ImagePreparer::ImagePreparer(
  :  xController( rxController ),
     pTransmitter( aTransmitter )
 {
+    SAL_INFO( "sdremote", "ImagePreparer - start" );
     SetTimeout( 50 );
     mnSendingSlide = 0;
     Start();
@@ -58,14 +59,15 @@ ImagePreparer::ImagePreparer(
 
 ImagePreparer::~ImagePreparer()
 {
+    SAL_INFO( "sdremote", "ImagePreparer - stop" );
     Stop();
 }
 
 void ImagePreparer::Timeout()
 {
     sal_uInt32 aSlides = xController->getSlideCount();
-//    fprintf( stderr, "ImagePreparer: %d %d %d\n", xController->isRunning(),
-//             (int)mnSendingSlide, (int)aSlides);
+    SAL_INFO( "sdremote", "ImagePreparer " << xController->isRunning() <<
+              " sending slide " << mnSendingSlide << " of " << aSlides );
     if ( xController->isRunning() && // not stopped/disposed of.
          mnSendingSlide < aSlides )
     {
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index 41e1dd6..d28a526 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -59,6 +59,7 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon
     }
     else
     {
+        SAL_INFO( "sdremote", "Listener::init but no controller - so no preview push queued" );
     }
 }
 
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index f5a7617..5ea11e40 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -15,7 +15,6 @@
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 
-
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 0c9c51f..51796cc 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -171,6 +171,7 @@ void RemoteServer::execute()
             delete pSocket;
         }
     }
+    SAL_INFO( "sdremote", "shutting down RemoteServer" );
     spServer = NULL; // Object is destroyed when Thread::execute() ends.
 }