diff options
| author | Manuel Schneider | 2014-07-21 21:19:22 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-07-21 22:41:56 +0200 |
| commit | 5f310d3e0147532d734135771bafcb51a2f501ad (patch) | |
| tree | 1c385a581c220316d1d33b2fcd4f731574edf40c /src/server/mainwindow/mainwindow.h | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-5f310d3e0147532d734135771bafcb51a2f501ad.tar.gz pvs2-5f310d3e0147532d734135771bafcb51a2f501ad.tar.xz pvs2-5f310d3e0147532d734135771bafcb51a2f501ad.zip | |
Rename modes. Move code in slots to avoid unnecessary branching. Give the client more information about past progjectionSource
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 524a0b1..009e9d8 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -51,7 +51,9 @@ private: enum class Mode { Broadcast, Multicast, - LockedMulticast + Unicast, + LockedUnicast, + None } _mode; int _streamingSource; QMap<int, Client*> _watchers; @@ -76,7 +78,7 @@ private: ConnectionFrame* createFrame(); bool loadPosition(QSettings& settings, const QString& id, int& x, int& y); void savePosition(ConnectionFrame *cf); - void changeProjection(Client *from, Mode mode = Mode::Broadcast, Client *to = NULL); + void startVncServerIfNecessary(int from); void tellClientCurrentSituation(Client* client); void reset(); |