diff options
| author | Manuel Schneider | 2014-05-27 01:32:01 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-05-27 01:32:01 +0200 |
| commit | 5c8d314be18e2ab80c3a72e3bce4a1acdb2c3fb1 (patch) | |
| tree | 2834f960f7c11bbd5ebce08b60af3fcb888f94ca | |
| parent | Change _currentProjectionSource before emit. Fixes Appearance bug. (diff) | |
| download | pvs2-5c8d314be18e2ab80c3a72e3bce4a1acdb2c3fb1.tar.gz pvs2-5c8d314be18e2ab80c3a72e3bce4a1acdb2c3fb1.tar.xz pvs2-5c8d314be18e2ab80c3a72e3bce4a1acdb2c3fb1.zip | |
Drop _isBroadcastSource. The client must not know anything about the management.
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/server/net/client.cpp | 1 | ||||
| -rw-r--r-- | src/server/net/client.h | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index c1fc2a5..7f0586f 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -494,7 +494,6 @@ void MainWindow::multicast(Client *from, Client *to, bool blockOthers) to->stopVncServer(); from->stopVncClient(); - to->setBroadcastSource(false); _watchers.insert(to->id(), to); if (blockOthers) { @@ -627,7 +626,6 @@ void MainWindow::onButtonStopProjection() if (c == NULL) continue; c->stopVncClient(); - c->setBroadcastSource(false); } for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index cecd669..97d3ed3 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -20,7 +20,6 @@ Client::Client(QSslSocket* socket) : _socket(socket) { assert(socket != NULL); _authed = 0; - _isBroadcastSource = false; _currentProjectionSource = 0; _vncPort = 0; _isTutor = false; diff --git a/src/server/net/client.h b/src/server/net/client.h index 8d71da7..61d1740 100644 --- a/src/server/net/client.h +++ b/src/server/net/client.h @@ -36,10 +36,8 @@ public: inline const int currentProjectionSource() const { return _currentProjectionSource; } inline const bool isActiveVncClient() const { return _currentProjectionSource > 0; } inline const bool isActiveVncServer() const { return _vncPort > 0; } - inline const bool isBroadcastSource() const { return _isBroadcastSource; } // Setters - inline void setBroadcastSource(bool enable) { _isBroadcastSource = enable; } inline void setTutor(bool enable){ _isTutor = enable; } //Send message stuff @@ -62,7 +60,6 @@ private: NetworkMessage _fromClient; int _timerIdAuthTimeout, _timerPingTimeout; int _id; // this client's unique id - bool _isBroadcastSource; // Tells whether this client is currently the VNC broadcast source. QString _vncRwPass, _vncRoPass; int _vncPort; // VNCserver state. Greater 0 -> active on this port. Equals 0 -> no server. int _currentProjectionSource; // VNCclient state. indicating that the client is displaying a remote screen via VNC |