Merge remote-tracking branch 'origin/beta'

Correctly capture frames in RGB and RGBA from Player, and invert vertically only screenshots.

.github/workflows/jekyll-gh-pages.yml

@@ -0,0 +1,50 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./docs
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

.gitignore

@@ -26,3 +26,9 @@ osx/.DS_Store
 osx/runvimix
 
 *.autosave
+
+flatpak/.flatpak-builder
+
+flatpak/repo/
+
+flatpak/build/

.gitmodules

@@ -13,12 +13,12 @@
 [submodule "ext/Dirent"]
 	path = ext/Dirent
 	url = https://github.com/tronkko/dirent.git
-[submodule "ext/tfd"]
-	path = ext/tfd
-	url = https://github.com/native-toolkit/tinyfiledialogs.git
 [submodule "ext/glm"]
 	path = ext/glm
 	url = https://github.com/g-truc/glm.git
 [submodule "ext/link"]
 	path = ext/link
 	url = https://github.com/Ableton/link.git
+[submodule "ext/tfd"]
+	path = ext/tfd
+	url = https://git.code.sf.net/p/tinyfiledialogs/code

CMakeLists.txt

@@ -1,9 +1,15 @@
+#####
+#####  This file is part of vimix - video live mixer
+#####  **Copyright** (C) 2019-2023 Bruno Herbelin <bruno.herbelin@gmail.com>
+#####
 
 cmake_minimum_required(VERSION 3.8.2)
 project(vimix VERSION 0.0.1 LANGUAGES CXX C)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# use git
+#####
+##### Use git to read version from tags
+#####
 find_package (Git)
 if(GIT_EXECUTABLE)
   execute_process(
@@ -16,23 +22,36 @@ if(GIT_EXECUTABLE)
   if(NOT GIT_DESCRIBE_ERROR_CODE)
       string(SUBSTRING ${GIT_DESCRIBE_VERSION} 0 1 VIMIX_VERSION_MAJOR)
       string(SUBSTRING ${GIT_DESCRIBE_VERSION} 2 1 VIMIX_VERSION_MINOR)
-      string(SUBSTRING ${GIT_DESCRIBE_VERSION} 4 1 VIMIX_VERSION_PATCH)
+      string(LENGTH ${GIT_DESCRIBE_VERSION} VIMIX_VERSION_LENGTH)
+      if (VIMIX_VERSION_LENGTH GREATER 4)
+          string(SUBSTRING ${GIT_DESCRIBE_VERSION} 4 1 VIMIX_VERSION_PATCH)
+      else()
+          set(VIMIX_VERSION_PATCH "0")
+      endif()
       add_definitions(-DVIMIX_VERSION_MAJOR=${VIMIX_VERSION_MAJOR})
       add_definitions(-DVIMIX_VERSION_MINOR=${VIMIX_VERSION_MINOR})
       add_definitions(-DVIMIX_VERSION_PATCH=${VIMIX_VERSION_PATCH})
       message(STATUS "Compiling vimix version ${VIMIX_VERSION_MAJOR}.${VIMIX_VERSION_MINOR}.${VIMIX_VERSION_PATCH}")
-  else()
-      message(STATUS "Compiling vimix (unknown version)")
   endif()
 endif()
 
-set(CMAKE_INCLUDE_CURRENTDIR ON)
 
-# Find the cmake modules
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
+#####
+##### Find the cmake modules
+#####
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/share/cmake ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
 include(MacroLogFeature)
 include(MacroFindGStreamerLibrary)
 
+
+#####
+##### Configure cmake
+#####
+
+set(BUILD_STATIC_LIBS ON)
+set(CMAKE_INCLUDE_CURRENTDIR ON)
+
 if(UNIX)
     if (APPLE)
         add_definitions(-DAPPLE)
@@ -43,12 +62,21 @@ if(UNIX)
         set(CMAKE_OSX_ARCHITECTURES "x86_64")
         set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 
+        # CPACK
+        set(CPACK_SYSTEM_NAME  "OSX_${CMAKE_OSX_DEPLOYMENT_TARGET}_${CMAKE_OSX_ARCHITECTURES}")
+        set(CPACK_GENERATOR DragNDrop)
+        set(CPACK_BINARY_DRAGNDROP ON)
+        set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/osx/entitlements.plist")
+
         # find icu4c in OSX (pretty well hidden...)
         set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/icu4c/lib/pkgconfig")
 
     else()
         add_definitions(-DLINUX)
 
+        # CPACK
+        set(CPACK_SYSTEM_NAME "${CMAKE_HOST_SYSTEM_NAME}")
+
         # linux opengl
         set(OpenGL_GL_PREFERENCE "GLVND")
 
@@ -63,23 +91,26 @@ elseif(WIN32)
     add_definitions(-DMINGW32)
 endif()
 
+#####
+##### Dependencies
+#####
 
+#
 # Basics
+#
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package(Threads REQUIRED)
 
-find_package(GLIB2)
-macro_log_feature(GLIB2_FOUND "GLib" "GTK general-purpose utility library" "http://www.gtk.org" TRUE)
-
-find_package(GObject)
-macro_log_feature(GOBJECT_FOUND "GObject" "GTK object-oriented framework" "http://www.gtk.org" TRUE)
-
-find_package(PNG REQUIRED)
-macro_log_feature(PNG_FOUND "PNG" "Portable Network Graphics" "http://www.libpng.org" TRUE)
+find_package(ZLIB REQUIRED)
 
 #
 # GSTREAMER
 #
+find_package(GLIB2 REQUIRED)
+macro_log_feature(GLIB2_FOUND "GLib" "GTK general-purpose utility library" "http://www.gtk.org" TRUE)
+
+find_package(GObject REQUIRED)
+macro_log_feature(GOBJECT_FOUND "GObject" "GTK object-oriented framework" "http://www.gtk.org" TRUE)
 
 find_package(GStreamer 1.0.0 COMPONENTS base)
 macro_log_feature(GSTREAMER_FOUND "GStreamer"
@@ -105,6 +136,17 @@ macro_log_feature(GSTREAMER_GL_LIBRARY_FOUND "GStreamerPluginsBase" "GStreamer o
 # Various preprocessor definitions for GST
 add_definitions(-DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE)
 
+include_directories(
+    ${GLIB2_INCLUDE_DIR}
+    ${GSTREAMER_INCLUDE_DIR}
+    ${GSTREAMER_AUDIO_INCLUDE_DIR}
+    ${GSTREAMER_VIDEO_INCLUDE_DIR}
+    ${GSTREAMER_BASE_INCLUDE_DIR}
+    ${GSTREAMER_APP_INCLUDE_DIR}
+    ${GSTREAMER_PBUTILS_INCLUDE_DIR}
+    ${GSTREAMER_GL_INCLUDE_DIR}
+)
+
 #
 # ICU4C
 #
@@ -113,8 +155,17 @@ if (PKG_CONFIG_FOUND)
 else ()
     find_package(ICU REQUIRED COMPONENTS i18n io uc)
 endif ()
+
 macro_log_feature(ICU_FOUND "ICU" "International Components for Unicode" "http://site.icu-project.org" TRUE)
 
+include_directories(
+    ${ICU_INCLUDE_DIRS}
+)
+
+link_directories(
+    ${ICU_LIBRARY_DIRS}
+)
+
 #
 # GLFW3
 #
@@ -123,37 +174,173 @@ if (PKG_CONFIG_FOUND)
 else ()
     find_package(glfw3 3.2 REQUIRED)
 endif()
+
 macro_log_feature(GLFW3_FOUND "glfw3" "Open Source multi-platform library for OpenGL" "http://www.glfw.org" TRUE)
 
+include_directories(
+    ${GLFW3_INCLUDE_DIRS}
+)
 
-macro_display_feature_log()
-
-# static sub packages in ext
-set(BUILD_STATIC_LIBS ON)
+link_directories(
+    ${GLFW3_LIBRARY_DIRS}
+)
 
 #
 # GLM
 #
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/glm)
-message(STATUS "Compiling 'GLM' OpenGL mathematics https://glm.g-truc.net -- ${CMAKE_CURRENT_SOURCE_DIR}/ext/glm")
+if (PKG_CONFIG_FOUND)
+    pkg_check_modules(GLM QUIET glm>=0.9.9)
+else ()
+    find_package(glm 0.9.9 QUIET)
+endif()
+
+if (GLM_FOUND)
+    macro_log_feature(GLM_FOUND "GLM" "OpenGL mathematics" "https://glm.g-truc.net" TRUE)
+else ()
+    set(GLM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/glm)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/glm)
+    message(STATUS "Compiling 'GLM' OpenGL mathematics https://glm.g-truc.net -- ${CMAKE_CURRENT_SOURCE_DIR}/ext/glm")
+endif()
+
+include_directories(
+    ${GLM_INCLUDE_DIRS}
+)
+
+#
+# TINY XML 2
+#
+if (PKG_CONFIG_FOUND)
+    pkg_check_modules(TINYXML2 QUIET tinyxml2>=8.0)
+else ()
+    find_package(tinyxml2 8.0 QUIET)
+endif()
+
+if (TINYXML2_FOUND)
+    macro_log_feature(TINYXML2_FOUND "TinyXML2" "TinyXML2 library" "https://github.com/leethomason/tinyxml2.git" TRUE)
+else ()
+    set(TINYXML2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/tinyxml2)
+    set(TINYXML2_LIBRARIES TINYXML2)
+    add_library(TINYXML2 "${CMAKE_CURRENT_SOURCE_DIR}/ext/tinyxml2/tinyxml2.cpp")
+    message(STATUS "Compiling 'TinyXML2' from https://github.com/leethomason/tinyxml2.git -- ${TINYXML2_INCLUDE_DIRS}")
+endif()
+
+include_directories(
+    ${TINYXML2_INCLUDE_DIRS}
+)
+
+#
+# STB
+#
+if (PKG_CONFIG_FOUND)
+    pkg_check_modules(STB QUIET stb)
+else ()
+    find_package(stb QUIET)
+endif()
+
+if (STB_FOUND)
+    macro_log_feature(STB_FOUND "STB" "single-file image and audio processing" "https://github.com/nothings/stb" TRUE)
+else ()
+    set(STB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/stb)
+    message(STATUS "Including 'STB' single-file image and audio processing from https://github.com/nothings/stb -- ${STB_INCLUDE_DIRS}")
+endif()
+
+include_directories(
+    ${STB_INCLUDE_DIRS}
+)
 
 #
 # Ableton LINK
 #
-#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/link)
-include(${CMAKE_CURRENT_SOURCE_DIR}/ext/link/AbletonLinkConfig.cmake)
-message(STATUS "Compiling Ableton 'Link' https://github.com/Ableton/link -- ${CMAKE_CURRENT_SOURCE_DIR}/ext/link")
+find_package(AbletonLink QUIET)
+
+if (AbletonLink_FOUND)
+    macro_log_feature(AbletonLink_FOUND "AbletonLink" "Ableton Link synchronizer" "https://github.com/Ableton/link" TRUE)
+else ()
+    include(${CMAKE_CURRENT_SOURCE_DIR}/ext/link/AbletonLinkConfig.cmake)
+    message(STATUS "Compiling 'Ableton Link' from https://github.com/Ableton/link -- ${CMAKE_CURRENT_SOURCE_DIR}/ext/link")
+endif()
+
+include_directories(
+    ${link_HEADERS}
+)
+
+
+#
+# FILE DIALOG: use tinyfiledialog for all except Linux
+#
+if(APPLE OR WIN32)
+    set(TINYFD_LIBRARIES TINYFD)
+    set(TINYFD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/tfd)
+    include_directories(
+        ${TINYFD_INCLUDE_DIR}
+    )
+    add_library(TINYFD "${CMAKE_CURRENT_SOURCE_DIR}/ext/tfd/tinyfiledialogs.c")
+    message(STATUS "Compiling 'TinyFileDialog' from https://git.code.sf.net/p/tinyfiledialogs/code -- ${TINYFD_INCLUDE_DIR}.")
+endif()
+
+#
+# DIRENT (windows only)
+if(WIN32)
+    set(DIRENT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/Dirent/include)
+    include_directories(
+        ${DIRENT_INCLUDE_DIR}
+    )
+    message(STATUS "Including 'Dirent' from https://github.com/tronkko/dirent -- ${DIRENT_INCLUDE_DIR}.")
+endif()
+
+
+#
+# SHMDATA (Unix only)
+#
+if(UNIX)
+
+    if (PKG_CONFIG_FOUND)
+        pkg_check_modules(SHMDATA QUIET shmdata-1.3)
+    endif()
+
+    if(SHMDATA_FOUND)
+        find_library(GSTREAMER_SHMDATA_LIBRARY
+            NAMES gstshmdata
+            HINTS ${SHMDATA_LIBRARY_DIRS}/gstreamer-1.0
+        )
+        if(GSTREAMER_SHMDATA_LIBRARY)
+            add_definitions(-DGSTREAMER_SHMDATA_PLUGIN=\"${GSTREAMER_SHMDATA_LIBRARY}\")
+        endif()
+
+        macro_log_feature(GSTREAMER_SHMDATA_LIBRARY "GStreamerPluginShmdata" "Plugin to share any flow" "https://gitlab.com/sat-mtl/tools/shmdata" FALSE)
+    endif(SHMDATA_FOUND)
+
+endif(UNIX)
+
+
+# show message about found libs
+macro_display_feature_log()
+
+#####
+##### Locally built libraries
+#####
 
 #
 # GLAD
 #
-set(GLAD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include)
+set(GLAD_LIBRARIES GLAD)
+set(GLAD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include)
+include_directories(
+    ${GLAD_INCLUDE_DIRS}
+)
 add_library(GLAD "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/src/glad.c")
-message(STATUS "Compiling 'GLAD' Open source multi-language OpenGL loader https://glad.dav1d.de -- ${GLAD_INCLUDE_DIR}")
+message(STATUS "Including 'GLAD' Open source multi-language OpenGL loader https://glad.dav1d.de -- ${GLAD_INCLUDE_DIRS}")
 
 #
 # DEAR IMGUI
 #
+set(IMGUI_LIBRARIES IMGUI IMGUITEXTEDIT)
+set(IMGUI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui)
+set(IMGUI_BACKEND_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui/examples)
+include_directories(
+    ${IMGUI_INCLUDE_DIRS}
+    ${IMGUI_BACKEND_INCLUDE_DIRS}
+)
 set(IMGUI_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui/imgui.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui//imgui_demo.cpp
@@ -161,18 +348,23 @@ set(IMGUI_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui//imgui_widgets.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui/examples/imgui_impl_glfw.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui/examples/imgui_impl_opengl3.cpp
-)
-set(IMGUI_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui)
+    )
 add_library(IMGUI "${IMGUI_SRCS}")
 target_compile_definitions(IMGUI PRIVATE "IMGUI_IMPL_OPENGL_LOADER_GLAD")
-message(STATUS "Compiling 'Dear ImGui' from https://github.com/ocornut/imgui.git -- ${IMGUI_INCLUDE_DIR}")
+target_compile_definitions(IMGUI PRIVATE "IMGUI_USE_STB_SPRINTF")
+message(STATUS "Compiling 'Dear ImGui' from https://github.com/ocornut/imgui.git -- ${IMGUI_INCLUDE_DIRS}")
 
 #
-# TINY XML 2
+# ImGui Color Text Editor
 #
-set(TINYXML2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/tinyxml2)
-add_library(TINYXML2 "${CMAKE_CURRENT_SOURCE_DIR}/ext/tinyxml2/tinyxml2.cpp")
-message(STATUS "Compiling 'TinyXML2' from https://github.com/leethomason/tinyxml2.git -- ${TINYXML2_INCLUDE_DIR}")
+set(IMGUITEXTEDIT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/ImGuiColorTextEdit)
+include_directories(
+    ${IMGUITEXTEDIT_INCLUDE_DIR}
+)
+add_library(IMGUITEXTEDIT "${CMAKE_CURRENT_SOURCE_DIR}/ext/ImGuiColorTextEdit/TextEditor.cpp")
+set_property(TARGET IMGUITEXTEDIT PROPERTY CXX_STANDARD 17)
+message(STATUS "Compiling 'ImGuiColorTextEdit' from https://github.com/BalazsJako/ImGuiColorTextEdit -- ${IMGUITEXTEDIT_INCLUDE_DIR}")
+
 
 #
 # OSCPack
@@ -191,156 +383,94 @@ set(OSCPACK_SRCS
     ${OSCPACK_PLATFORM_DIR}/NetworkingUtils.cpp
     ${OSCPACK_PLATFORM_DIR}/UdpSocket.cpp
 )
+set(OSCPACK_LIBRARIES OSCPACK)
 set(OSCPACK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/OSCPack)
+include_directories(
+    ${OSCPACK_INCLUDE_DIR}
+)
 add_library(OSCPACK "${OSCPACK_SRCS}")
 message(STATUS "Compiling 'OSCPack' from http://www.rossbencina.com/code/oscpack -- ${OSCPACK_INCLUDE_DIR}")
 
+
+#####
+##### Ressources
+#####
+
+set(RSC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rsc)
+
 #
-# FILE DIALOG: use tinyfiledialog for all except Linux
+# Fonts
 #
-if(UNIX)
-    if (APPLE)
-        set(TINYFD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/tfd)
-        add_library(TINYFD "${CMAKE_CURRENT_SOURCE_DIR}/ext/tfd/tinyfiledialogs.c")
-        message(STATUS "Compiling 'TinyFileDialog' from https://github.com/native-toolkit/tinyfiledialogs.git -- ${TINYFD_INCLUDE_DIR}.")
-        set(TINYFD_LIBRARY TINYFD)
-    endif()
-else()
-    set(TINYFD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/tfd)
-    add_library(TINYFD "${CMAKE_CURRENT_SOURCE_DIR}/ext/tfd/tinyfiledialogs.c")
-    message(STATUS "Compiling 'TinyFileDialog' from https://github.com/native-toolkit/tinyfiledialogs.git -- ${TINYFD_INCLUDE_DIR}.")
-    set(TINYFD_LIBRARY TINYFD)
+
+file(GLOB_RECURSE ROBOTO_REGULAR "${RSC_DIR}/*/Roboto-Regular.ttf")
+if(NOT ROBOTO_REGULAR)
+    file(GLOB_RECURSE ROBOTO_REGULAR "/usr/share/fonts/*/Roboto-Regular.ttf")
+    message(STATUS "Copy ${ROBOTO_REGULAR} to ${RSC_DIR}/fonts")
+    file(COPY ${ROBOTO_REGULAR} DESTINATION ${RSC_DIR}/fonts)
+    set(ROBOTO_REGULAR "${RSC_DIR}/fonts/Roboto-Regular.ttf")
 endif()
 
-#
-# ImGui Color Text Editor
-#
-set(IMGUITEXTEDIT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/ImGuiColorTextEdit)
-set(IMGUITEXTEDIT_SRC
-    ${CMAKE_CURRENT_SOURCE_DIR}/ext/ImGuiColorTextEdit/TextEditor.cpp
-)
-message(STATUS "Including 'ImGuiColorTextEdit' from https://github.com/BalazsJako/ImGuiColorTextEdit -- ${IMGUITEXTEDIT_INCLUDE_DIR}")
-
-#
-# STB
-#
-set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/stb)
-add_definitions(-DIMGUI_USE_STB_SPRINTF)
-message(STATUS "Including 'STB Nothings' from https://github.com/nothings/stb -- ${STB_INCLUDE_DIR}")
-
-#
-# DIRENT (windows only)
-if(WIN32)
-    set(DIRENT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/Dirent/include)
-    message(STATUS "Including 'Dirent' from https://github.com/tronkko/dirent -- ${DIRENT_INCLUDE_DIR}.")
+file(GLOB_RECURSE ROBOTO_BOLD "${RSC_DIR}/*/Roboto-Bold.ttf")
+if(NOT ROBOTO_BOLD)
+    file(GLOB_RECURSE ROBOTO_BOLD "/usr/share/fonts/*/Roboto-Bold.ttf")
+    message(STATUS "Copy ${ROBOTO_BOLD} to ${RSC_DIR}/fonts")
+    file(COPY ${ROBOTO_BOLD} DESTINATION ${RSC_DIR}/fonts)
+    set(ROBOTO_BOLD "${RSC_DIR}/fonts/Roboto-Bold.ttf")
 endif()
 
-#
-#  Application
-#
+file(GLOB_RECURSE ROBOTO_ITALIC "${RSC_DIR}/*/Roboto-Italic.ttf")
+if(NOT ROBOTO_ITALIC)
+    file(GLOB_RECURSE ROBOTO_ITALIC "/usr/share/fonts/*/Roboto-Italic.ttf")
+    message(STATUS "Copy ${ROBOTO_ITALIC} to ${RSC_DIR}/fonts")
+    file(COPY ${ROBOTO_ITALIC} DESTINATION ${RSC_DIR}/fonts)
+    set(ROBOTO_ITALIC "${RSC_DIR}/fonts/Roboto-Italic.ttf")
+endif()
+
+file(GLOB_RECURSE HACK_REGULAR "${RSC_DIR}/*/Hack-Regular.ttf")
+if(NOT HACK_REGULAR)
+    file(GLOB_RECURSE HACK_REGULAR "/usr/share/fonts/*/Hack-Regular.ttf")
+    message(STATUS "Copy ${HACK_REGULAR} to ${RSC_DIR}/fonts")
+    file(COPY ${HACK_REGULAR} DESTINATION ${RSC_DIR}/fonts)
+    set(HACK_REGULAR "${RSC_DIR}/fonts/Hack-Regular.ttf")
+endif()
+
+file(GLOB_RECURSE AWESOME_SOLID "${RSC_DIR}/*/fa-solid-900.ttf")
+if(NOT AWESOME_SOLID)
+    file(GLOB_RECURSE AWESOME_SOLID "/usr/share/fonts/*/fa-solid-900.ttf")
+    message(STATUS "Copy ${AWESOME_SOLID} to ${RSC_DIR}/fonts")
+    file(COPY ${AWESOME_SOLID} DESTINATION ${RSC_DIR}/fonts)
+    set(AWESOME_SOLID "${RSC_DIR}/fonts/fa-solid-900.ttf")
+endif()
+
+file(GLOB_RECURSE AWESOME_REGULAR "${RSC_DIR}/*/fa-regular-400.ttf")
+if(NOT AWESOME_REGULAR)
+    file(GLOB_RECURSE AWESOME_REGULAR "/usr/share/fonts/*/fa-regular-400.ttf")
+    message(STATUS "Copy ${AWESOME_REGULAR} to ${RSC_DIR}/fonts")
+    file(COPY ${AWESOME_REGULAR} DESTINATION ${RSC_DIR}/fonts)
+    set(AWESOME_REGULAR "${RSC_DIR}/fonts/fa-regular-400.ttf")
+endif()
 
-# Setup the environment
 include_directories(
-    ${GSTREAMER_INCLUDE_DIR}
-    ${GSTREAMER_AUDIO_INCLUDE_DIR}
-    ${GSTREAMER_VIDEO_INCLUDE_DIR}
-    ${GSTREAMER_BASE_INCLUDE_DIR}
-    ${GSTREAMER_APP_INCLUDE_DIR}
-    ${GSTREAMER_PBUTILS_INCLUDE_DIR}
-    ${GSTREAMER_GL_INCLUDE_DIR}
-    ${GLFW3_INCLUDE_DIRS}
-    ${ICU_INCLUDE_DIRS}
-    ${GLM_INCLUDE_DIRS}
-    ${GLIB2_INCLUDE_DIR}
-    ${GLAD_INCLUDE_DIR}
-    ${IMGUI_INCLUDE_DIR}
-    ${IMGUI_INCLUDE_DIR}/examples
-    ${IMGUITEXTEDIT_INCLUDE_DIR}
-    ${TINYXML2_INCLUDE_DIR}
-    ${TINYFD_INCLUDE_DIR}
-    ${STB_INCLUDE_DIR}
-    ${DIRENT_INCLUDE_DIR}
-    ${OSCPACK_INCLUDE_DIR}
-    ${link_HEADERS}
-)
-
-link_directories(
-    ${GLFW3_LIBRARY_DIRS}
-    ${ICU_LIBRARY_DIRS}
+    "${RSC_DIR}/fonts"
 )
 
 
-set(VMIX_BINARY "vimix")
-set(VMIX_SRCS
-    main.cpp
-    Log.cpp
-    BaseToolkit.cpp
-    Shader.cpp
-    ImageShader.cpp
-    ImageProcessingShader.cpp
-    UpdateCallback.cpp
-    Scene.cpp
-    Primitives.cpp
-    Mesh.cpp
-    Decorations.cpp
-    View.cpp
-    RenderView.cpp
-    GeometryView.cpp
-    MixingView.cpp
-    MixingGroup.cpp
-    LayerView.cpp
-    TextureView.cpp
-    TransitionView.cpp
-    Source.cpp
-    SourceList.cpp
-    Session.cpp
-    Selection.cpp
-    SessionSource.cpp
-    SessionVisitor.cpp
-    Interpolator.cpp
-    SessionCreator.cpp
-    SessionParser.cpp
-    Mixer.cpp
-    FrameGrabber.cpp
-    Recorder.cpp
-    Streamer.cpp
-    Loopback.cpp
-    Settings.cpp
-    Screenshot.cpp
-    Resource.cpp
-    Timeline.cpp
-    Stream.cpp
-    MediaPlayer.cpp
-    MediaSource.cpp
-    StreamSource.cpp
-    PatternSource.cpp
-    DeviceSource.cpp
-    NetworkSource.cpp
-    MultiFileSource.cpp
-    FrameBuffer.cpp
-    RenderingManager.cpp
-    UserInterfaceManager.cpp
-    PickingVisitor.cpp
-    BoundingBoxVisitor.cpp
-    DrawVisitor.cpp
-    SearchVisitor.cpp
-    ImGuiToolkit.cpp
-    ImGuiVisitor.cpp
-    InfoVisitor.cpp
-    GstToolkit.cpp
-    GlmToolkit.cpp
-    SystemToolkit.cpp
-    DialogToolkit.cpp
-    tinyxml2Toolkit.cpp
-    NetworkToolkit.cpp
-    Connection.cpp
-    ActionManager.cpp
-    Overlay.cpp
-    Metronome.cpp
-)
+#
+# CMake RC module
+#
 
+# Include the CMake RC module
+include(CMakeRC)
+message(STATUS "Using 'CMakeRC ' from https://github.com/vector-of-bool/cmrc.git -- ${CMAKE_MODULE_PATH}.")
 
+# set the files to package
 set(VMIX_RSC_FILES
+    ${ROBOTO_REGULAR}
+    ${ROBOTO_BOLD}
+    ${ROBOTO_ITALIC}
+    ${HACK_REGULAR}
+    ${AWESOME_REGULAR}
+    ${AWESOME_SOLID}
     ./rsc/shaders/simple.fs
     ./rsc/shaders/simple.vs
     ./rsc/shaders/image.fs
@@ -353,12 +483,6 @@ set(VMIX_RSC_FILES
     ./rsc/shaders/image.vs
     ./rsc/shaders/imageprocessing.fs
     ./rsc/shaders/imageblending.fs
-    ./rsc/fonts/Hack-Regular.ttf
-    ./rsc/fonts/Roboto-Regular.ttf
-    ./rsc/fonts/Roboto-Bold.ttf
-    ./rsc/fonts/Roboto-Italic.ttf
-    ./rsc/fonts/fa-regular-400.ttf
-    ./rsc/fonts/fa-solid-900.ttf
     ./rsc/images/mask_vignette.png
     ./rsc/images/mask_halo.png
     ./rsc/images/mask_glow.png
@@ -369,6 +493,7 @@ set(VMIX_RSC_FILES
     ./rsc/images/mask_linear_left.png
     ./rsc/images/mask_linear_right.png
     ./rsc/images/vimix_256x256.png
+    ./rsc/images/vimix_crow_white.png
     ./rsc/images/icons.dds
     ./rsc/images/gradient_0_cross_linear.png
     ./rsc/images/gradient_1_black_linear.png
@@ -438,93 +563,65 @@ set(VMIX_RSC_FILES
     ./rsc/mesh/icon_crop.ply
     ./rsc/mesh/icon_eye.ply
     ./rsc/mesh/icon_eye_slash.ply
-    ./rsc/mesh/icon_vector_square_slash.ply
+    ./rsc/mesh/icon_tv.ply
     ./rsc/mesh/icon_cube.ply
     ./rsc/mesh/icon_sequence.ply
+    ./rsc/mesh/icon_receive.ply
     ./rsc/mesh/h_line.ply
     ./rsc/mesh/h_mark.ply
+    ./rsc/shaders/filters/default.glsl
+    ./rsc/shaders/filters/bloom.glsl
+    ./rsc/shaders/filters/bokeh.glsl
+    ./rsc/shaders/filters/talk.glsl
+    ./rsc/shaders/filters/fisheye.glsl
+    ./rsc/shaders/filters/blur.glsl
+    ./rsc/shaders/filters/blur_1.glsl
+    ./rsc/shaders/filters/blur_2.glsl
+    ./rsc/shaders/filters/lens_1.glsl
+    ./rsc/shaders/filters/lens_2.glsl
+    ./rsc/shaders/filters/hashedblur.glsl
+    ./rsc/shaders/filters/circularblur.glsl
+    ./rsc/shaders/filters/hashederosion.glsl
+    ./rsc/shaders/filters/hasheddilation.glsl
+    ./rsc/shaders/filters/sharp.glsl
+    ./rsc/shaders/filters/sharpen.glsl
+    ./rsc/shaders/filters/sharpen_1.glsl
+    ./rsc/shaders/filters/sharpen_2.glsl
+    ./rsc/shaders/filters/contour_2.glsl
+    ./rsc/shaders/filters/sharpenedge.glsl
+    ./rsc/shaders/filters/chromakey.glsl
+    ./rsc/shaders/filters/lumakey.glsl
+    ./rsc/shaders/filters/coloralpha.glsl
+    ./rsc/shaders/filters/bilinear.glsl
+    ./rsc/shaders/filters/edge.glsl
+    ./rsc/shaders/filters/sobel.glsl
+    ./rsc/shaders/filters/freichen.glsl
+    ./rsc/shaders/filters/kuwahara.glsl
+    ./rsc/shaders/filters/pixelate.glsl
+    ./rsc/shaders/filters/focus.glsl
+    ./rsc/shaders/filters/denoise.glsl
+    ./rsc/shaders/filters/noise.glsl
+    ./rsc/shaders/filters/grain.glsl
+    ./rsc/shaders/filters/stippling.glsl
+    ./rsc/shaders/filters/dithering.glsl
+    ./rsc/shaders/filters/erosion.glsl
+    ./rsc/shaders/filters/dilation.glsl
+    ./rsc/shaders/filters/tophat.glsl
+    ./rsc/shaders/filters/blackhat.glsl
+    ./rsc/shaders/filters/resample_double.glsl
+    ./rsc/shaders/filters/resample_half.glsl
+    ./rsc/shaders/filters/resample_quarter.glsl
+    ./rsc/shaders/filters/earlybird.glsl
+    ./rsc/shaders/filters/logo.glsl
+    ./rsc/shaders/filters/whitebalance.glsl
 )
 
-# Include the CMake RC module
-include(CMakeRC)
 cmrc_add_resource_library(vmix-resources ALIAS vmix::rc NAMESPACE vmix WHENCE rsc ${VMIX_RSC_FILES})
-message(STATUS "Using 'CMakeRC ' from https://github.com/vector-of-bool/cmrc.git -- ${CMAKE_MODULE_PATH}.")
-
-### DEFINE THE TARGET (OS specific)
-
-IF(APPLE)
-
-    # set icon
-    set(MACOSX_BUNDLE_ICON vimix.icns)
-    set(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/osx/${MACOSX_BUNDLE_ICON})
-    # set where in the bundle to put the icns file
-    set_source_files_properties(${MACOSX_BUNDLE_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
-    # create the application
-    add_executable(${VMIX_BINARY} MACOSX_BUNDLE
-        ${VMIX_SRCS}
-        ${IMGUITEXTEDIT_SRC}
-        ${MACOSX_BUNDLE_ICON_FILE}
-    )
-
-    # set the Info.plist file
-    set(MACOSX_BUNDLE_PLIST_FILE ${CMAKE_SOURCE_DIR}/osx/Info.plist)
-    set_target_properties(${VMIX_BINARY} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MACOSX_BUNDLE_PLIST_FILE})
-
-    set(PLATFORM_LIBS
-        "-framework CoreFoundation"
-        "-framework Appkit"
-    )
-
-ELSE(APPLE)
-
-    link_directories (${GTK3_LIBRARY_DIRS})
-
-    add_executable(${VMIX_BINARY}
-        ${VMIX_SRCS}
-        ${IMGUITEXTEDIT_SRC}
-    )
-
-    set(PLATFORM_LIBS
-        GTK::GTK
-    )
-
-ENDIF(APPLE)
-
-### COMPILE THE TARGET (all OS)
-
-set_property(TARGET ${VMIX_BINARY} PROPERTY CXX_STANDARD 17)
-set_property(TARGET ${VMIX_BINARY} PROPERTY C_STANDARD 11)
-
-target_compile_definitions(${VMIX_BINARY} PUBLIC "IMGUI_IMPL_OPENGL_LOADER_GLAD")
-
-target_link_libraries(${VMIX_BINARY} LINK_PRIVATE
-    vmix::rc
-    glm::glm
-    GLAD
-    TINYXML2
-    IMGUI
-    OSCPACK
-    ${TINYFD_LIBRARY}
-    ${GLFW3_LIBRARIES}
-    ${ICU_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    ${GOBJECT_LIBRARIES}
-    ${GSTREAMER_LIBRARY}
-    ${GSTREAMER_BASE_LIBRARY}
-    ${GSTREAMER_APP_LIBRARY}
-    ${GSTREAMER_AUDIO_LIBRARY}
-    ${GSTREAMER_VIDEO_LIBRARY}
-    ${GSTREAMER_PBUTILS_LIBRARY}
-    ${GSTREAMER_GL_LIBRARY}
-    Threads::Threads
-    PNG::PNG
-    Ableton::Link
-    ${PLATFORM_LIBS}
-)
 
 
-### DEFINE THE PACKAGING (all OS)
+#####
+##### DEFINE THE PACKAGING (all OS)
+#####
 
 SET(CPACK_PACKAGE_NAME "vimix")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "vimix\nReal-time video mixing for live performance.")
@@ -541,127 +638,15 @@ SET(CPACK_SOURCE_IGNORE_FILES
     "/\\\\.gitignore$"
     "/\\\\.gitmodules$"
 )
-
-
-# optimize size ?
-SET(CPACK_STRIP_FILES TRUE)
-
-### DEFINE THE PACKAGING (OS specific)
-
-IF(APPLE)
-
-    # Bundle target
-    set(CPACK_GENERATOR DragNDrop)
-    set(CPACK_BINARY_DRAGNDROP ON)
-
-    # OSX cpack info
-    set(CPACK_SYSTEM_NAME  "OSX_${CMAKE_OSX_DEPLOYMENT_TARGET}_${CMAKE_OSX_ARCHITECTURES}")
-
-    install(TARGETS ${VMIX_BINARY}
-            CONFIGURATIONS Release RelWithDebInfo
-            BUNDLE  DESTINATION . COMPONENT Runtime
-            RUNTIME DESTINATION bin COMPONENT Runtime
-    )
-
-    # create GST plugins directory in Bundle Resources subfolder
-    set(plugin_dest_dir vimix.app/Contents/Resources/)
-
-    ### TODO configure auto to find installation dir of gst
-
-    message(STATUS "install  gst-plugins ${PKG_GSTREAMER_PLUGIN_DIR}")
-    message(STATUS "install  gst-plugins-base ${PKG_GSTREAMER_BASE_PLUGIN_DIR}")
-
-    if (PKG_CONFIG_FOUND)
-        pkg_check_modules(PKG_GSTREAMER_PLUGINS_BAD gstreamer-plugins-bad-${GSTREAMER_ABI_VERSION})
-        set(PKG_GSTREAMER_BAD_PLUGIN_DIR ${PKG_GSTREAMER_PLUGINS_BAD_LIBDIR}/gstreamer-${GSTREAMER_ABI_VERSION})
-        message(STATUS "install  gst-plugins-bad ${PKG_GSTREAMER_BAD_PLUGIN_DIR}")
-    endif()
-
-
-    # intall the gst-plugin-scanner program (used by plugins at load time)
-    set(PKG_GSTREAMER_SCANNER "${PKG_GSTREAMER_PREFIX}/libexec/gstreamer-1.0/gst-plugin-scanner")
-    message(STATUS "install  gst-plugin-scanner ${PKG_GSTREAMER_SCANNER}")
-    install(FILES "${PKG_GSTREAMER_SCANNER}"
-        DESTINATION "${plugin_dest_dir}"
-        PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-        COMPONENT Runtime
-    )
-
-    # Install the gst-plugins (all those installed with brew )
-    install(DIRECTORY "${PKG_GSTREAMER_PLUGIN_DIR}" DESTINATION "${plugin_dest_dir}" COMPONENT Runtime)
-    install(DIRECTORY "${PKG_GSTREAMER_BASE_PLUGIN_DIR}" DESTINATION "${plugin_dest_dir}" COMPONENT Runtime)
-    install(DIRECTORY "${PKG_GSTREAMER_BAD_PLUGIN_DIR}" DESTINATION "${plugin_dest_dir}" COMPONENT Runtime)
-
-    install(DIRECTORY "/usr/local/Cellar/gst-plugins-good/1.18.4/lib/gstreamer-1.0" DESTINATION "${plugin_dest_dir}" COMPONENT Runtime)
-    install(DIRECTORY "/usr/local/Cellar/gst-plugins-ugly/1.18.4_1/lib/gstreamer-1.0" DESTINATION "${plugin_dest_dir}" COMPONENT Runtime)
-    install(DIRECTORY "/usr/local/Cellar/gst-libav/1.18.4/lib/gstreamer-1.0" DESTINATION "${plugin_dest_dir}" COMPONENT Runtime)
-
-    # install locally recompiled & installed gst-plugins (because not included in brew package)
-    install(FILES   "/usr/local/lib/gstreamer-1.0/libgstapplemedia.dylib"
-                    "/usr/local/lib/gstreamer-1.0/libgstde265.dylib"
-                    "/usr/local/lib/gstreamer-1.0/libgstx265.dylib"
-            DESTINATION "${plugin_dest_dir}/gstreamer-1.0" COMPONENT Runtime)
-
-    # install frei0r plugins (dependencies of gstreamer-1.0/libgstfrei0r.dylib plugin)
-    install(FILES "/usr/local/Cellar/frei0r/1.7.0/lib/frei0r-1/lissajous0r.so"
-                  "/usr/local/Cellar/frei0r/1.7.0/lib/frei0r-1/rgbnoise.so"
-            DESTINATION "${plugin_dest_dir}/frei0r-1" COMPONENT Runtime)
-
-
-    # ICU DATA LIB GST dependency : undocumented and hacked here : seems to work
-#    install(FILES "${ICU_LINK_LIBRARIES}" DESTINATION "${plugin_dest_dir}/gstreamer-1.0" COMPONENT Runtime)
-    install(FILES "/usr/local/Cellar/icu4c/69.1/lib/libicudata.69.1.dylib" DESTINATION "${plugin_dest_dir}/gstreamer-1.0" RENAME "libicudata.69.dylib" COMPONENT Runtime)
-    message(STATUS "install  ${ICU_LINK_LIBRARIES} from ${ICU_LIBRARY_DIRS}")
-
-    # package runtime fixup bundle
-    set(APPS "\${CMAKE_INSTALL_PREFIX}/vimix.app")
-    install(CODE "
-            file(GLOB_RECURSE GSTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/gstreamer-1.0/*.dylib\")
-            list(APPEND LIBS_PATH \"\${ICU_LIBRARY_DIRS}\")
-            include(BundleUtilities)
-            set(BU_CHMOD_BUNDLE_ITEMS TRUE)
-            fixup_bundle(\"${APPS}\" \"\${GSTPLUGINS}\" \"${LIBS_PATH}\")
-            "
-            COMPONENT Runtime
-    )
-
-    set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/osx/entitlements.plist")
-    set(APPLE_CODESIGN_IDENTITY "" CACHE STRING "")
-    string(LENGTH "${APPLE_CODESIGN_IDENTITY}" APPLE_CODESIGN_IDENTITY_LENGHT)
-    if( ${APPLE_CODESIGN_IDENTITY_LENGHT} LESS 40 )
-        message(STATUS "Not signing bundle. Specify APPLE_CODESIGN_IDENTITY to cmake before running cpack to sign")
-    else()
-        install(CODE "
-                execute_process(COMMAND
-                codesign --verbose=4 --deep --force
-                --entitlements \"${APPLE_CODESIGN_ENTITLEMENTS}\"
-                --sign \"${APPLE_CODESIGN_IDENTITY}\"
-                \"${APPS}\" )
-                "
-                COMPONENT Runtime
-        )
-    endif()
-
-#    # package runtime fixup bundle and codesign
-#    set(BUNDLE_NAME "vimix.app")
-#    set(BUNDLE_LIBS_DIR "${plugin_dest_dir}/gstreamer-1.0")
-#    set(BUNDLE_DIRS "${ICU_LIBRARY_DIRS}")
-#    set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/osx/entitlements.plist")
-
-#    configure_file(cmake/modules/BundleInstall.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/BundleInstall.cmake" @ONLY)
-#    install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/BundleInstall.cmake" COMPONENT Runtime)
-
-ELSE(APPLE)
-
-    install(TARGETS ${VMIX_BINARY}
-            CONFIGURATIONS Release RelWithDebInfo
-            RUNTIME DESTINATION bin COMPONENT Runtime
-    )
-
-ENDIF(APPLE)
-
-# Package full name
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${CPACK_SYSTEM_NAME}")
+set(CPACK_STRIP_FILES TRUE)
+
+
+#####
+##### Build Application
+#####
+add_subdirectory(src)
+
 
 # To Create a package, run "cpack"
 include(CPack)

DeviceSource.cpp

@@ -1,604 +0,0 @@
-/*
- * This file is part of vimix - video live mixer
- *
- * **Copyright** (C) 2020-2021 Bruno Herbelin <bruno.herbelin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-#include <algorithm>
-#include <sstream>
-#include <glm/gtc/matrix_transform.hpp>
-
-#include <gst/pbutils/gstdiscoverer.h>
-#include <gst/pbutils/pbutils.h>
-#include <gst/gst.h>
-
-#include "DeviceSource.h"
-
-#include "defines.h"
-#include "ImageShader.h"
-#include "ImageProcessingShader.h"
-#include "Resource.h"
-#include "Decorations.h"
-#include "Stream.h"
-#include "Visitor.h"
-#include "Log.h"
-
-#ifndef NDEBUG
-#define DEVICE_DEBUG
-//#define GST_DEVICE_DEBUG
-#endif
-
-
-
-#if defined(APPLE)
-std::string gst_plugin_device = "avfvideosrc";
-std::string gst_plugin_vidcap = "avfvideosrc capture-screen=true";
-#else
-std::string gst_plugin_device = "v4l2src";
-std::string gst_plugin_vidcap = "ximagesrc";
-#endif
-
-////EXAMPLE :
-///
-//v4l2deviceprovider, udev-probed=(boolean)true,
-//device.bus_path=(string)pci-0000:00:14.0-usb-0:2:1.0,
-//sysfs.path=(string)/sys/devices/pci0000:00/0000:00:14.0/usb1/1-2/1-2:1.0/video4linux/video0,
-//device.bus=(string)usb,
-//device.subsystem=(string)video4linux,
-//device.vendor.id=(string)1bcf,
-//device.vendor.name=(string)"Sunplus\\x20IT\\x20Co\\x20",
-//device.product.id=(string)2286,
-//device.product.name=(string)"AUSDOM\ FHD\ Camera:\ AUSDOM\ FHD\ C",
-//device.serial=(string)Sunplus_IT_Co_AUSDOM_FHD_Camera,
-//device.capabilities=(string):capture:,
-//device.api=(string)v4l2,
-//device.path=(string)/dev/video0,
-//v4l2.device.driver=(string)uvcvideo,
-//v4l2.device.card=(string)"AUSDOM\ FHD\ Camera:\ AUSDOM\ FHD\ C",
-//v4l2.device.bus_info=(string)usb-0000:00:14.0-2,
-//v4l2.device.version=(uint)328748,
-//v4l2.device.capabilities=(uint)2225078273,
-//v4l2.device.device_caps=(uint)69206017;
-//Device added: AUSDOM FHD Camera: AUSDOM FHD C - v4l2src device=/dev/video0
-
-//v4l2deviceprovider, udev-probed=(boolean)true,
-//device.bus_path=(string)pci-0000:00:14.0-usb-0:4:1.0,
-//sysfs.path=(string)/sys/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.0/video4linux/video2,
-//device.bus=(string)usb,
-//device.subsystem=(string)video4linux,
-//device.vendor.id=(string)046d,
-//device.vendor.name=(string)046d,
-//device.product.id=(string)080f,
-//device.product.name=(string)"UVC\ Camera\ \(046d:080f\)",
-//device.serial=(string)046d_080f_3EA77580,
-//device.capabilities=(string):capture:,
-//device.api=(string)v4l2,
-//device.path=(string)/dev/video2,
-//v4l2.device.driver=(string)uvcvideo,
-//v4l2.device.card=(string)"UVC\ Camera\ \(046d:080f\)",
-//v4l2.device.bus_info=(string)usb-0000:00:14.0-4,
-//v4l2.device.version=(uint)328748,
-//v4l2.device.capabilities=(uint)2225078273,
-//v4l2.device.device_caps=(uint)69206017; // decimal of hexadecimal v4l code Device Caps      : 0x04200001
-//Device added: UVC Camera (046d:080f) - v4l2src device=/dev/video2
-
-std::string pipelineForDevice(GstDevice *device, uint index)
-{
-    std::ostringstream pipe;
-    const gchar *str = gst_structure_get_string(gst_device_get_properties(device), "device.api");
-
-    if (str && gst_plugin_device.find(str) != std::string::npos)
-    {
-        pipe << gst_plugin_device;
-
-#if defined(APPLE)
-        pipe << " device-index=" << index;
-#else
-        str = gst_structure_get_string(gst_device_get_properties(device), "device.path");
-        if (str)
-            pipe << " device=" << str;
-#endif
-    }
-
-    return pipe.str();
-}
-
-gboolean
-Device::callback_device_monitor (GstBus *, GstMessage * message, gpointer )
-{
-   GstDevice *device;
-   gchar *name;
-
-   switch (GST_MESSAGE_TYPE (message)) {
-     case GST_MESSAGE_DEVICE_ADDED: {
-       gst_message_parse_device_added (message, &device);
-       name = gst_device_get_display_name (device);
-
-       // ignore if already in the list
-       if ( std::find(manager().src_name_.begin(), manager().src_name_.end(), name) != manager().src_name_.end())
-        break;
-
-       manager().src_name_.push_back(name);
-#ifdef GST_DEVICE_DEBUG
-       gchar *stru = gst_structure_to_string( gst_device_get_properties(device) );
-       g_print("\nDevice %s plugged : %s\n", name, stru);
-       g_free (stru);
-#endif
-       g_free (name);
-
-       std::string p = pipelineForDevice(device, manager().src_description_.size());
-       manager().src_description_.push_back(p);
-
-       DeviceConfigSet confs = getDeviceConfigs(p);
-       manager().src_config_.push_back(confs);
-
-       manager().list_uptodate_ = false;
-
-       gst_object_unref (device);
-   }
-       break;
-     case GST_MESSAGE_DEVICE_REMOVED: {
-       gst_message_parse_device_removed (message, &device);
-       name = gst_device_get_display_name (device);
-       manager().remove(name);
-#ifdef GST_DEVICE_DEBUG
-       g_print("\nDevice %s unplugged\n", name);
-#endif
-       g_free (name);
-
-       manager().list_uptodate_ = false;
-
-       gst_object_unref (device);
-   }
-       break;
-     default:
-       break;
-   }
-
-   return G_SOURCE_CONTINUE;
-}
-
-void Device::remove(const char *device)
-{
-    std::vector< std::string >::iterator nameit   = src_name_.begin();
-    std::vector< std::string >::iterator descit   = src_description_.begin();
-    std::vector< DeviceConfigSet >::iterator coit = src_config_.begin();
-    while (nameit != src_name_.end()){
-
-        if ( (*nameit).compare(device) == 0 )
-        {
-            src_name_.erase(nameit);
-            src_description_.erase(descit);
-            src_config_.erase(coit);
-            break;
-        }
-
-        ++nameit;
-        ++descit;
-        ++coit;
-    }
-}
-
-
-Device::Device()
-{
-    GstBus *bus;
-    GstCaps *caps;
-
-    // create GStreamer device monitor to capture
-    // when a device is plugged in or out
-    monitor_ = gst_device_monitor_new ();
-
-    bus = gst_device_monitor_get_bus (monitor_);
-    gst_bus_add_watch (bus, callback_device_monitor, NULL);
-    gst_object_unref (bus);
-
-    caps = gst_caps_new_empty_simple ("video/x-raw");
-    gst_device_monitor_add_filter (monitor_, "Video/Source", caps);
-    gst_caps_unref (caps);
-
-    gst_device_monitor_set_show_all_devices(monitor_, true);
-    gst_device_monitor_start (monitor_);
-
-    // initial fill of the list
-    GList *devices = gst_device_monitor_get_devices(monitor_);
-    GList *tmp;
-    for (tmp = devices; tmp ; tmp = tmp->next ) {
-
-        GstDevice *device = (GstDevice *) tmp->data;
-
-        gchar *name = gst_device_get_display_name (device);
-        src_name_.push_back(name);
-        g_free (name);
-
-#ifdef GST_DEVICE_DEBUG
-       gchar *stru = gst_structure_to_string( gst_device_get_properties(device) );
-       g_print("\nDevice %s already plugged : %s", name, stru);
-       g_free (stru);
-#endif
-
-        std::string p = pipelineForDevice(device, src_description_.size());
-        src_description_.push_back(p);
-
-        DeviceConfigSet confs = getDeviceConfigs(p);
-        src_config_.push_back(confs);
-    }
-    g_list_free(devices);
-
-    // Add config for plugged screen
-    src_name_.push_back("Screen capture");
-    src_description_.push_back(gst_plugin_vidcap);
-
-    // Try to auto find resolution
-    DeviceConfigSet confs = getDeviceConfigs(gst_plugin_vidcap);
-    if (!confs.empty()) {
-        // fix the framerate (otherwise at 1 FPS
-        DeviceConfig best = *confs.rbegin();
-        DeviceConfigSet confscreen;
-        best.fps_numerator = 15;
-        confscreen.insert(best);
-        src_config_.push_back(confscreen);
-    }
-
-    // TODO Use lib glfw to get monitors
-    // TODO Detect auto removal of monitors
-
-    list_uptodate_ = true;
-}
-
-
-int Device::numDevices() const
-{
-    return src_name_.size();
-}
-
-bool Device::exists(const std::string &device) const
-{
-    std::vector< std::string >::const_iterator d = std::find(src_name_.begin(), src_name_.end(), device);
-    return d != src_name_.end();
-}
-
-struct hasDevice: public std::unary_function<DeviceSource*, bool>
-{
-    inline bool operator()(const DeviceSource* elem) const {
-       return (elem && elem->device() == _d);
-    }
-    explicit hasDevice(const std::string &d) : _d(d) { }
-private:
-    std::string _d;
-};
-
-Source *Device::createSource(const std::string &device) const
-{
-    Source *s = nullptr;
-
-    // find if a DeviceSource with this device is already registered
-    std::list< DeviceSource *>::const_iterator d = std::find_if(device_sources_.begin(), device_sources_.end(), hasDevice(device));
-
-    // if already registered, clone the device source
-    if ( d != device_sources_.end())  {
-        CloneSource *cs = (*d)->clone();
-        s = cs;
-    }
-    // otherwise, we are free to create a new device source
-    else {
-        DeviceSource *ds = new DeviceSource();
-        ds->setDevice(device);
-        s = ds;
-    }
-
-    return s;
-}
-
-bool Device::unplugged(const std::string &device) const
-{
-    if (list_uptodate_)
-        return false;
-    return !exists(device);
-}
-
-std::string Device::name(int index) const
-{
-    if (index > -1 && index < (int) src_name_.size())
-        return src_name_[index];
-    else
-        return "";
-}
-
-std::string Device::description(int index) const
-{
-    if (index > -1 && index < (int) src_description_.size())
-        return src_description_[index];
-    else
-        return "";
-}
-
-DeviceConfigSet Device::config(int index) const
-{
-    if (index > -1 && index < (int) src_config_.size())
-        return src_config_[index];
-    else
-        return DeviceConfigSet();
-}
-
-int  Device::index(const std::string &device) const
-{
-    int i = -1;
-    std::vector< std::string >::const_iterator p = std::find(src_name_.begin(), src_name_.end(), device);
-    if (p != src_name_.end())
-        i = std::distance(src_name_.begin(), p);
-
-    return i;
-}
-
-DeviceSource::DeviceSource(uint64_t id) : StreamSource(id)
-{
-    // create stream
-    stream_ = new Stream;
-
-    // set symbol
-    symbol_ = new Symbol(Symbol::CAMERA, glm::vec3(0.75f, 0.75f, 0.01f));
-    symbol_->scale_.y = 1.5f;
-}
-
-DeviceSource::~DeviceSource()
-{
-    // unregister this device source
-    Device::manager().device_sources_.remove(this);
-}
-
-void DeviceSource::setDevice(const std::string &devicename)
-{
-    device_ = devicename;
-
-    int index = Device::manager().index(device_);
-    if (index > -1) {
-
-        // register this device source
-        Device::manager().device_sources_.push_back(this);
-
-        // start filling in the gstreamer pipeline
-        std::ostringstream pipeline;
-        pipeline << Device::manager().description(index);
-
-        // test the device and get config
-        DeviceConfigSet confs = Device::manager().config(index);        
-#ifdef DEVICE_DEBUG
-        Log::Info("Device %s supported configs:", devicename.c_str());
-        for( DeviceConfigSet::iterator it = confs.begin(); it != confs.end(); ++it ){
-            float fps = static_cast<float>((*it).fps_numerator) / static_cast<float>((*it).fps_denominator);
-            Log::Info(" - %s %s %d x %d  %.1f fps", (*it).stream.c_str(), (*it).format.c_str(), (*it).width, (*it).height, fps);
-        }
-#endif
-        DeviceConfig best = *confs.rbegin();
-        float fps = static_cast<float>(best.fps_numerator) / static_cast<float>(best.fps_denominator);
-        Log::Info("Device %s selected its optimal config: %s %s %dx%d@%.1ffps", device_.c_str(), best.stream.c_str(), best.format.c_str(), best.width, best.height, fps);
-
-        pipeline << " ! " << best.stream;
-        if (!best.format.empty())
-            pipeline << ",format=" << best.format;
-        pipeline << ",framerate=" << best.fps_numerator << "/" << best.fps_denominator;
-        pipeline << ",width=" << best.width;
-        pipeline << ",height=" << best.height;
-
-        if ( best.stream.find("jpeg") != std::string::npos )
-            pipeline << " ! jpegdec";
-
-        if ( device_.find("Screen") != std::string::npos )
-            pipeline << " ! videoconvert ! video/x-raw,format=RGB ! queue max-size-buffers=3";
-
-        pipeline << " ! videoconvert";
-
-        // resize render buffer
-        if (renderbuffer_)
-            renderbuffer_->resize(best.width, best.height);
-
-        // open gstreamer
-        stream_->open( pipeline.str(), best.width, best.height);
-        stream_->play(true);
-
-        // will be ready after init and one frame rendered
-        ready_ = false;
-    }
-    else
-        Log::Warning("No such device '%s'", device_.c_str());
-}
-
-void DeviceSource::accept(Visitor& v)
-{
-    Source::accept(v);
-    if (!failed())
-        v.visit(*this);
-}
-
-bool DeviceSource::failed() const
-{
-    return stream_->failed() || Device::manager().unplugged(device_);
-}
-
-DeviceConfigSet Device::getDeviceConfigs(const std::string &src_description)
-{
-    DeviceConfigSet configs;
-
-    // create dummy pipeline to be tested
-    std::string description = src_description;
-    description += " name=devsrc ! fakesink name=sink";
-
-    // parse pipeline descriptor
-    GError *error = NULL;
-    GstElement *pipeline_ = gst_parse_launch (description.c_str(), &error);
-    if (error != NULL) {
-        Log::Warning("DeviceSource Could not construct test pipeline %s:\n%s", description.c_str(), error->message);
-        g_clear_error (&error);
-        return configs;
-    }
-
-    // get the pipeline element named "devsrc" from the Device class
-    GstElement *elem = gst_bin_get_by_name (GST_BIN (pipeline_), "devsrc");
-    if (elem) {
-
-        // initialize the pipeline
-        GstStateChangeReturn ret = gst_element_set_state (pipeline_, GST_STATE_PAUSED);
-        if (ret != GST_STATE_CHANGE_FAILURE) {
-
-            // get the first pad and its content
-            GstIterator *iter = gst_element_iterate_src_pads(elem);
-            GValue vPad = G_VALUE_INIT;
-            GstPad* pad_ret = NULL;
-            if (gst_iterator_next(iter, &vPad) == GST_ITERATOR_OK)
-            {
-                pad_ret = GST_PAD(g_value_get_object(&vPad));
-                GstCaps *device_caps = gst_pad_query_caps (pad_ret, NULL);
-
-                // loop over all caps offered by the pad
-                int C = gst_caps_get_size(device_caps);
-                for (int c = 0; c < C; ++c) {
-                    // get GST cap
-                    GstStructure *decice_cap_struct = gst_caps_get_structure (device_caps, c);
-#ifdef GST_DEVICE_DEBUG
-                    gchar *capstext = gst_structure_to_string (decice_cap_struct);
-                    g_print("\nDevice caps: %s", capstext);
-                    g_free(capstext);
-#endif
-
-                    // fill our config
-                    DeviceConfig config;
-
-                    // not managing opengl texture-target types
-                    // TODO: support input devices texture-target video/x-raw(memory:GLMemory) for improved pipeline
-                    if ( gst_structure_has_field (decice_cap_struct, "texture-target"))
-                        continue;
-
-                    // NAME : typically video/x-raw or image/jpeg
-                    config.stream = gst_structure_get_name (decice_cap_struct);
-
-                    // FORMAT : typically BGRA or YUVY
-                    if ( gst_structure_has_field (decice_cap_struct, "format")) {
-                        // get generic value
-                        const GValue *val = gst_structure_get_value(decice_cap_struct, "format");
-
-                        // if its a list of format string
-                        if ( GST_VALUE_HOLDS_LIST(val)) {
-                            int N = gst_value_list_get_size(val);
-                            for (int n = 0; n < N; n++ ){
-                                std::string f = gst_value_serialize( gst_value_list_get_value(val, n) );
-
-                                // preference order : 1) RGBx, 2) JPEG, 3) ALL OTHER
-                                // select f if it contains R (e.g. for RGBx) and not already RGB in config
-                                if ( (f.find("R") != std::string::npos) && (config.format.find("R") == std::string::npos ) ) {
-                                    config.format = f;
-                                    break;
-                                }
-                                // default, take at least one if nothing yet in config
-                                else if ( config.format.empty() )
-                                    config.format = f;
-                            }
-
-                        }
-                        // single format
-                        else {
-                            config.format = gst_value_serialize(val);
-                        }
-                    }
-
-                    // FRAMERATE : can be a fraction of a list of fractions
-                    if ( gst_structure_has_field (decice_cap_struct, "framerate")) {
-
-                        // get generic value
-                        const GValue *val = gst_structure_get_value(decice_cap_struct, "framerate");
-                        // if its a single fraction
-                        if ( GST_VALUE_HOLDS_FRACTION(val)) {
-                            config.fps_numerator = gst_value_get_fraction_numerator(val);
-                            config.fps_denominator= gst_value_get_fraction_denominator(val);
-                        }
-                        // if its a range of fraction; take the max
-                        else if ( GST_VALUE_HOLDS_FRACTION_RANGE(val)) {
-                            config.fps_numerator = gst_value_get_fraction_numerator(gst_value_get_fraction_range_max(val));
-                            config.fps_denominator= gst_value_get_fraction_denominator(gst_value_get_fraction_range_max(val));
-                        }
-                        // deal otherwise with a list of fractions; find the max
-                        else if ( GST_VALUE_HOLDS_LIST(val)) {
-                            gdouble fps_max = 1.0;
-                            // loop over all fractions
-                            int N = gst_value_list_get_size(val);
-                            for (int i = 0; i < N; ++i ){
-                                const GValue *frac = gst_value_list_get_value(val, i);
-                                // read one fraction in the list
-                                if ( GST_VALUE_HOLDS_FRACTION(frac)) {
-                                    int n = gst_value_get_fraction_numerator(frac);
-                                    int d = gst_value_get_fraction_denominator(frac);
-                                    // keep only the higher FPS
-                                    gdouble f = 1.0;
-                                    gst_util_fraction_to_double( n, d, &f );
-                                    if ( f > fps_max ) {
-                                        config.fps_numerator = n;
-                                        config.fps_denominator = d;
-                                        fps_max = f;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // WIDTH and HEIGHT
-                    if ( gst_structure_has_field (decice_cap_struct, "width"))
-                        gst_structure_get_int (decice_cap_struct, "width", &config.width);
-                    if ( gst_structure_has_field (decice_cap_struct, "height"))
-                        gst_structure_get_int (decice_cap_struct, "height", &config.height);
-
-
-                    // add this config
-                    configs.insert(config);
-                }
-
-            }
-            gst_iterator_free(iter);
-
-            // terminate pipeline
-            gst_element_set_state (pipeline_, GST_STATE_NULL);
-        }
-
-        g_object_unref (elem);
-    }
-
-    gst_object_unref (pipeline_);
-
-    return configs;
-}
-
-
-glm::ivec2 DeviceSource::icon() const
-{
-    if ( device_.find("Screen") != std::string::npos )
-        return glm::ivec2(ICON_SOURCE_DEVICE_SCREEN);
-    else
-        return glm::ivec2(ICON_SOURCE_DEVICE);
-}
-
-std::string DeviceSource::info() const
-{
-    return std::string("device '") + device_ + "'";
-}
-
-
-
-
-
-
-
-
-
-

FileDialog.h

@@ -1,112 +0,0 @@
-#ifndef __IMGUI_FILE_DIALOG_H_
-#define __IMGUI_FILE_DIALOG_H_
-
-#include "imgui.h"
-
-#include <vector>
-#include <string>
-#include <map>
-#include <future>
-#include <functional>
-
-#define MAX_FILE_DIALOG_NAME_BUFFER 1024
-
-struct FileInfoStruct
-{
-	char type = ' ';
-	std::string filePath;
-	std::string fileName;
-	std::string ext;
-};
-
-class FileDialog
-{
-private:
-	std::vector<FileInfoStruct> m_FileList;
-	std::map<std::string, ImVec4> m_FilterColor;
-	std::string m_SelectedFileName;
-	std::string m_SelectedExt;
-	std::string m_CurrentPath;
-	std::vector<std::string> m_CurrentPath_Decomposition;
-	std::string m_Name;
-	bool m_ShowDialog;
-	bool m_ShowDrives;
-
-public:
-	static char FileNameBuffer[MAX_FILE_DIALOG_NAME_BUFFER];
-	static char DirectoryNameBuffer[MAX_FILE_DIALOG_NAME_BUFFER];
-	static char SearchBuffer[MAX_FILE_DIALOG_NAME_BUFFER];
-	static int FilterIndex;
-	bool IsOk;
-	bool m_AnyWindowsHovered;
-	bool m_CreateDirectoryMode;
-
-private:
-	std::string dlg_key;
-	std::string dlg_name;
-	const char *dlg_filters;
-	std::string dlg_path;
-	std::string dlg_defaultFileName;
-	std::string dlg_defaultExt;
-	std::function<void(std::string, bool*)> dlg_optionsPane;
-	size_t dlg_optionsPaneWidth;
-	std::string searchTag;
-	std::string dlg_userString;
-
-public:
-	static FileDialog* Instance()
-	{
-		static FileDialog *_instance = new FileDialog();
-		return _instance;
-	}
-
-    static void RenderCurrent();
-    // Open an Open File dialog for TEXT file
-    static void SetCurrentOpenText();
-    // Open an Open File dialog for IMAGE file
-    static void SetCurrentOpenImage();
-    // Open an Open File dialog for MEDIA file
-    static void SetCurrentOpenMedia();
-
-protected:
-
-	FileDialog(); // Prevent construction
-    FileDialog(const FileDialog&) = delete; // Prevent construction by copying
-    FileDialog& operator =(const FileDialog&) = delete; // Prevent assignment
-	~FileDialog(); // Prevent unwanted destruction
-
-public:
-	void OpenDialog(const std::string& vKey, const char* vName, const char* vFilters,
-		const std::string& vPath, const std::string& vDefaultFileName,
-		std::function<void(std::string, bool*)> vOptionsPane, size_t vOptionsPaneWidth = 250, const std::string& vUserString = "");
-	void OpenDialog(const std::string& vKey, const char* vName, const char* vFilters,
-		const std::string& vDefaultFileName,
-		std::function<void(std::string, bool*)> vOptionsPane, size_t vOptionsPaneWidth = 250, const std::string& vUserString = "");
-	void OpenDialog(const std::string& vKey, const char* vName, const char* vFilters,
-		const std::string& vPath, const std::string& vDefaultFileName, const std::string& vUserString = "");
-	void OpenDialog(const std::string& vKey, const char* vName, const char* vFilters,
-		const std::string& vFilePathName, const std::string& vUserString = "");
-
-	void CloseDialog(const std::string& vKey);
-	bool Render(const std::string& vKey, ImVec2 geometry);
-	std::string GetFilepathName();
-	std::string GetCurrentPath();
-	std::string GetCurrentFileName();
-	std::string GetCurrentFilter();
-	std::string GetUserString();
-
-    void SetFilterColor(const std::string &vFilter, ImVec4 vColor);
-    bool GetFilterColor(const std::string &vFilter, ImVec4 *vColor);
-    void ClearFilterColor();
-
-private:
-	void SetPath(const std::string& vPath);
-	void ScanDir(const std::string& vPath);
-	void SetCurrentDir(const std::string& vPath);
-	bool CreateDir(const std::string& vPath);
-	void ComposeNewPath(std::vector<std::string>::iterator vIter);
-	void GetDrives();
-};
-
-
-#endif // __IMGUI_FILE_DIALOG_H_

GarbageVisitor.cpp

@@ -1,103 +0,0 @@
-/*
- * This file is part of vimix - Live video mixer
- *
- * **Copyright** (C) 2020-2021 Bruno Herbelin <bruno.herbelin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-#include <algorithm>
-
-#include "Log.h"
-#include "Scene.h"
-#include "GarbageVisitor.h"
-
-
-GarbageVisitor::GarbageVisitor(Node *nodetocollect) : Visitor()
-{
-    targets_.push_front(nodetocollect);
-    current_ = nullptr;
-    found_ = false;
-}
-
-GarbageVisitor::GarbageVisitor(Source *sourcetocollect) : Visitor()
-{
-    targets_.push_front(sourcetocollect->group(View::MIXING));
-    targets_.push_front(sourcetocollect->group(View::GEOMETRY));
-    targets_.push_front(sourcetocollect->group(View::RENDERING));
-    current_ = nullptr;
-    found_ = false;
-}
-
-
-void GarbageVisitor::visit(Node &n)
-{
-    // found the target
-//    if (n.id() == target_->id())
-//    if ( &n == target_ )
-    if ( std::count(targets_.begin(), targets_.end(), &n) )
-    {
-        // end recursive
-        found_ = true;
-
-        // take the node out of the Tree
-        if (current_)
-            current_->detach(&n);
-
-    }
-
-}
-
-GarbageVisitor::~GarbageVisitor()
-{
-    // actually delete the Node
-
-}
-
-
-void GarbageVisitor::visit(Group &n)
-{
-    // no need to go further if the node was found (or is this group)
-    if (found_)
-        return;
-
-    // current group
-    current_ = &n;
-
-    // loop over members of a group
-    // and stop when found
-    for (NodeSet::iterator node = n.begin(); !found_ && node != n.end(); ++node) {
-        // visit the child node
-        (*node)->accept(*this);
-        // un-stack recursive browsing
-        current_ = &n;
-    }
-
-}
-
-void GarbageVisitor::visit(Scene &n)
-{
-    n.root()->accept(*this);
-}
-
-void GarbageVisitor::visit(Switch &n)
-{
-
-}
-
-void GarbageVisitor::visit(Primitive &n)
-{
-
-}
-

GarbageVisitor.h

@@ -1,29 +0,0 @@
-#ifndef GARBAGEVISITOR_H
-#define GARBAGEVISITOR_H
-
-#include <list>
-
-#include "Source.h"
-#include "Visitor.h"
-
-
-class GarbageVisitor : public Visitor
-{
-    Group *current_;
-    std::list<Node *> targets_;
-    bool found_;
-
-public:
-    GarbageVisitor(Source *sourcetocollect);
-    GarbageVisitor(Node *nodetocollect);
-    ~GarbageVisitor();
-
-    void visit(Scene& n) override;
-    void visit(Node& n) override;
-    void visit(Group& n) override;
-    void visit(Switch& n) override;
-    void visit(Primitive& n) override;
-
-};
-
-#endif // GARBAGEVISITOR_H

ImGuiVisitor.cpp

@@ -1,875 +0,0 @@
-/*
- * This file is part of vimix - video live mixer
- *
- * **Copyright** (C) 2020-2021 Bruno Herbelin <bruno.herbelin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-
-#include <vector>
-#include <algorithm>
-#include <sstream>
-#include <iomanip>
-
-#include <glm/glm.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtc/constants.hpp>
-#include <glm/gtc/matrix_access.hpp>
-
-#include <tinyxml2.h>
-#include "tinyxml2Toolkit.h"
-
-#include "defines.h"
-#include "Log.h"
-#include "Scene.h"
-#include "Primitives.h"
-#include "ImageShader.h"
-#include "ImageProcessingShader.h"
-#include "MediaPlayer.h"
-#include "MediaSource.h"
-#include "SessionSource.h"
-#include "PatternSource.h"
-#include "DeviceSource.h"
-#include "NetworkSource.h"
-#include "MultiFileSource.h"
-#include "SessionCreator.h"
-#include "SessionVisitor.h"
-#include "Settings.h"
-#include "Mixer.h"
-#include "ActionManager.h"
-
-#include "imgui.h"
-#include "ImGuiToolkit.h"
-#include "BaseToolkit.h"
-#include "UserInterfaceManager.h"
-#include "SystemToolkit.h"
-
-#include "ImGuiVisitor.h"
-
-ImGuiVisitor::ImGuiVisitor()
-{
-
-}
-
-void ImGuiVisitor::visit(Node &)
-{
-
-}
-
-void ImGuiVisitor::visit(Group &n)
-{
-    // MODEL VIEW
-    ImGui::PushID(std::to_string(n.id()).c_str());
-
-    if (ImGuiToolkit::ButtonIcon(1, 16)) {
-        n.translation_.x = 0.f;
-        n.translation_.y = 0.f;
-        n.rotation_.z = 0.f;
-        n.scale_.x = 1.f;
-        n.scale_.y = 1.f;
-        Action::manager().store("Geometry Reset");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Geometry");
-
-    if (ImGuiToolkit::ButtonIcon(6, 15)) {
-        n.translation_.x = 0.f;
-        n.translation_.y = 0.f;
-        Action::manager().store("Position 0.0, 0.0");
-    }
-    ImGui::SameLine(0, 10);
-    float translation[2] = { n.translation_.x, n.translation_.y};
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    if ( ImGui::SliderFloat2("Position", translation, -5.0, 5.0) )
-    {
-        n.translation_.x = translation[0];
-        n.translation_.y = translation[1];
-    }
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Position " << std::setprecision(3) << n.translation_.x << ", " << n.translation_.y;
-        Action::manager().store(oss.str());
-    }
-    if (ImGuiToolkit::ButtonIcon(3, 15))  {
-        n.scale_.x = 1.f;
-        n.scale_.y = 1.f;
-        Action::manager().store("Scale 1.0 x 1.0");
-    }
-    ImGui::SameLine(0, 10);
-    float scale[2] = { n.scale_.x, n.scale_.y} ;
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    if ( ImGui::SliderFloat2("Scale", scale, -MAX_SCALE, MAX_SCALE, "%.2f") )
-    {
-        n.scale_.x = CLAMP_SCALE(scale[0]);
-        n.scale_.y = CLAMP_SCALE(scale[1]);
-    }
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Scale " << std::setprecision(3) << n.scale_.x << " x " << n.scale_.y;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(18, 9)){
-        n.rotation_.z = 0.f;
-        Action::manager().store("Angle 0.0");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderAngle("Angle", &(n.rotation_.z), -180.f, 180.f) ;
-    if (ImGui::IsItemDeactivatedAfterEdit()) {
-        std::ostringstream oss;
-        oss << "Angle " << std::setprecision(3) << n.rotation_.z * 180.f / M_PI;
-        Action::manager().store(oss.str());
-    }
-
-
-    ImGui::PopID();
-
-    // spacing
-    ImGui::Spacing();
-}
-
-void ImGuiVisitor::visit(Switch &n)
-{
-    if (n.numChildren()>0)
-        n.activeChild()->accept(*this);
-}
-
-void ImGuiVisitor::visit(Scene &n)
-{
-    ImGui::SetNextItemOpen(true, ImGuiCond_Once);
-    if (ImGui::CollapsingHeader("Scene Property Tree"))
-    {
-        n.root()->accept(*this);
-    }
-}
-
-void ImGuiVisitor::visit(Primitive &n)
-{
-    ImGui::PushID(std::to_string(n.id()).c_str());
-    ImGui::Text("Primitive %d");
-
-    n.shader()->accept(*this);
-
-    ImGui::PopID();
-}
-
-void ImGuiVisitor::visit(FrameBufferSurface &)
-{
-    ImGui::Text("Framebuffer");
-}
-
-void ImGuiVisitor::visit(MediaPlayer &)
-{
-    ImGui::Text("Media Player");
-}
-
-void ImGuiVisitor::visit(Shader &n)
-{
-    ImGui::PushID(std::to_string(n.id()).c_str());
-
-    // Base color
-//    if (ImGuiToolkit::ButtonIcon(10, 2)) {
-//        n.blending = Shader::BLEND_OPACITY;
-//        n.color = glm::vec4(1.f, 1.f, 1.f, 1.f);
-//    }
-//    ImGui::SameLine(0, 10);
-//    ImGui::ColorEdit3("Color", glm::value_ptr(n.color), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel ) ;
-//    ImGui::SameLine(0, 5);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    int mode = n.blending;
-    if (ImGui::Combo("Blending", &mode, "Normal\0Screen\0Subtract\0Multiply\0Soft light"
-                     "\0Hard light\0Soft subtract\0Lighten only\0") ) {
-        n.blending = Shader::BlendMode(mode);
-
-        std::ostringstream oss;
-        oss << "Blending ";
-        switch(n.blending) {
-        case Shader::BLEND_OPACITY:
-            oss<<"Normal";
-            break;
-        case Shader::BLEND_SCREEN:
-            oss<<"Screen";
-            break;
-        case Shader::BLEND_SUBTRACT:
-            oss<<"Subtract";
-            break;
-        case Shader::BLEND_MULTIPLY:
-            oss<<"Multiply";
-            break;
-        case Shader::BLEND_HARD_LIGHT:
-            oss<<"Hard light";
-            break;
-        case Shader::BLEND_SOFT_LIGHT:
-            oss<<"Soft light";
-            break;
-        case Shader::BLEND_SOFT_SUBTRACT:
-            oss<<"Soft subtract";
-            break;
-        case Shader::BLEND_LIGHTEN_ONLY:
-            oss<<"Lighten only";
-            break;
-        case Shader::BLEND_NONE:
-            oss<<"None";
-            break;
-        }
-        Action::manager().store(oss.str());
-    }
-
-    ImGui::PopID();
-}
-
-//void ImGuiVisitor::visit(ImageShader &n)
-//{
-//    ImGui::PushID(std::to_string(n.id()).c_str());
-//    // get index of the mask used in this ImageShader
-//    int item_current = n.mask;
-////    if (ImGuiToolkit::ButtonIcon(10, 3)) n.mask = 0;
-////    ImGui::SameLine(0, 10);
-//    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-//    // combo list of masks
-//    if ( ImGui::Combo("Mask", &item_current, ImageShader::mask_names, IM_ARRAYSIZE(ImageShader::mask_names) ) )
-//    {
-//        if (item_current < (int) ImageShader::mask_presets.size())
-//            n.mask = item_current;
-//        else {
-//            // TODO ask for custom mask
-//        }
-//        Action::manager().store("Mask "+ std::string(ImageShader::mask_names[n.mask]));
-//    }
-//    ImGui::PopID();
-//}
-
-void ImGuiVisitor::visit(ImageProcessingShader &n)
-{
-    ImGui::PushID(std::to_string(n.id()).c_str());
-
-    ImGuiToolkit::Icon(6, 2);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Filters");
-
-    if (ImGuiToolkit::ButtonIcon(6, 4)) {
-        n.gamma = glm::vec4(1.f, 1.f, 1.f, 1.f);
-        Action::manager().store("Gamma & Color");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::ColorEdit3("Gamma Color", glm::value_ptr(n.gamma), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel) ;
-    if (ImGui::IsItemDeactivatedAfterEdit())
-        Action::manager().store("Gamma Color changed");
-
-    ImGui::SameLine(0, 5);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderFloat("Gamma", &n.gamma.w, 0.5f, 10.f, "%.2f", 2.f);
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Gamma " << std::setprecision(2) << n.gamma.w;
-        Action::manager().store(oss.str());
-    }
-
-//    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-//    ImGui::SliderFloat4("Levels", glm::value_ptr(n.levels), 0.0, 1.0);
-
-    if (ImGuiToolkit::ButtonIcon(5, 16)) {
-        n.brightness = 0.f;
-        n.contrast = 0.f;
-        Action::manager().store("B & C  0.0 0.0");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    float bc[2] = { n.brightness, n.contrast};
-    if ( ImGui::SliderFloat2("B & C", bc, -1.0, 1.0) )
-    {
-        n.brightness = bc[0];
-        n.contrast = bc[1];
-    }
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "B & C  " << std::setprecision(2) << n.brightness << " " << n.contrast;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(9, 16)) {
-        n.saturation = 0.f;
-        Action::manager().store("Saturation 0.0");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderFloat("Saturation", &n.saturation, -1.0, 1.0);
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Saturation " << std::setprecision(2) << n.saturation;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(12, 4)) {
-        n.hueshift = 0.f;
-        Action::manager().store("Hue shift 0.0");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderFloat("Hue shift", &n.hueshift, 0.0, 1.0);
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Hue shift " << std::setprecision(2) << n.hueshift;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(18, 1)) {
-        n.nbColors = 0;
-        Action::manager().store("Posterize None");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderInt("Posterize", &n.nbColors, 0, 16, n.nbColors == 0 ? "None" : "%d colors");
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Posterize ";
-        if (n.nbColors == 0) oss << "None"; else oss << n.nbColors;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(8, 1)) {
-        n.threshold = 0.f;
-        Action::manager().store("Threshold None");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderFloat("Threshold", &n.threshold, 0.0, 1.0, n.threshold < 0.001 ? "None" : "%.2f");
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Threshold ";
-        if (n.threshold < 0.001) oss << "None"; else oss << std::setprecision(2) << n.threshold;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(3, 1)) {
-        n.lumakey = 0.f;
-        Action::manager().store("Lumakey 0.0");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderFloat("Lumakey", &n.lumakey, 0.0, 1.0);
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Lumakey " << std::setprecision(2) << n.lumakey;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(13, 4)) {
-        n.chromakey = glm::vec4(0.f, 0.8f, 0.f, 1.f);
-        n.chromadelta = 0.f;
-        Action::manager().store("Chromakey & Color Reset");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::ColorEdit3("Chroma color", glm::value_ptr(n.chromakey), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel  ) ;    
-    if (ImGui::IsItemDeactivatedAfterEdit())
-        Action::manager().store("Chroma color changed");
-    ImGui::SameLine(0, 5);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderFloat("Chromakey", &n.chromadelta, 0.0, 1.0, n.chromadelta < 0.001 ? "None" : "Tolerance %.2f");
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << "Chromakey ";
-        if (n.chromadelta < 0.001) oss << "None"; else oss << std::setprecision(2) << n.chromadelta;
-        Action::manager().store(oss.str());
-    }
-
-    if (ImGuiToolkit::ButtonIcon(6, 16)) {
-        n.invert = 0;
-        Action::manager().store("Invert None");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    if (ImGui::Combo("Invert", &n.invert, "None\0Invert Color\0Invert Luminance\0"))
-        Action::manager().store("Invert " + std::string(n.invert<1 ? "None": (n.invert>1 ? "Luminance" : "Color")));
-
-    if (ImGuiToolkit::ButtonIcon(1, 7)) {
-        n.filterid = 0;
-        Action::manager().store("Filter None");
-    }
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    if (ImGui::Combo("Filter", &n.filterid, ImageProcessingShader::filter_names, IM_ARRAYSIZE(ImageProcessingShader::filter_names) ) )
-        Action::manager().store("Filter " + std::string(ImageProcessingShader::filter_names[n.filterid]));
-
-    ImGui::PopID();
-
-    ImGui::Spacing();
-}
-
-void ImGuiVisitor::visit (Source& s)
-{
-    ImGui::PushID(std::to_string(s.id()).c_str());
-    // blending
-    s.blendingShader()->accept(*this);
-
-    // preview
-    float preview_width = ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN;
-    float preview_height = 4.5f * ImGui::GetFrameHeightWithSpacing();
-    ImVec2 pos = ImGui::GetCursorPos(); // remember where we were...
-
-    float space = ImGui::GetStyle().ItemSpacing.y;
-    float width = preview_width;
-    float height = s.frame()->projectionArea().y * width / ( s.frame()->projectionArea().x * s.frame()->aspectRatio());
-    if (height > preview_height - space) {
-        height = preview_height - space;
-        width = height * s.frame()->aspectRatio() * ( s.frame()->projectionArea().x / s.frame()->projectionArea().y);
-    }
-    // centered image
-    ImGui::SetCursorPos( ImVec2(pos.x + 0.5f * (preview_width-width), pos.y + 0.5f * (preview_height-height-space)) );
-    ImGui::Image((void*)(uintptr_t) s.frame()->texture(), ImVec2(width, height));
-
-    // inform on visibility status
-    ImGui::SetCursorPos( ImVec2(preview_width + 20, pos.y ) );
-    if (s.active()) {
-        if (s.blendingShader()->color.a > 0.f)
-            ImGuiToolkit::HelpMarker("Visible", ICON_FA_EYE);
-        else
-            ImGuiToolkit::HelpMarker("Not visible", ICON_FA_EYE_SLASH);
-    }
-    else
-        ImGuiToolkit::HelpMarker("Inactive", ICON_FA_SNOWFLAKE);
-
-    // Inform on workspace
-    ImGui::SetCursorPos( ImVec2(preview_width + 20, pos.y + ImGui::GetFrameHeightWithSpacing()) );
-    if (s.workspace() == Source::BACKGROUND)
-        ImGuiToolkit::HelpIcon("in Background",10, 16);
-    else if (s.workspace() == Source::FOREGROUND)
-        ImGuiToolkit::HelpIcon("in Foreground",12, 16);
-    else
-        ImGuiToolkit::HelpIcon("in Workspace",11, 16);
-
-    // locking
-    ImGui::SetCursorPos( ImVec2(preview_width + 20, pos.y + 2.f * ImGui::GetFrameHeightWithSpacing()) );
-    const char *tooltip[2] = {"Unlocked", "Locked"};
-    bool l = s.locked();
-    if (ImGuiToolkit::IconToggle(15,6,17,6, &l, tooltip ) ) {
-        s.setLocked(l);
-        if (l) {
-            Mixer::selection().clear();
-            Action::manager().store(s.name() + std::string(": lock."));
-        }
-        else {
-            Mixer::selection().set(&s);
-            Action::manager().store(s.name() + std::string(": unlock."));
-        }
-    }
-
-    // toggle enable/disable image processing
-    bool on = s.imageProcessingEnabled();
-    ImGui::SetCursorPos( ImVec2(preview_width + 15, pos.y + 3.5f * ImGui::GetFrameHeightWithSpacing()) );
-    if ( ImGuiToolkit::ButtonIconToggle(6, 2, 6, 2, &on, "Filters") ){
-        std::ostringstream oss;
-        oss << s.name() << ": " << ( on ? "Enable Filter" : "Disable Filter");
-        Action::manager().store(oss.str());
-    }
-    s.setImageProcessingEnabled(on);
-
-    // image processing pannel
-    if (s.imageProcessingEnabled()) {
-
-        // menu icon for image processing
-        ImGui::SetCursorPos( ImVec2( preview_width - ImGui::GetTextLineHeight(), pos.y + 4.5f * ImGui::GetFrameHeightWithSpacing())); // ...come back
-        if (ImGuiToolkit::IconButton(5, 8))
-            ImGui::OpenPopup( "MenuImageProcessing" );
-        if (ImGui::BeginPopup( "MenuImageProcessing" ))
-        {
-            if (s.processingshader_link_.connected()) {
-                if (ImGui::MenuItem( "Unfollow" )){
-                    s.processingshader_link_.disconnect();
-                }
-            }
-            else {
-                if (ImGui::MenuItem("Reset" )){
-                    ImageProcessingShader defaultvalues;
-                    s.processingShader()->copy(defaultvalues);
-                    s.processingshader_link_.disconnect();
-                    std::ostringstream oss;
-                    oss << s.name() << ": " << "Reset Filter";
-                    Action::manager().store(oss.str());
-                }
-                if (ImGui::MenuItem("Copy" )){
-                    std::string clipboard = SessionVisitor::getClipboard(s.processingShader());
-                    if (!clipboard.empty())
-                        ImGui::SetClipboardText(clipboard.c_str());
-                }
-                const char *clipboard = ImGui::GetClipboardText();
-                const bool can_paste = (clipboard != nullptr && SessionLoader::isClipboard(clipboard));
-                if (ImGui::MenuItem("Paste", NULL, false, can_paste)) {
-                    SessionLoader::applyImageProcessing(s, clipboard);
-                    std::ostringstream oss;
-                    oss << s.name() << ": " << "Change Filter";
-                    Action::manager().store(oss.str());
-                }
-//                ImGui::Separator();
-//                if (ImGui::BeginMenu("Follow"))
-//                {
-//                    for (auto mpit = Mixer::manager().session()->begin();
-//                         mpit != Mixer::manager().session()->end(); mpit++ )
-//                    {
-//                        std::string label = (*mpit)->name();
-//                        if ( (*mpit)->id() != s.id() &&
-//                             (*mpit)->imageProcessingEnabled() &&
-//                             !(*mpit)->processingshader_link_.connected()) {
-//                            if (ImGui::MenuItem( label.c_str() )){
-//                                s.processingshader_link_.connect(*mpit);
-//                                s.touch();
-//                            }
-//                        }
-//                    }
-//                    ImGui::EndMenu();
-//                }
-            }
-
-            ImGui::EndPopup();
-        }
-
-        // full panel for image processing
-        ImGui::SetCursorPos( ImVec2( pos.x, pos.y + preview_height)); // ...come back
-
-        if (s.processingshader_link_.connected()) {
-            ImGuiToolkit::Icon(6, 2);
-            ImGui::SameLine(0, 10);
-            ImGui::Text("Filters");
-            Source *target = s.processingshader_link_.source();
-            ImGui::Text("Following");
-            if ( target != nullptr && ImGui::Button(target->name().c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
-                Mixer::manager().setCurrentSource(target);
-        }
-        else
-            s.processingShader()->accept(*this);
-    }
-
-    ImGui::PopID();
-}
-
-void ImGuiVisitor::visit (MediaSource& s)
-{
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    if ( s.mediaplayer()->isImage() )
-        ImGui::Text("Image File");
-    else
-        ImGui::Text("Video File");
-
-    // Media info
-    ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-    s.accept(info);
-    ImGui::Text("%s", info.str().c_str());
-    ImGui::PopTextWrapPos();
-
-    // icon (>) to open player
-    if ( s.playable() ) {
-        ImVec2 pos = ImGui::GetCursorPos();
-        ImGui::SameLine(0, 0);
-        ImGui::SameLine(0, 10.f + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-        if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player"))
-            UserInterface::manager().showSourceEditor(&s);
-        ImGui::SetCursorPos(pos);
-    }
-
-    // folder
-    std::string path = SystemToolkit::path_filename(s.path());
-    std::string label = BaseToolkit::trunc_string(path, 25);
-    label = BaseToolkit::transliterate(label);
-    ImGuiToolkit::ButtonOpenUrl( label.c_str(), path.c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) );
-
-    ImGui::SameLine();
-    ImGui::Text("Folder");
-}
-
-void ImGuiVisitor::visit (SessionFileSource& s)
-{
-    if (s.session() == nullptr)
-        return;
-
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Session File");
-
-    // info
-    ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-    s.accept(info);
-    ImGui::Text("%s", info.str().c_str());
-    ImGui::PopTextWrapPos();
-
-    // icon (>) to open player
-    if ( s.playable() ) {
-        ImVec2 pos = ImGui::GetCursorPos();
-        ImGui::SameLine(0, 0);
-        ImGui::SameLine(0, 10.f + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-        if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player"))
-            UserInterface::manager().showSourceEditor(&s);
-        ImGui::SetCursorPos(pos);
-    }
-
-    if ( ImGui::Button( ICON_FA_FILE_EXPORT " Import", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
-        Mixer::manager().import( &s );
-    ImGui::SameLine();
-    ImGui::Text("Sources");
-
-    if (ImGuiToolkit::ButtonIcon(3, 2)) s.session()->setFading(0.f);
-    float f = s.session()->fading();
-    ImGui::SameLine(0, 10);
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    if (ImGui::SliderFloat("Fading", &f, 0.0, 1.0, f < 0.001 ? "None" : "%.2f") )
-        s.session()->setFading(f);
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        std::ostringstream oss;
-        oss << s.name() << ": Fading " << std::setprecision(2) << f;
-        Action::manager().store(oss.str());
-    }
-    if ( ImGui::Button( ICON_FA_FILE_UPLOAD " Open", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
-        Mixer::manager().set( s.detach() );
-    ImGui::SameLine();
-    ImGui::Text("File");
-
-    std::string path = SystemToolkit::path_filename(s.path());
-    std::string label = BaseToolkit::trunc_string(path, 25);
-    label = BaseToolkit::transliterate(label);
-    ImGuiToolkit::ButtonOpenUrl( label.c_str(), path.c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) );
-    ImGui::SameLine();
-    ImGui::Text("Folder");
-
-}
-
-void ImGuiVisitor::visit (SessionGroupSource& s)
-{
-    if (s.session() == nullptr)
-        return;
-
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Flat Sesion group");
-
-    // info
-    ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-    s.accept(info);
-    ImGui::Text("%s", info.str().c_str());
-    ImGui::PopTextWrapPos();
-
-    // icon (>) to open player
-    if ( s.playable() ) {
-        ImVec2 pos = ImGui::GetCursorPos();
-        ImGui::SameLine(0, 0);
-        ImGui::SameLine(0, 10.f + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-        if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player"))
-            UserInterface::manager().showSourceEditor(&s);
-        ImGui::SetCursorPos(pos);
-    }
-
-    if ( ImGui::Button( ICON_FA_UPLOAD " Expand", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ){
-        Mixer::manager().import( &s );
-    }
-}
-
-void ImGuiVisitor::visit (RenderSource& s)
-{
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Rendering Output");
-    if ( ImGui::Button(IMGUI_TITLE_PREVIEW, ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
-        Settings::application.widget.preview = true;
-}
-
-void ImGuiVisitor::visit (CloneSource& s)
-{
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Clone");
-    if ( ImGui::Button(s.origin()->name().c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
-        Mixer::manager().setCurrentSource(s.origin());
-    ImGui::SameLine();
-    ImGui::Text("Source");
-}
-
-void ImGuiVisitor::visit (PatternSource& s)
-{
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Pattern");
-
-    // stream info
-    ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-    s.accept(info);
-    ImGui::Text("%s", info.str().c_str());
-    ImGui::PopTextWrapPos();
-
-    // icon (>) to open player
-    if ( s.playable() ) {
-        ImVec2 pos = ImGui::GetCursorPos();
-        ImGui::SameLine(0, 0);
-        ImGui::SameLine(0, 10.f + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-        if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player"))
-            UserInterface::manager().showSourceEditor(&s);
-        ImGui::SetCursorPos(pos);
-    }
-
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    if (ImGui::BeginCombo("##Patterns", Pattern::get(s.pattern()->type()).label.c_str()) )
-    {
-        for (uint p = 0; p < Pattern::count(); ++p){
-            if (ImGui::Selectable( Pattern::get(p).label.c_str() )) {
-                s.setPattern(p, s.pattern()->resolution());
-                info.reset();
-                std::ostringstream oss;
-                oss << s.name() << ": Pattern " << Pattern::get(p).label;
-                Action::manager().store(oss.str());
-            }
-        }
-        ImGui::EndCombo();
-    }
-    ImGui::SameLine();
-    ImGui::Text("Generator");
-}
-
-void ImGuiVisitor::visit (DeviceSource& s)
-{
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Device");
-
-    ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-    s.accept(info);
-    ImGui::Text("%s", info.str().c_str());
-    ImGui::PopTextWrapPos();
-
-    // icon (>) to open player
-    if ( s.playable() ) {
-        ImVec2 pos = ImGui::GetCursorPos();
-        ImGui::SameLine(0, 0);
-        ImGui::SameLine(0, 10.f + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-        if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player"))
-            UserInterface::manager().showSourceEditor(&s);
-        ImGui::SetCursorPos(pos);
-    }
-
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    if (ImGui::BeginCombo("##Hardware", s.device().c_str()))
-    {
-        for (int d = 0; d < Device::manager().numDevices(); ++d){
-            std::string namedev = Device::manager().name(d);
-            if (ImGui::Selectable( namedev.c_str() )) {
-                s.setDevice(namedev);
-                info.reset();
-                std::ostringstream oss;
-                oss << s.name() << " Device " << namedev;
-                Action::manager().store(oss.str());
-            }
-        }
-        ImGui::EndCombo();
-    }
-
-}
-
-void ImGuiVisitor::visit (NetworkSource& s)
-{
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Network stream");
-
-    ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(IMGUI_COLOR_STREAM, 0.9f));
-    ImGui::Text("%s", s.connection().c_str());
-    ImGui::PopStyleColor(1);
-
-    // network info
-    ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-    s.accept(info);
-    ImGui::Text("%s", info.str().c_str());
-    ImGui::PopTextWrapPos();
-
-    // icon (>) to open player
-    if ( s.playable() ) {
-        ImVec2 pos = ImGui::GetCursorPos();
-        ImGui::SameLine(0, 0);
-        ImGui::SameLine(0, 10.f + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-        if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player"))
-            UserInterface::manager().showSourceEditor(&s);
-        ImGui::SetCursorPos(pos);
-    }
-
-    if ( ImGui::Button( ICON_FA_REPLY " Reconnect", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
-    {
-        s.setConnection(s.connection());
-        info.reset();
-    }
-}
-
-
-void ImGuiVisitor::visit (MultiFileSource& s)
-{
-    ImGuiToolkit::Icon(s.icon().x, s.icon().y);
-    ImGui::SameLine(0, 10);
-    ImGui::Text("Images sequence");
-    static uint64_t id = 0;
-
-    // information text
-    ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-    s.accept(info);
-    ImGui::Text("%s", info.str().c_str());
-    ImGui::PopTextWrapPos();
-
-    // icon (>) to open player
-    if ( s.playable() ) {
-        ImVec2 pos = ImGui::GetCursorPos();
-        ImGui::SameLine(0, 0);
-        ImGui::SameLine(0, ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN);
-        if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player"))
-            UserInterface::manager().showSourceEditor(&s);
-        ImGui::SetCursorPos(pos);
-    }
-
-    // change range
-    static int _begin = -1;
-    if (_begin < 0 || id != s.id())
-        _begin = s.begin();
-    static int _end = -1;
-    if (_end < 0 || id != s.id())
-        _end = s.end();
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::DragIntRange2("Range", &_begin, &_end, 1, s.sequence().min, s.sequence().max);
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        s.setRange( _begin, _end );
-        std::ostringstream oss;
-        oss << s.name() << ": Range " << _begin << "-" << _end;
-        Action::manager().store(oss.str());
-        _begin = _end = -1;
-    }
-
-    // change framerate
-    static int _fps = -1;
-    if (_fps < 0 || id != s.id())
-        _fps = s.framerate();
-    ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
-    ImGui::SliderInt("Framerate", &_fps, 1, 30, "%d fps");
-    if (ImGui::IsItemDeactivatedAfterEdit()){
-        s.setFramerate(_fps);
-        std::ostringstream oss;
-        oss << s.name() << ": Framerate " << _fps << " fps";
-        Action::manager().store(oss.str());
-        _fps = -1;
-    }
-
-    // offer to open file browser at location
-    std::string path = SystemToolkit::path_filename(s.sequence().location);
-    std::string label = BaseToolkit::trunc_string(path, 25);
-    label = BaseToolkit::transliterate(label);
-    ImGuiToolkit::ButtonOpenUrl( label.c_str(), path.c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) );
-    ImGui::SameLine();
-    ImGui::Text("Folder");
-
-    if (id != s.id())
-        id = s.id();
-}

InfoVisitor.cpp

@@ -1,278 +0,0 @@
-/*
- * This file is part of vimix - video live mixer
- *
- * **Copyright** (C) 2020-2021 Bruno Herbelin <bruno.herbelin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-#include <vector>
-#include <algorithm>
-#include <sstream>
-#include <iomanip>
-
-#include <glm/glm.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtc/constants.hpp>
-#include <glm/gtc/matrix_access.hpp>
-
-#include <tinyxml2.h>
-#include "tinyxml2Toolkit.h"
-
-#include "defines.h"
-#include "Log.h"
-#include "Scene.h"
-#include "Primitives.h"
-#include "ImageShader.h"
-#include "ImageProcessingShader.h"
-#include "MediaPlayer.h"
-#include "MediaSource.h"
-#include "SessionSource.h"
-#include "PatternSource.h"
-#include "DeviceSource.h"
-#include "NetworkSource.h"
-#include "MultiFileSource.h"
-#include "SessionCreator.h"
-#include "SessionVisitor.h"
-#include "Settings.h"
-#include "Mixer.h"
-#include "ActionManager.h"
-#include "BaseToolkit.h"
-#include "UserInterfaceManager.h"
-#include "SystemToolkit.h"
-
-#include "InfoVisitor.h"
-
-
-
-InfoVisitor::InfoVisitor() : brief_(true), current_id_(0)
-{
-}
-
-void InfoVisitor::visit(Node &n)
-{
-}
-
-void InfoVisitor::visit(Group &n)
-{
-}
-
-void InfoVisitor::visit(Switch &n)
-{
-}
-
-void InfoVisitor::visit(Scene &n)
-{
-}
-
-void InfoVisitor::visit(Primitive &n)
-{
-}
-
-
-void InfoVisitor::visit(MediaPlayer &mp)
-{
-    // do not ask twice
-    if (current_id_ == mp.id())
-        return;
-
-    std::ostringstream oss;
-    if (brief_) {
-        oss << SystemToolkit::filename(mp.filename()) << std::endl;
-        oss << mp.width() << " x " << mp.height() << ", ";
-        oss << mp.media().codec_name.substr(0, mp.media().codec_name.find_first_of(" (,"));
-        if (!mp.isImage())
-            oss << ", " << std::fixed << std::setprecision(1) << mp.frameRate() << " fps";
-    }
-    else {
-        oss << mp.filename() << std::endl;
-        oss << mp.media().codec_name << std::endl;
-        oss << mp.width() << " x " << mp.height() ;
-        if (!mp.isImage())
-            oss << ", " << std::fixed << std::setprecision(1) << mp.frameRate() << " fps";
-    }
-
-    information_ = oss.str();
-
-    // remember (except if codec was not identified yet)
-    if ( !mp.media().codec_name.empty() )
-        current_id_ = mp.id();
-}
-
-void InfoVisitor::visit(Stream &n)
-{
-    std::ostringstream oss;
-    if (brief_) {
-
-    }
-    else {
-
-    }
-    information_ = oss.str();
-}
-
-
-void InfoVisitor::visit (MediaSource& s)
-{
-    s.mediaplayer()->accept(*this);
-}
-
-void InfoVisitor::visit (SessionFileSource& s)
-{
-    if (current_id_ == s.id() || s.session() == nullptr)
-        return;
-
-    std::ostringstream oss;
-    if (brief_) {
-        oss << SystemToolkit::filename(s.path()) << " (";
-        oss << s.session()->numSource() << " sources)" << std::endl;
-    }
-    else
-        oss << s.path() << std::endl;
-
-    if (s.session()->frame()){
-        oss << s.session()->frame()->width() << " x " << s.session()->frame()->height() << ", ";
-        oss << "RGB";
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (SessionGroupSource& s)
-{
-    if (current_id_ == s.id() || s.session() == nullptr)
-        return;
-
-    std::ostringstream oss;
-    oss << s.session()->numSource() << " sources in group" << std::endl;
-    if (s.session()->frame()){
-        oss << s.session()->frame()->width() << " x " << s.session()->frame()->height() << ", ";
-        oss << "RGB";
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (RenderSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    information_ = "Rendering Output";
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (CloneSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    information_ = "Clone of " + s.origin()->name();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (PatternSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    std::ostringstream oss;
-    oss << Pattern::get(s.pattern()->type()).label << std::endl;
-    if (s.pattern()) {
-        oss << s.pattern()->width() << " x " << s.pattern()->height();
-        oss << ", RGB";
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (DeviceSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    std::ostringstream oss;
-
-    DeviceConfigSet confs = Device::manager().config( Device::manager().index(s.device().c_str()));
-    if ( !confs.empty()) {
-        DeviceConfig best = *confs.rbegin();
-        float fps = static_cast<float>(best.fps_numerator) / static_cast<float>(best.fps_denominator);
-
-        if (brief_) {
-            oss << best.width << " x " << best.height << ", ";
-            oss << best.stream << " " << best.format << ", ";
-            oss << std::fixed << std::setprecision(1) << fps << " fps";
-        }
-        else {
-            oss << s.device() << std::endl;
-            oss << best.width << " x " << best.height << ", ";
-            oss << best.stream << " " << best.format << ", ";
-            oss << std::fixed << std::setprecision(1) << fps << " fps";
-        }
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (NetworkSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    NetworkStream *ns = s.networkStream();
-
-    std::ostringstream oss;
-    if (brief_) {
-        oss << ns->resolution().x << " x " << ns->resolution().y << ", ";
-        oss << NetworkToolkit::protocol_name[ns->protocol()] << std::endl;
-        oss << "IP " << ns->serverAddress();
-    }
-    else {
-        oss << s.connection() << " (IP " << ns->serverAddress() << ")" << std::endl;
-        oss << ns->resolution().x << " x " << ns->resolution().y << ", ";
-        oss << NetworkToolkit::protocol_name[ns->protocol()];
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-
-void InfoVisitor::visit (MultiFileSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    std::ostringstream oss;
-    if (brief_) {
-        oss << s.sequence().width << " x " << s.sequence().height << ", ";
-        oss << s.sequence().codec << std::endl;
-        oss << s.sequence().max - s.sequence().min + 1 << " images [";
-        oss << s.sequence().min << " - " << s.sequence().max << "]";
-    }
-    else {
-        oss << s.sequence().location << " [";
-        oss << s.sequence().min << " - " << s.sequence().max << "]" << std::endl;
-        oss << s.sequence().width << " x " << s.sequence().height << ", ";
-        oss << s.sequence().codec << " (";
-        oss << s.sequence().max - s.sequence().min + 1 << " images)";
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}

Loopback.h

@@ -1,31 +0,0 @@
-#ifndef LOOPBACK_H
-#define LOOPBACK_H
-
-#include <vector>
-
-#include <gst/pbutils/pbutils.h>
-#include <gst/app/gstappsrc.h>
-
-#include "FrameGrabber.h"
-
-
-class Loopback : public FrameGrabber
-{
-    static std::string  system_loopback_pipeline;
-    static std::string  system_loopback_name;
-    static bool system_loopback_initialized;
-
-    std::string init(GstCaps *caps) override;
-    void terminate() override;
-
-public:
-
-    Loopback();
-
-    static bool systemLoopbackInitialized();
-    static bool initializeSystemLoopback();
-
-};
-
-
-#endif // LOOPBACK_H

README.md

@@ -7,8 +7,8 @@ computer generated graphics, with image processing effects in real-time.
 Its intuitive and hands-on user interface gives direct control on image opacity and
 shape for producing live graphics during concerts and VJ-ing sessions.
 
-The ouput image is typically projected full-screen on an external
-monitor or a projector, but can be recorded live (no audio).
+The output image is typically projected full-screen on an external
+monitor or a projector, and can be streamed live (SRT, Shmdata) or recorded (without audio).
 
 vimix is the successor for GLMixer - https://sourceforge.net/projects/glmixer/
 
@@ -17,45 +17,57 @@ vimix is the successor for GLMixer - https://sourceforge.net/projects/glmixer/
 GPL-3.0-or-later
 See [LICENSE](https://github.com/brunoherbelin/vimix/blob/master/LICENSE)
 
-# Install
+# Install vimix
 
 Check the [Quick Installation Guide](https://github.com/brunoherbelin/vimix/wiki/Quick-Installation-Guide)
 
 ### Linux
 
-Download and install a release package from https://snapcraft.io/vimix
+Download and install a released [flatpak package](https://flathub.org/apps/details/io.github.brunoherbelin.Vimix)
 
-    $ snap install vimix
+    ~$ flatpak install --user vimix
     
-NB: You'll need to setup the snap permissions.
+NB: Building your flatpak package is an option for testing the latest beta version from git ; instructions are [here](https://github.com/brunoherbelin/vimix/tree/master/flatpak).
+    
+
+Download and install a released [snap package](https://snapcraft.io/vimix)  (slower release frequency)
+
+    ~$ snap install vimix
+    
+Install the stable debian package (slower release frequency)
+
+    ~$ sudo apt install vimix
 
 ### Mac OSX
 
 Download and open a release package from https://github.com/brunoherbelin/vimix/releases
+
 NB: You'll need to accept the exception in OSX security preference.
 
+# Build vimix
+
 ## Clone
 
-    $ git clone --recursive https://github.com/brunoherbelin/vimix.git
+    ~$ git clone --recursive https://github.com/brunoherbelin/vimix.git
 
 This will create the directory 'vimix', download the latest version of vimix code,
 and (recursively) clone all the internal git dependencies.
 
 To only update a cloned git copy:
 
-    $ git pull
+    ~$ git pull
 
 ## Compile
 
 First time after git clone:
 
-    $ mkdir vimix-build
-    $ cd vimix-build
-    $ cmake -DCMAKE_BUILD_TYPE=Release ../vimix
+    ~$ mkdir vimix-build
+    ~$ cd vimix-build
+    ~$ cmake -DCMAKE_BUILD_TYPE=Release ../vimix
     
 Compile (or re-compile after pull):
     
-    $ cmake --build .
+    ~$ cmake --build .
 
 ### Dependencies
 
@@ -69,31 +81,36 @@ Compile (or re-compile after pull):
 **Libraries:**
 
 - gstreamer
-- gst-plugins : libav, base, good, bad & ugly
+- gst-plugins (libav, base, good, bad & ugly)
 - libglfw3
-- libicu
+- libicu (icu-i18n icu-uc icu-io)
+
+Optionnal:
+
+- glm
+- stb
+- TinyXML2
+- AbletonLink
+- Shmdata
 
 #### Install Dependencies
 
 **Ubuntu**
 
-    $ apt-get install build-essential cmake libpng-dev libglfw3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav libicu-dev libgtk-3-dev 
+    ~$ apt-get install build-essential cmake libpng-dev libglfw3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav libicu-dev libgtk-3-dev 
+
+Optionnal:
+
+    ~$ apt-get install libglm-dev libstb-dev libtinyxml2-dev ableton-link-dev 
+    
+
+Follow the instructions to [install Shmdata](https://gitlab.com/sat-mtl/tools/shmdata).
 
 **OSX with Brew**
 
-    $ brew install cmake libpng glfw gstreamer gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly icu4c
+    ~$ brew install cmake libpng glfw gstreamer gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly icu4c
 
 
-#### Generate snap
-
-To generate the snap (from vimix directory):
-
-    $ snapcraft
-    
-To install the locally created snap:
-    
-    $ snap install --dangerous vimix_0.5_amd64.snap
-    
 ### Memcheck
 
 To generate memory usage plots in [massif format](https://valgrind.org/docs/manual/ms-manual.html):

Session.cpp

@@ -1,603 +0,0 @@
-/*
- * This file is part of vimix - video live mixer
- *
- * **Copyright** (C) 2020-2021 Bruno Herbelin <bruno.herbelin@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-#include <algorithm>
-
-#include "defines.h"
-#include "BaseToolkit.h"
-#include "Source.h"
-#include "Settings.h"
-#include "FrameBuffer.h"
-#include "FrameGrabber.h"
-#include "SessionCreator.h"
-#include "SessionSource.h"
-#include "MixingGroup.h"
-#include "Log.h"
-
-#include "Session.h"
-
-SessionNote::SessionNote(const std::string &t, bool l, int s): label(std::to_string(BaseToolkit::uniqueId())),
-    text(t), large(l), stick(s), pos(glm::vec2(520.f, 30.f)), size(glm::vec2(220.f, 220.f))
-{
-}
-
-Session::Session() : active_(true), activation_threshold_(MIXING_MIN_THRESHOLD),
-    filename_(""), failedSource_(nullptr), fading_target_(0.f), thumbnail_(nullptr)
-{
-    config_[View::RENDERING] = new Group;
-    config_[View::RENDERING]->scale_ = glm::vec3(0.f);
-
-    config_[View::GEOMETRY] = new Group;
-    config_[View::GEOMETRY]->scale_ = Settings::application.views[View::GEOMETRY].default_scale;
-    config_[View::GEOMETRY]->translation_ = Settings::application.views[View::GEOMETRY].default_translation;
-
-    config_[View::LAYER] = new Group;
-    config_[View::LAYER]->scale_ = Settings::application.views[View::LAYER].default_scale;
-    config_[View::LAYER]->translation_ = Settings::application.views[View::LAYER].default_translation;
-
-    config_[View::MIXING] = new Group;
-    config_[View::MIXING]->scale_ = Settings::application.views[View::MIXING].default_scale;
-    config_[View::MIXING]->translation_ = Settings::application.views[View::MIXING].default_translation;
-
-    config_[View::TEXTURE] = new Group;
-    config_[View::TEXTURE]->scale_ = Settings::application.views[View::TEXTURE].default_scale;
-    config_[View::TEXTURE]->translation_ = Settings::application.views[View::TEXTURE].default_translation;
-
-    snapshots_.xmlDoc_ = new tinyxml2::XMLDocument;
-    start_time_ = gst_util_get_timestamp ();
-}
-
-
-Session::~Session()
-{
-    // TODO delete all mixing groups?
-    auto group_iter = mixing_groups_.begin();
-    while ( group_iter != mixing_groups_.end() ){
-        delete (*group_iter);
-        group_iter = mixing_groups_.erase(group_iter);
-    }
-
-    // delete all sources
-    for(auto it = sources_.begin(); it != sources_.end(); ) {
-        // erase this source from the list
-        it = deleteSource(*it);
-    }
-
-    delete config_[View::RENDERING];
-    delete config_[View::GEOMETRY];
-    delete config_[View::LAYER];
-    delete config_[View::MIXING];
-    delete config_[View::TEXTURE];
-
-    snapshots_.keys_.clear();
-    delete snapshots_.xmlDoc_;
-}
-
-uint64_t Session::runtime() const
-{
-    return gst_util_get_timestamp () - start_time_;
-}
-
-void Session::setActive (bool on)
-{
-    if (active_ != on) {
-        active_ = on;
-        for(auto it = sources_.begin(); it != sources_.end(); ++it) {
-            (*it)->setActive(active_);
-        }
-    }
-}
-
-// update all sources
-void Session::update(float dt)
-{
-    // no update until render view is initialized
-    if ( render_.frame() == nullptr )
-        return;
-
-    // pre-render all sources
-    failedSource_ = nullptr;
-    bool ready = true;
-    for( SourceList::iterator it = sources_.begin(); it != sources_.end(); ++it){
-
-        // ensure the RenderSource is rendering *this* session
-        RenderSource *rs = dynamic_cast<RenderSource *>( *it );
-        if ( rs!= nullptr && rs->session() != this )
-            rs->setSession(this);
-
-        // discard failed source
-        if ( (*it)->failed() ) {
-            failedSource_ = (*it);
-        }
-        // render normally
-        else {
-            if ( !(*it)->ready() )
-                ready = false;
-            // render the source
-            (*it)->render();
-            // update the source
-            (*it)->setActive( (*it)->mix_distance() < activation_threshold_);
-            (*it)->update(dt);
-        }
-    }
-
-    // update session's mixing groups
-    auto group_iter = mixing_groups_.begin();
-    while ( group_iter != mixing_groups_.end() ){
-        // update all valid groups
-        if ((*group_iter)->size() > 1) {
-            (*group_iter)->update(dt);
-            group_iter++;
-        }
-        else
-            // delete invalid groups (singletons)
-            group_iter = deleteMixingGroup(group_iter);
-    }
-
-    // apply fading (smooth dicotomic reaching)
-    float f = render_.fading();
-    if ( ABS_DIFF(f, fading_target_) > EPSILON) {
-        render_.setFading( f + ( fading_target_ - f ) / 2.f);
-    }
-
-    // update the scene tree
-    render_.update(dt);
-
-    // draw render view in Frame Buffer
-    render_.draw();
-
-    // draw the thumbnail only after all sources are ready
-    if (ready)
-        render_.drawThumbnail();
-}
-
-SourceList::iterator Session::addSource(Source *s)
-{
-    // lock before change
-    access_.lock();
-
-    // find the source
-    SourceList::iterator its = find(s);
-
-    // ok, its NOT in the list !
-    if (its == sources_.end()) {
-        // insert the source in the rendering
-        render_.scene.ws()->attach(s->group(View::RENDERING));
-        // insert the source to the beginning of the list
-        sources_.push_front(s);
-        // return the iterator to the source created at the beginning
-        its = sources_.begin();
-    }
-
-    // unlock access
-    access_.unlock();
-
-    return its;
-}
-
-SourceList::iterator Session::deleteSource(Source *s)
-{
-    // lock before change
-    access_.lock();
-
-    // find the source
-    SourceList::iterator its = find(s);
-    // ok, its in the list !
-    if (its != sources_.end()) {
-        // remove Node from the rendering scene
-        render_.scene.ws()->detach( s->group(View::RENDERING) );
-        // inform group
-        if (s->mixingGroup() != nullptr)
-            s->mixingGroup()->detach(s);
-        // erase the source from the update list & get next element
-        its = sources_.erase(its);
-        // delete the source : safe now
-        delete s;
-    }
-
-    // unlock access
-    access_.unlock();
-
-    // return end of next element
-    return its;
-}
-
-void Session::removeSource(Source *s)
-{
-    // lock before change
-    access_.lock();
-
-    // find the source
-    SourceList::iterator its = find(s);
-    // ok, its in the list !
-    if (its != sources_.end()) {
-        // remove Node from the rendering scene
-        render_.scene.ws()->detach( s->group(View::RENDERING) );
-        // inform group
-        if (s->mixingGroup() != nullptr)
-            s->mixingGroup()->detach(s);
-        // erase the source from the update list & get next element
-        sources_.erase(its);
-    }
-
-    // unlock access
-    access_.unlock();
-}
-
-Source *Session::popSource()
-{
-    Source *s = nullptr;
-
-    SourceList::iterator its = sources_.begin();
-    if (its != sources_.end())
-    {
-        s = *its;
-        // remove Node from the rendering scene
-        render_.scene.ws()->detach( s->group(View::RENDERING) );
-        // erase the source from the update list & get next element
-        sources_.erase(its);
-    }
-
-    return s;
-}
-
-static void replaceThumbnail(Session *s)
-{
-    if (s != nullptr) {
-        FrameBufferImage *t = s->renderThumbnail();
-        if (t != nullptr) // avoid recursive infinite loop
-            s->setThumbnail(t);
-    }
-}
-
-void Session::setThumbnail(FrameBufferImage *t)
-{
-    resetThumbnail();
-    // replace with given image
-    if (t != nullptr)
-        thumbnail_ = t;
-    // no thumbnail image given: capture from rendering in a parallel thread
-    else
-        std::thread( replaceThumbnail, this ).detach();
-}
-
-void Session::resetThumbnail()
-{
-    if (thumbnail_ != nullptr)
-        delete thumbnail_;
-    thumbnail_ = nullptr;
-}
-
-void Session::setResolution(glm::vec3 resolution, bool useAlpha)
-{
-    // setup the render view: if not specified the default config resulution will be used
-    render_.setResolution( resolution, useAlpha );
-    // store the actual resolution set in the render view
-    config_[View::RENDERING]->scale_ = render_.resolution();
-}
-
-void Session::setFading(float f, bool forcenow)
-{
-    if (forcenow)
-        render_.setFading( f );
-
-    fading_target_ = CLAMP(f, 0.f, 1.f);
-}
-
-SourceList::iterator Session::begin()
-{
-    return sources_.begin();
-}
-
-SourceList::iterator Session::end()
-{
-    return sources_.end();
-}
-
-SourceList::iterator Session::find(Source *s)
-{
-    return std::find(sources_.begin(), sources_.end(), s);
-}
-
-SourceList::iterator Session::find(uint64_t id)
-{
-    return std::find_if(sources_.begin(), sources_.end(), Source::hasId(id));
-}
-
-SourceList::iterator Session::find(std::string namesource)
-{
-    return std::find_if(sources_.begin(), sources_.end(), Source::hasName(namesource));
-}
-
-SourceList::iterator Session::find(Node *node)
-{
-    return std::find_if(sources_.begin(), sources_.end(), Source::hasNode(node));
-}
-
-SourceList::iterator Session::find(float depth_from, float depth_to)
-{
-    return std::find_if(sources_.begin(), sources_.end(), Source::hasDepth(depth_from, depth_to));
-}
-
-SourceList Session::getDepthSortedList() const
-{
-    return depth_sorted(sources_);
-}
-
-uint Session::numSource() const
-{
-    return sources_.size();
-}
-
-SourceIdList Session::getIdList() const
-{
-    return ids(sources_);
-}
-
-std::list<std::string> Session::getNameList(uint64_t exceptid) const
-{
-    std::list<std::string> namelist;
-
-    for( SourceList::const_iterator it = sources_.cbegin(); it != sources_.cend(); ++it) {
-        if ( (*it)->id() != exceptid )
-            namelist.push_back( (*it)->name() );
-    }
-
-    return namelist;
-}
-
-
-bool Session::empty() const
-{
-    return sources_.empty();
-}
-
-SourceList::iterator Session::at(int index)
-{
-    if (index<0)
-        return sources_.end();
-
-    int i = 0;
-    SourceList::iterator it = sources_.begin();
-    while ( i < index && it != sources_.end() ){
-        i++;
-        ++it;
-    }
-    return it;
-}
-
-int Session::index(SourceList::iterator it) const
-{
-    int index = -1;
-    int count = 0;
-    for(auto i = sources_.begin(); i != sources_.end(); ++i, ++count) {
-        if ( i == it ) {
-            index = count;
-            break;
-        }
-    }
-    return index;
-}
-
-void Session::move(int current_index, int target_index)
-{
-    if ( current_index < 0 || current_index > (int) sources_.size()
-         || target_index < 0 || target_index > (int) sources_.size()
-         || target_index == current_index )
-        return;
-
-    SourceList::iterator from = at(current_index);
-    SourceList::iterator to   = at(target_index);
-    if ( target_index > current_index )
-        ++to;
-
-    Source *s = (*from);
-    sources_.erase(from);
-    sources_.insert(to, s);
-}
-
-bool Session::canlink (SourceList sources)
-{
-    bool canlink = true;
-
-    // verify that all sources given are valid in the sesion
-    validate(sources);
-
-    for (auto it = sources.begin(); it != sources.end(); ++it) {
-        // this source is linked
-        if ( (*it)->mixingGroup() != nullptr ) {
-            // askt its group to detach it
-            canlink = false;
-        }
-    }
-
-    return canlink;
-}
-
-void Session::link(SourceList sources, Group *parent)
-{
-    // we need at least 2 sources to make a group
-    if (sources.size() > 1) {
-
-        unlink(sources);
-
-        // create and add a new mixing group
-        MixingGroup *g = new MixingGroup(sources);
-        mixing_groups_.push_back(g);
-
-        // if provided, attach the group to the parent
-        if (g && parent != nullptr)
-            g->attachTo( parent );
-
-    }
-}
-
-void Session::unlink (SourceList sources)
-{
-    // verify that all sources given are valid in the sesion
-    validate(sources);
-
-    // brute force : detach all given sources
-    for (auto it = sources.begin(); it != sources.end(); ++it) {
-        // this source is linked
-        if ( (*it)->mixingGroup() != nullptr ) {
-            // askt its group to detach it
-            (*it)->mixingGroup()->detach(*it);
-        }
-    }
-}
-
-void Session::addNote(SessionNote note)
-{
-    notes_.push_back( note );
-}
-
-std::list<SessionNote>::iterator Session::beginNotes ()
-{
-    return notes_.begin();
-}
-
-std::list<SessionNote>::iterator Session::endNotes ()
-{
-    return notes_.end();
-}
-
-std::list<SessionNote>::iterator Session::deleteNote (std::list<SessionNote>::iterator n)
-{
-    if (n != notes_.end())
-        return notes_.erase(n);
-
-    return notes_.end();
-}
-
-std::list<SourceList> Session::getMixingGroups () const
-{
-    std::list<SourceList> lmg;
-
-    for (auto group_it = mixing_groups_.begin(); group_it!= mixing_groups_.end(); ++group_it)
-        lmg.push_back( (*group_it)->getCopy() );
-
-    return lmg;
-}
-
-std::list<MixingGroup *>::iterator Session::deleteMixingGroup (std::list<MixingGroup *>::iterator g)
-{
-    if (g != mixing_groups_.end()) {
-        delete (*g);
-        return mixing_groups_.erase(g);
-    }
-    return mixing_groups_.end();
-}
-
-std::list<MixingGroup *>::iterator Session::beginMixingGroup()
-{
-    return mixing_groups_.begin();
-}
-
-std::list<MixingGroup *>::iterator Session::endMixingGroup()
-{
-    return mixing_groups_.end();
-}
-
-
-size_t Session::numPlayGroups() const
-{
-    return play_groups_.size();
-}
-
-void Session::addPlayGroup(const SourceIdList &ids)
-{
-    play_groups_.push_back( ids );
-}
-
-void Session::addToPlayGroup(size_t i, Source *s)
-{
-    if (i < play_groups_.size() )
-    {
-        if ( std::find(play_groups_[i].begin(), play_groups_[i].end(), s->id()) == play_groups_[i].end() )
-            play_groups_[i].push_back(s->id());
-    }
-}
-
-void Session::removeFromPlayGroup(size_t i, Source *s)
-{
-    if (i < play_groups_.size() )
-    {
-        if ( std::find(play_groups_[i].begin(), play_groups_[i].end(), s->id()) != play_groups_[i].end() )
-            play_groups_[i].remove( s->id() );
-    }
-}
-
-void Session::deletePlayGroup(size_t i)
-{
-    if (i < play_groups_.size() )
-        play_groups_.erase( play_groups_.begin() + i);
-}
-
-SourceList Session::playGroup(size_t i) const
-{
-    SourceList list;
-
-    if (i < play_groups_.size() )
-    {
-        for (auto sid = play_groups_[i].begin(); sid != play_groups_[i].end(); ++sid){
-
-            SourceList::const_iterator it = std::find_if(sources_.begin(), sources_.end(), Source::hasId( *sid));;
-            if ( it != sources_.end())
-                list.push_back( *it);
-
-        }
-    }
-
-    return list;
-}
-
-void Session::lock()
-{
-    access_.lock();
-}
-
-void Session::unlock()
-{
-    access_.unlock();
-}
-
-void Session::validate (SourceList &sources)
-{
-    // verify that all sources given are valid in the sesion
-    // and remove the invalid sources
-    for (auto _it = sources.begin(); _it != sources.end(); ) {
-        SourceList::iterator found = std::find(sources_.begin(), sources_.end(), *_it);
-        if ( found == sources_.end() )
-            _it = sources.erase(_it);
-        else
-            _it++;
-    }
-}
-
-Session *Session::load(const std::string& filename, uint recursion)
-{
-    // create session
-    SessionCreator creator(recursion);
-    creator.load(filename);
-
-    // return created session
-    return creator.session();
-}
-

cmake/modules/FindGStreamerPluginsBad.cmake

@@ -41,8 +41,8 @@ foreach(_component ${GStreamerPluginsBad_FIND_COMPONENTS})
         _find_gst_plugins_bad_component(PLAYER gstplayer.h)
     elseif (${_component} STREQUAL "webrtc")
         _find_gst_plugins_bad_component(WEBRTC webrtc.h)
-    elseif (${_component} STREQUAL "mpegts")
-        _find_gst_plugins_bad_component(MPEGTS mpegts.h)
+    elseif (${_component} STREQUAL "srtsrc")
+        _find_gst_plugins_bad_component(SRTSRC mpegts.h)
     else()
         message (AUTHOR_WARNING "FindGStreamerPluginBad.cmake: Invalid component \"${_component}\" was specified")
     endif()