diff options
author | Manuel Schneider | 2014-07-22 15:08:15 +0200 |
---|---|---|
committer | Manuel Schneider | 2014-07-22 15:08:15 +0200 |
commit | 93b74ed3d0a56374d2976f9c08785faace6bcd15 (patch) | |
tree | 7eed726163a39b85a40a8b707a761abcd36bbe81 /src/server/net/client.h | |
parent | Bugfix: One click source change now fully supported (diff) | |
download | pvs2-93b74ed3d0a56374d2976f9c08785faace6bcd15.tar.gz pvs2-93b74ed3d0a56374d2976f9c08785faace6bcd15.tar.xz pvs2-93b74ed3d0a56374d2976f9c08785faace6bcd15.zip |
Drop the watchers concept, since the desiredProjectionSource essentially implies it
Diffstat (limited to 'src/server/net/client.h')
-rw-r--r-- | src/server/net/client.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/server/net/client.h b/src/server/net/client.h index 6dbb5bd..5e1b8b4 100644 --- a/src/server/net/client.h +++ b/src/server/net/client.h @@ -35,22 +35,15 @@ public: inline const QString& host() const { return _host; } inline const QString ip() const { return _socket->peerAddress().toString(); } inline const int id() const { return _id; } - inline const int desiredProjectionSource(){ return _desiredSource; } - inline const int projectionSource() const { return _projectionSource; } inline const bool isActiveVncClient() const { return _isActiveVncClient; } inline const bool isActiveVncServer() const { return _vncPort > 0; } inline const bool isLocked() const { return _locked; } - inline const bool isWatcher() const { return _desiredSource != 0; } - - + inline const int desiredProjectionSource(){ return _desiredSource; } + inline const int projectionSource() const { return _projectionSource; } // Setters inline void setTutor(bool enable){ _isTutor = enable; } - inline void setWatcher(bool enable){ _isWatcher = enable; } - inline void setDesiredProjectionSource(int id){ - qDebug() << "ID" <<_id << " new source " << _desiredSource; - _desiredSource = id; - } + inline void setDesiredProjectionSource(int id){_desiredSource = id;} //Send message stuff void startVncServer(); @@ -78,7 +71,6 @@ private: int _projectionSource; // The source the client was or is connected to (depends on _isActiveVncClient) bool _isActiveVncClient; // VNCclient state. indicating that the client is displaying a remote screen via VNC bool _isTutor; // Flag indicating that the client has been set as a tutor - bool _isWatcher; // Flag indicates that the client should watch to VNC Server. static int _clientIdCounter; |