Skip to content

DesktopStreamer: Added DEFLECT_DESKTOPSTREAMER_HOSTS CMake option #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdumusc merged 1 commit into from
Aug 31, 2016
Merged

DesktopStreamer: Added DEFLECT_DESKTOPSTREAMER_HOSTS CMake option #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions apps/DesktopStreamer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ set(DESKTOPSTREAMER_LINK_LIBRARIES
Qt5::Widgets
)

set(DEFLECT_DESKTOPSTREAMER_HOSTS
"\
{\"DisplayWall Ground floor\", \"bbpav02.epfl.ch\"}, \
{\"DisplayWall 3rd floor\", \"bbpav04.epfl.ch\"}, \
{\"DisplayWall 5th floor\", \"bbpav05.epfl.ch\"}, \
{\"DisplayWall 6th floor\", \"bbpav06.epfl.ch\"}"
CACHE STRING "List of default hosts for the DesktopStreamer application"
)
set_source_files_properties(MainWindow.cpp PROPERTIES COMPILE_DEFINITIONS
_HOSTS=${DEFLECT_DESKTOPSTREAMER_HOSTS}
)

if(DEFLECT_USE_SERVUS)
list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES Servus)
endif()
Expand Down
7 changes: 1 addition & 6 deletions apps/DesktopStreamer/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,7 @@ typedef __int32 int32_t;

namespace
{
const std::vector< std::pair< QString, QString > > defaultHosts = {
{ "DisplayWall Ground floor", "bbpav02.epfl.ch" },
{ "DisplayWall 3rd floor", "bbpav04.epfl.ch" },
{ "DisplayWall 5th floor", "bbpav05.epfl.ch" },
{ "DisplayWall 6th floor", "bbpav06.epfl.ch" }
};
const std::vector< std::pair< QString, QString > > defaultHosts = { _HOSTS };
const QString streamButtonDefaultText = "Stream";
const QString streamSelected = "Stream selected item(s)";
}
Expand Down
3 changes: 3 additions & 0 deletions doc/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Changelog {#Changelog}

### 0.12.0 (git master)

* [126](https://github.com/BlueBrain/Deflect/pull/126)
DesktopStreamer: The list of default hosts can be configured using the CMake
variable DEFLECT_DESKTOPSTREAMER_HOSTS.
* [124](https://github.com/BlueBrain/Deflect/pull/124):
QmlStreamer: Users can now interact with WebGL content in a WebEngineView
and no longer risk opening a system context menu with a long press (prevent
Expand Down