diff options
| author | Björn Hagemeister | 2014-05-27 15:48:53 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-27 15:48:53 +0200 |
| commit | 1004259545600394286c13f17737a804bcfcff7c (patch) | |
| tree | 9417ac9d508155a0283c0a6d51e4dae46c1c591b /src/server/mainwindow/mainwindow.h | |
| parent | Enable, to set locked client to tutor and unlock selected one afterwards. (diff) | |
| parent | Manual merge (diff) | |
| download | pvs2-1004259545600394286c13f17737a804bcfcff7c.tar.gz pvs2-1004259545600394286c13f17737a804bcfcff7c.tar.xz pvs2-1004259545600394286c13f17737a804bcfcff7c.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 91346c7..25eb9aa 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -48,9 +48,8 @@ private: QList<QAction*> _lockingButtons; static const qint64 _buttonBlockTime = 600; - // Internal stuff + // Management stuff enum class Mode { - Idle, Broadcast, Multicast, LockedMulticast @@ -77,8 +76,7 @@ private: bool loadPosition(QSettings& settings, const QString& id, int& x, int& y); void savePosition(ConnectionFrame *cf); bool isValidClient(Client* client); - void broadcast(Client *from); - void multicast(Client *from, Client *to, bool blockOthers = false); + void changeProjection(Client *from, Mode mode = Mode::Broadcast, Client *to = NULL); void tellClientCurrentSituation(Client* client); void closeEvent(QCloseEvent *e); |