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

[Siqi LIU]

 sd/README_REMOTE                        |   17 ++++++++++++++++-
 sd/source/ui/remotecontrol/Receiver.cxx |    5 -----
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit c41920416c22bfccf7fdeeefcd69baf6eadedaa3
Author: Siqi LIU <me at siqi.fr>
Date:   Mon Sep 2 09:14:27 2013 +0200

    extend documentation with gsoc2013 updates

diff --git a/sd/README_REMOTE b/sd/README_REMOTE
index 56561c5..9e303e4 100644
--- a/sd/README_REMOTE
+++ b/sd/README_REMOTE
@@ -69,6 +69,17 @@ Any lines in [square brackets] are optional, and should be omitted if not needed
   [Colour String]           // Colour the screen will show (default: black). Not
                             // implemented, and format hasn't yet been defined.
 
+# As of gsoc2013, these commands are extended to the existing protocol, since server-end are tolerant with unknown commands, these extensions doesn't break backward compatibility
+* pointer_started           // create a red dot on screen at initial position (x,y)
+  initial_x                 // This should be called when user first touch the screen
+  initial_y                 // note that x, y are in percentage (from 0.0 to 1.0) with respect to the slideshow size
+* pointer_dismissed         // This dismiss the pointer red dot on screen, should be called when user stop touching screen
+* pointer_coordination      // This update pointer's position to current (x,y)
+  current_x                 // note that x, y are in percentage (from 0.0 to 1.0) with respect to the slideshow size
+  current_y                 // unless screenupdater's perfomance is significantly improved, we should consider limit the update frequency on the
+                            // remote-end
+
+
 
 Status/Data (Server to Client)
 ------------------------------
@@ -89,4 +100,8 @@ Status/Data (Server to Client)
 
 * slide_preview         // Supplies a preview image for a slide.
   slideNumber
-  image                 // A Base 64 Encoded png image.
\ No newline at end of file
+  image                 // A Base 64 Encoded png image.
+
+# As of gsoc2013, these commands are extended to the existing protocol, since remote-end also ignore all unknown commands (which is the case of gsoc2012 android implementation), backward compatibility is kept.
+* slideshow_info        // once paired, the server-end will send back the title of the current presentation
+  Title
\ No newline at end of file
commit b5e374622f1313629685b2b2a1d3ab859bb7ae61
Author: Siqi LIU <me at siqi.fr>
Date:   Mon Sep 2 09:14:05 2013 +0200

    remove unused comments

diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index 593ff99..a68501a 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -157,7 +157,6 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
 
         if (xSlideShow.is()) try
         {
-            // std::cerr << "pointer_started in the is" << std::endl;
             xSlideShow->setProperty(
                         beans::PropertyValue( "PointerVisible" ,
                             -1,
@@ -174,11 +173,9 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
     }
     else if (aCommand[0].equals( "pointer_dismissed" ))
     {
-        // std::cerr << "pointer_dismissed" << std::endl;
         SolarMutexGuard aSolarGuard;
         if (xSlideShow.is()) try
         {
-            // std::cerr << "pointer_dismissed in the is" << std::endl;
             xSlideShow->setProperty(
                         beans::PropertyValue( "PointerVisible" ,
                             -1,
@@ -200,12 +197,10 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
 
         SAL_INFO( "sdremote", "Pointer at ("<<x<<","<<y<<")" );
         const ::com::sun::star::geometry::RealPoint2D pos(x,y);
-        // std::cerr << "Pointer at ("<<pos.X<<","<<pos.Y<<")" << std::endl;
 
         SolarMutexGuard aSolarGuard;
         if (xSlideShow.is()) try
         {
-            // std::cerr << "pointer_coordination in the is" << std::endl;
             xSlideShow->setProperty(
                         beans::PropertyValue( "PointerPosition" ,
                             -1,