diff options
author | Siqi LIU <me@siqi.fr> | 2013-07-25 17:27:10 +0200 |
---|---|---|
committer | Siqi LIU <me@siqi.fr> | 2013-07-25 17:28:02 +0200 |
commit | 65134fb75c3e94b7869fb6d490f88bf4b252760e (patch) | |
tree | 1c5813e30c136e2a670c21c861fe23ef23141901 /sd/source/ui/remotecontrol | |
parent | 6100d94078d37cb1413a0e45460cee480ba3e211 (diff) |
minor updates for avahi/bonjour refacotration
Change-Id: I89e0115ddbea953de4ee0468c66e949070087a96
Diffstat (limited to 'sd/source/ui/remotecontrol')
-rw-r--r-- | sd/source/ui/remotecontrol/DiscoveryService.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/OSXNetworkService.h | 2 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/OSXNetworkService.hxx | 7 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/OSXNetworkService.mm | 2 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/Receiver.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/ZeroconfService.hxx | 5 |
6 files changed, 10 insertions, 13 deletions
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index eba3aa07605c..262c47abc0fb 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -13,7 +13,6 @@ #include <unistd.h> #include <algorithm> #include <vector> -#include <thread> #include <iostream> #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.h b/sd/source/ui/remotecontrol/OSXNetworkService.h index f0af0dac655b..f8f0e9c958b6 100644 --- a/sd/source/ui/remotecontrol/OSXNetworkService.h +++ b/sd/source/ui/remotecontrol/OSXNetworkService.h @@ -19,7 +19,7 @@ #import <Foundation/NSRunLoop.h> #include <postmac.h> -@interface OSXNetworkService : NSObject<NSNetServiceDelegate> +@interface OSXBonjourService : NSObject<NSNetServiceDelegate> { NSNetService *netService; } diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.hxx b/sd/source/ui/remotecontrol/OSXNetworkService.hxx index 6659d7530182..bbbc0cff03cd 100644 --- a/sd/source/ui/remotecontrol/OSXNetworkService.hxx +++ b/sd/source/ui/remotecontrol/OSXNetworkService.hxx @@ -7,7 +7,6 @@ #include <string.h> #include <algorithm> #include <vector> -#include <thread> #include <iostream> #include <osl/conditn.hxx> // Include this early to avoid error as check() gets defined by some SDK header to empty @@ -22,16 +21,16 @@ namespace sd { class OSXNetworkService : public ZeroconfService { private: - OSXNetworkService osxservice; + OSXBonjourService *osxservice; public: - OSXNetworkService(const string& aname = "", uint aport = 1599) + OSXNetworkService(const std::string& aname = "", unsigned int aport = 1599) : ZeroconfService(aname, aport){} void clear() { [osxservice dealloc]; } void setup() { - osxservice = [[OSXNetworkService alloc] init]; + osxservice = [[OSXBonjourService alloc] init]; [osxservice publishImpressRemoteServiceOnLocalNetworkWithName: @""]; }; }; diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.mm b/sd/source/ui/remotecontrol/OSXNetworkService.mm index 8e81def93ef4..d7f3ebc3ba0b 100644 --- a/sd/source/ui/remotecontrol/OSXNetworkService.mm +++ b/sd/source/ui/remotecontrol/OSXNetworkService.mm @@ -13,7 +13,7 @@ #import "OSXNetworkService.h" #include <postmac.h> -@implementation OSXNetworkService +@implementation OSXBonjourService - (void) publishImpressRemoteServiceOnLocalNetworkWithName:(NSString *)sName { diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 556926d23102..40fc7342a637 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -121,12 +121,12 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) } else if (aCommand[0].equals( "pointer_started" )) { - xSlideShowController->setPointerMode(true); + // xSlideShowController->setPointerMode(true); std::cerr << "Pointer started, we display the pointer on screen"<< std::endl; } else if (aCommand[0].equals( "pointer_dismissed" )) { - xSlideShowController->setPointerMode(false); + // xSlideShowController->setPointerMode(false); std::cerr << "Pointer dismissed, we hide the pointer on screen"<< std::endl; } else if (aCommand[0].equals( "pointer_coordination" )) @@ -136,7 +136,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) std::cerr << "("<<x<<","<<y<<")"<< std::endl; const ::com::sun::star::geometry::RealPoint2D pos(x,y); // Same problem here... - xSlideShowController->setPointerPosition(pos); + // xSlideShowController->setPointerPosition(pos); } else if ( aCommand[0].equals( "presentation_resume" ) ) { diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx index 2952fa4be4f6..a3e92fa279b8 100644 --- a/sd/source/ui/remotecontrol/ZeroconfService.hxx +++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx @@ -15,13 +15,12 @@ struct sockaddr_in; +typedef unsigned int uint; + namespace sd{ class ZeroconfService { - private: - int mSocket; - protected: std::string name; uint port; |