Skip to content

Multiwindow Desktop Streamer #79

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
dnachbaur merged 2 commits into from
Mar 7, 2016
Merged

Multiwindow Desktop Streamer #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b059ed
Refactor stream into separate class
Feb 26, 2016
abbd2ba
Multiwindow Desktop Streamer
Feb 26, 2016
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: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Copyright (c) 2013-2015, EPFL/Blue Brain Project
# Raphael Dumusc <raphael.dumusc@epfl.ch>
# Daniel Nachbaur <daniel.nachbaur@epfl.ch>
# Copyright (c) 2013-2016, EPFL/Blue Brain Project
# Raphael Dumusc <raphael.dumusc@epfl.ch>
# Daniel Nachbaur <daniel.nachbaur@epfl.ch>

cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
project(Deflect)
Expand All @@ -10,9 +10,9 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
${CMAKE_SOURCE_DIR}/CMake/common)
include(GitExternal)

set(VERSION_MAJOR "0")
set(VERSION_MINOR "9")
set(VERSION_PATCH "1")
set(VERSION_MAJOR 0)
set(VERSION_MINOR 10)
set(VERSION_PATCH 0)
set(VERSION_ABI 2)

set(DEFLECT_DESCRIPTION "A fast C++ library for streaming pixels and events")
Expand Down
2 changes: 1 addition & 1 deletion apps/DesktopStreamer/AppNapSuspender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/* The views and conclusions contained in the software and */
/* documentation are those of the authors and should not be */
/* interpreted as representing official policies, either expressed */
/* or implied, of The University of Texas at Austin. */
/* or implied, of The Ecole Polytechnique Federale de Lausanne. */
/*********************************************************************/

#ifndef APPNAPSUSPENDER_H
Expand Down
5 changes: 5 additions & 0 deletions apps/DesktopStreamer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ set(DESKTOPSTREAMER_MOC_HEADERS
MainWindow.h
)

set(DESKTOPSTREAMER_HEADERS
Stream.h
)

set(DESKTOPSTREAMER_SOURCES
MainWindow.cpp
Stream.cpp
main.cpp
)

Expand Down
6 changes: 1 addition & 5 deletions apps/DesktopStreamer/DesktopWindowsModel.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,8 @@ void reloadData()
bool _addApplication( NSRunningApplication* app, CFArrayRef windowList )
{
const QString& appName = NSStringToQString([app localizedName]);
const auto& pid = [app processIdentifier];
if( appName == "SystemUIServer" || appName == "Dock" ||
pid == QApplication::applicationPid( ))
{
if( appName == "SystemUIServer" || appName == "Dock" )
return true;
}

NSArray* windows = getWindows( app, windowList );

Expand Down
Loading