diff --git a/.gitignore b/.gitignore index 6b2979582..b27217c8b 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,11 @@ qrc_*.cpp src/*/mocs/* src/*/objs/* src/*/qrc/* +*_plugin_import.cpp +tests/target_wrapper.sh + +# Shadow build directory +build/ # Folders not to be included html/ diff --git a/resources/images/icons/syphon-white.png b/resources/images/icons/syphon-white.png new file mode 100644 index 000000000..fd5a98d63 Binary files /dev/null and b/resources/images/icons/syphon-white.png differ diff --git a/resources/interface.qrc b/resources/interface.qrc index 38685d45a..16ab510d6 100644 --- a/resources/interface.qrc +++ b/resources/interface.qrc @@ -10,6 +10,7 @@ images/icons/add_movie_w.png images/icons/add_camera_w.png images/icons/add_paint_w.png + images/icons/syphon-white.png images/shapes/add_quad.png images/shapes/add_triangle.png images/shapes/add_circle.png diff --git a/resources/macOS/Info.plist b/resources/macOS/Info.plist index d0c0cb314..c49e05bf2 100644 --- a/resources/macOS/Info.plist +++ b/resources/macOS/Info.plist @@ -23,7 +23,12 @@ NSPrincipalClass NSApplication NSSupportsAutomaticGraphicsSwitching -NOTE + +NSCameraUsageDescription +MapMap uses the camera to display a live camera feed as a video-mapping source. +NSMicrophoneUsageDescription +MapMap may access the microphone when capturing audio from a camera device. +NOTE This file need to be update at every release diff --git a/src/app/main.cpp b/src/app/main.cpp index 801afcb23..23bb4c6a5 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -13,6 +13,10 @@ #include "MetaObjectRegistry.h" +#ifdef Q_OS_MAC +#include "Syphon.h" +#endif + #include MM_USE_NAMESPACE @@ -40,6 +44,9 @@ void initRegistry() registry.add