Update Flathub version 0.8.0

Attempt at linking vimix to MIME type .mix

.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

@@ -21,4 +21,4 @@
 	url = https://github.com/Ableton/link.git
 [submodule "ext/tfd"]
 	path = ext/tfd
-	url = https://git.code.sf.net/p/tinyfiledialogs/code
+	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
+#####
+##### 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,29 +91,27 @@ elseif(WIN32)
     add_definitions(-DMINGW32)
 endif()
 
-# static sub packages in ext
-set(BUILD_STATIC_LIBS ON)
-
 #####
 ##### 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"
 "Open Source Multiplatform Multimedia Framework"
@@ -110,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
 #
@@ -118,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
 #
@@ -128,15 +174,24 @@ 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}
+)
+
+link_directories(
+    ${GLFW3_LIBRARY_DIRS}
+)
+
 #
 # GLM
 #
 if (PKG_CONFIG_FOUND)
     pkg_check_modules(GLM QUIET glm>=0.9.9)
 else ()
-    find_package(glm QUIET)
+    find_package(glm 0.9.9 QUIET)
 endif()
 
 if (GLM_FOUND)
@@ -147,13 +202,17 @@ else ()
     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 QUIET)
+    find_package(tinyxml2 8.0 QUIET)
 endif()
 
 if (TINYXML2_FOUND)
@@ -165,6 +224,10 @@ else ()
     message(STATUS "Compiling 'TinyXML2' from https://github.com/leethomason/tinyxml2.git -- ${TINYXML2_INCLUDE_DIRS}")
 endif()
 
+include_directories(
+    ${TINYXML2_INCLUDE_DIRS}
+)
+
 #
 # STB
 #
@@ -181,6 +244,10 @@ else ()
     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
 #
@@ -193,37 +260,87 @@ else ()
     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(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://git.code.sf.net/p/tinyfiledialogs/code -- ${TINYFD_INCLUDE_DIR}.")
-        set(TINYFD_LIBRARY TINYFD)
-    endif()
-else()
+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}.")
-    set(TINYFD_LIBRARY TINYFD)
 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()
+
 #####
-##### Custom built libraries
+##### Locally built libraries
 #####
 
+#
+# GLAD
+#
+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 "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
@@ -231,12 +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
-)
-add_definitions(-DIMGUI_USE_STB_SPRINTF)
-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}")
+
+#
+# ImGui Color Text Editor
+#
+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
@@ -255,141 +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}")
 
-#
-# GLAD
-#
-set(GLAD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include)
-add_library(GLAD "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/src/glad.c")
-message(STATUS "Including 'GLAD' Open source multi-language OpenGL loader https://glad.dav1d.de -- ${GLAD_INCLUDE_DIR}")
-
-#
-# 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}")
-
-
-macro_display_feature_log()
 
 #####
-##### Application
+##### Ressources
 #####
 
-# Setup the environment
+set(RSC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rsc)
+
+#
+# Fonts
+#
+
+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()
+
+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()
+
+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()
+
 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_DIRS}
-    ${TINYFD_INCLUDE_DIR}
-    ${STB_INCLUDE_DIRS}
-    ${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
-    CloneSource.cpp
-    RenderSource.cpp
-    SourceCallback.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
-    ControlManager.cpp
-    VideoBroadcast.cpp
-    SrtReceiverSource.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
@@ -402,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
@@ -418,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
@@ -487,94 +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_LIBRARIES}
-    GLAD
-    IMGUI
-    OSCPACK
-    ${TINYFD_LIBRARY}
-    ${GLFW3_LIBRARIES}
-    ${TINYXML2_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.")
@@ -591,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)

CloneSource.cpp

@@ -1,250 +0,0 @@
-/*
- * This file is part of vimix - video live mixer
- *
- * **Copyright** (C) 2019-2022 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 <gst/gst.h>
-
-#include <glm/gtc/matrix_access.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
-#include "Log.h"
-#include "Resource.h"
-#include "Visitor.h"
-#include "FrameBuffer.h"
-#include "Decorations.h"
-
-#include "CloneSource.h"
-
-const char* CloneSource::cloning_provenance_label[2] = { "Original texture", "Post-processed image" };
-
-
-CloneSource::CloneSource(Source *origin, uint64_t id) : Source(id), origin_(origin), cloningsurface_(nullptr),
-    read_index_(0), write_index_(0), delay_(0.0), paused_(false), provenance_(CLONE_TEXTURE)
-{
-    // initial name copies the origin name: diplucates are namanged in session
-    name_ = origin->name();
-
-    // set symbol
-    symbol_ = new Symbol(Symbol::CLONE, glm::vec3(0.75f, 0.75f, 0.01f));
-    symbol_->scale_.y = 1.5f;
-
-    // init array
-    stack_.fill(nullptr);
-    elapsed_stack_.fill(0.0);
-    timestamps_.fill(0);
-
-    timer_ = g_timer_new ();
-}
-
-CloneSource::~CloneSource()
-{
-    if (origin_)
-        origin_->clones_.remove(this);
-
-    // delete all frame buffers
-    for (size_t i = 0; i < stack_.size(); ++i){
-        if ( stack_[i] != nullptr )
-            delete stack_[i];
-    }
-
-    if (cloningsurface_)
-        delete cloningsurface_;
-
-    g_free(timer_);
-}
-
-CloneSource *CloneSource::clone(uint64_t id)
-{
-    // do not clone a clone : clone the original instead
-    if (origin_)
-        return origin_->clone(id);
-    else
-        return nullptr;
-}
-
-void CloneSource::init()
-{
-    if (origin_ && origin_->mode_ > Source::UNINITIALIZED) {
-
-        // internal surface to draw the original texture
-        cloningsurface_ = new Surface;
-        cloningsurface_->setTextureIndex( origin()->texture() );
-
-        // frame buffers where to draw frames from the origin source
-        glm::vec3 res = origin_->frame()->resolution();
-        for (size_t i = 0; i < stack_.size(); ++i){
-            stack_[i] = new FrameBuffer( res, origin_->frame()->use_alpha() );
-        }
-
-        // set initial texture surface
-        texturesurface_->setTextureIndex( stack_[read_index_]->texture() );
-
-        // activate elapsed-timer
-        g_timer_start(timer_);
-
-        // create render Frame buffer matching size of images
-        FrameBuffer *renderbuffer = new FrameBuffer( res, true);
-
-        // set the renderbuffer of the source and attach rendering nodes
-        attach(renderbuffer);
-
-        // force update of activation mode
-        active_ = true;
-
-        // deep update to reorder
-        ++View::need_deep_update_;
-
-        // done init
-        Log::Info("Source %s cloning source %s.", name().c_str(), origin_->name().c_str() );
-    }
-}
-
-void CloneSource::setActive (bool on)
-{
-    // request update
-    need_update_ |= active_ != on;
-
-    active_ = on;
-
-    groups_[View::RENDERING]->visible_ = active_;
-    groups_[View::GEOMETRY]->visible_ = active_;
-    groups_[View::LAYER]->visible_ = active_;
-
-    if (origin_) {
-        if ( mode_ > Source::UNINITIALIZED)
-            origin_->touch();
-
-        // change visibility of active surface (show preview of origin when inactive)
-        if (activesurface_) {
-            if (active_)
-                activesurface_->setTextureIndex(Resource::getTextureTransparent());
-            else
-                activesurface_->setTextureIndex(stack_[read_index_]->texture());
-        }
-    }
-}
-
-void CloneSource::update(float dt)
-{
-    Source::update(dt);
-
-    if (!paused_ && origin_ && cloningsurface_ != nullptr) {
-
-        double now = g_timer_elapsed (timer_, NULL) ;
-
-        // increment enplacement of write index
-        write_index_ = (write_index_+1)%(stack_.size());
-        elapsed_stack_[write_index_] = now;
-        timestamps_[write_index_] = origin_->playtime();
-
-        // CLONE_RENDER : blit rendered framebuffer in the stack
-        if (provenance_ == CLONE_RENDER)
-            origin_->frame()->blit(stack_[write_index_]);
-        // CLONE_TEXTURE : render origin texture in the stack
-        else {
-            stack_[write_index_]->begin();
-            cloningsurface_->draw(glm::identity<glm::mat4>(), stack_[write_index_]->projection());
-            stack_[write_index_]->end();
-        }
-
-        // define emplacement of read index
-        if (delay_ < 0.001)
-            // minimal difference if no delay
-            read_index_ = write_index_;
-        else
-        {
-            // starting where we are at, get the next index that satisfies the delay
-            size_t previous_index = read_index_;
-            while ( now - elapsed_stack_[read_index_] > delay_)  {
-                // usually, one frame increment suffice
-                read_index_ = (read_index_ + 1 )%(stack_.size());
-                // break the loop if running infinite (never happens)
-                if (previous_index == read_index_)
-                    break;
-            }
-        }
-
-        // update the source surface to be rendered
-        texturesurface_->setTextureIndex( stack_[read_index_]->texture() );
-    }
-}
-
-
-void CloneSource::setDelay(double second)
-{
-    delay_ = CLAMP(second, 0.0, 1.0);
-}
-
-void CloneSource::play (bool on)
-{
-    // if a different state is asked
-    if (paused_ == on) {
-
-        // restart clean if was paused
-        if (paused_)
-            replay();
-        // toggle state
-        paused_ = !on;
-    }
-}
-
-bool CloneSource::playable () const
-{
-    if (origin_)
-        return origin_->playable();
-    return true;
-}
-
-void CloneSource::replay()
-{
-    g_timer_reset(timer_);
-    elapsed_stack_.fill(0.0);
-    write_index_ = 0;
-    read_index_ = 1;
-}
-
-guint64 CloneSource::playtime () const
-{
-    return timestamps_[read_index_];
-}
-
-
-uint CloneSource::texture() const
-{
-    if (cloningsurface_ != nullptr)
-        return stack_[read_index_]->texture();
-    else
-        return Resource::getTextureTransparent();
-}
-
-void CloneSource::accept(Visitor& v)
-{
-    Source::accept(v);
-    if (!failed())
-        v.visit(*this);
-}
-
-glm::ivec2 CloneSource::icon() const
-{
-    return glm::ivec2(ICON_SOURCE_CLONE);
-}
-
-std::string CloneSource::info() const
-{
-    return std::string("clone of ") + cloning_provenance_label[provenance_] + " from '" + origin_->name() + "'";
-}

CloneSource.h

@@ -1,74 +0,0 @@
-#ifndef CLONESOURCE_H
-#define CLONESOURCE_H
-
-#include <array>
-
-#define DELAY_ARRAY_SIZE 70
-
-#include "Source.h"
-
-class CloneSource : public Source
-{
-    friend class Source;
-
-public:
-    ~CloneSource();
-
-    // implementation of source API
-    void update (float dt) override;
-    void setActive (bool on) override;
-    bool playing () const override { return !paused_; }
-    void play (bool on) override;
-    bool playable () const  override;
-    void replay () override;
-    guint64 playtime () const override;
-    uint texture() const override;
-    bool failed() const override  { return origin_ == nullptr; }
-    void accept (Visitor& v) override;
-
-    // implementation of cloning mechanism
-    CloneSource *clone(uint64_t id = 0) override;
-    inline void detach() { origin_ = nullptr; }
-    inline Source *origin() const { return origin_; }
-
-    // Clone properties
-    typedef enum {
-        CLONE_TEXTURE = 0,
-        CLONE_RENDER
-    } CloneSourceProvenance;
-    static const char* cloning_provenance_label[2];
-
-    void setCloningProvenance(CloneSourceProvenance m) { provenance_ = m; }
-    CloneSourceProvenance cloningProvenance() const { return provenance_; }
-
-    void setDelay(double second);
-    double delay() const { return delay_; }
-
-    glm::ivec2 icon() const override;
-    std::string info() const override;
-
-protected:
-    // only Source class can create new CloneSource via clone();
-    CloneSource(Source *origin, uint64_t id = 0);
-
-    void init() override;
-    Source *origin_;
-
-    // cloning & stack of past frames
-    std::array<FrameBuffer *, DELAY_ARRAY_SIZE> stack_;
-    Surface *cloningsurface_;
-    size_t read_index_, write_index_;
-
-    // time management
-    GTimer *timer_;
-    std::array<double, DELAY_ARRAY_SIZE> elapsed_stack_;
-    std::array<guint64, DELAY_ARRAY_SIZE> timestamps_;
-    double delay_;
-
-    // control
-    bool paused_;
-    CloneSourceProvenance provenance_;
-};
-
-
-#endif // CLONESOURCE_H

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

InfoVisitor.cpp

@@ -1,384 +0,0 @@
-/*
- * This file is part of vimix - video live mixer
- *
- * **Copyright** (C) 2019-2022 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 "CloneSource.h"
-#include "RenderSource.h"
-#include "SessionSource.h"
-#include "PatternSource.h"
-#include "DeviceSource.h"
-#include "NetworkSource.h"
-#include "SrtReceiverSource.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)
-{
-    std::ostringstream oss;
-    oss << std::fixed << std::setprecision(1);
-    oss << "Pos    ( " << n.translation_.x << ", " << n.translation_.y << " )" << std::endl;
-    oss << "Scale ( " << n.scale_.x << ", " << n.scale_.y  << " )" << std::endl;
-    oss << "Angle " << std::setprecision(2) << n.rotation_.z * 180.f / M_PI << "\u00B0" << std::endl;
-
-    if (!brief_) {
-        oss << n.crop_.x << ", " << n.crop_.y << " Crop" << std::endl;
-    }
-
-    information_ = oss.str();
-}
-
-void InfoVisitor::visit(Group &)
-{
-}
-
-void InfoVisitor::visit(Switch &)
-{
-}
-
-void InfoVisitor::visit(Scene &)
-{
-}
-
-void InfoVisitor::visit(Primitive &)
-{
-}
-
-
-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.media().codec_name.substr(0, mp.media().codec_name.find_first_of(" (,")) << ", ";
-        oss << mp.width() << " x " << mp.height();
-        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_) {
-        oss << BaseToolkit::splitted(n.description(), '!').front();
-    }
-    else {
-        oss << n.description();
-    }
-    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 (s.session()->frame()){
-        if (brief_) {
-            oss << SystemToolkit::filename(s.path()) << " (";
-            oss << s.session()->numSource() << " sources)" << std::endl;
-            oss << "RGB, ";
-            oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
-        }
-        else {
-            oss << s.path() << std::endl;
-            oss << "RGB" << std::endl;
-            oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
-        }
-    }
-
-    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 << "RGB, ";
-        oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (RenderSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    std::ostringstream oss;
-
-    if (s.frame()){
-        if (brief_) {
-            oss << (s.frame()->use_alpha() ? "RGBA, " : "RGB, ");
-            oss << s.frame()->width() << " x " << s.frame()->height();
-        }
-        else {
-            oss << "Rendering Output (";
-            oss << RenderSource::rendering_provenance_label[s.renderingProvenance()] << ") " << std::endl;
-            oss << (s.frame()->use_alpha() ? "RGBA" : "RGB") << std::endl;
-            oss << s.frame()->width() << " x " << s.frame()->height();
-        }
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (CloneSource& s)
-{
-    if (current_id_ == s.id() || s.origin() == nullptr)
-        return;
-
-    std::ostringstream oss;
-
-    if (s.frame()){
-        if (brief_) {
-            oss << (s.frame()->use_alpha() ? "RGBA, " : "RGB, ");
-            oss << s.frame()->width() << " x " << s.frame()->height();
-        }
-        else {
-            if (s.origin())
-                oss << "Clone of '" << s.origin()->name() << "' ";
-            oss << CloneSource::cloning_provenance_label[s.cloningProvenance()] << std::endl;
-            oss << (s.frame()->use_alpha() ? "RGBA, " : "RGB, ");
-            oss << (int)(s.delay()*1000.0) << " ms delay " << std::endl;
-            oss << s.frame()->width() << " x " << s.frame()->height();
-        }
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (PatternSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    std::ostringstream oss;
-    if (s.pattern()) {
-        if (brief_) {
-            oss << "RGBA, " << s.pattern()->width() << " x " << s.pattern()->height();
-        }
-        else {
-            oss << Pattern::get(s.pattern()->type()).label << " pattern" << std::endl;
-            oss << "RGBA" << std::endl;
-            oss << s.pattern()->width() << " x " << s.pattern()->height();
-        }
-    }
-
-    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()));
-    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.stream << " " << best.format  << ", ";
-            oss << best.width << " x " << best.height << ", ";
-            oss << std::fixed << std::setprecision(1) << fps << " fps";
-        }
-        else {
-            oss << s.device() << std::endl;
-            oss << Device::manager().description( Device::manager().index(s.device()));
-            oss << ", " << best.stream << " " << best.format  << std::endl;
-            oss << best.width << " x " << best.height << ", ";
-            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 << NetworkToolkit::stream_protocol_label[ns->protocol()] << std::endl;
-        oss << "IP " << ns->serverAddress() << std::endl;
-        oss << ns->resolution().x << " x " << ns->resolution().y;
-    }
-    else {
-        oss << s.connection() << std::endl;
-        oss << NetworkToolkit::stream_protocol_label[ns->protocol()];
-        oss << " shared from IP " << ns->serverAddress() << std::endl;
-        oss << ns->resolution().x << " x " << ns->resolution().y;
-    }
-
-    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().max - s.sequence().min + 1 << " images [";
-        oss << s.sequence().min << " - " << s.sequence().max << "]" << std::endl;
-        oss << s.sequence().codec << ", ";
-        oss << s.sequence().width << " x " << s.sequence().height;
-    }
-    else {
-        oss << s.sequence().location << " [";
-        oss << s.sequence().min << " - " << s.sequence().max << "]" << std::endl;
-        oss << s.sequence().max - s.sequence().min + 1 << " ";
-        oss << s.sequence().codec << " images" << std::endl;
-        oss << s.sequence().width << " x " << s.sequence().height << ", " << s.framerate() << " fps";
-    }
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (GenericStreamSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    std::ostringstream oss;
-    if (s.stream()) {
-        std::string src_element = s.gstElements().front();
-
-        if (brief_) {
-            src_element = src_element.substr(0, src_element.find(" "));
-            oss << "gstreamer '" <<  src_element << "'" << std::endl;
-            oss << "RGBA, " << s.stream()->width() << " x " << s.stream()->height();
-        }
-        else {
-            oss << "gstreamer '" <<  src_element << "'" << std::endl;
-            oss << "RGBA" << std::endl;
-            oss << s.stream()->width() << " x " << s.stream()->height();
-        }
-    }
-    else
-        oss << "Undefined";
-
-    information_ = oss.str();
-    current_id_ = s.id();
-}
-
-void InfoVisitor::visit (SrtReceiverSource& s)
-{
-    if (current_id_ == s.id())
-        return;
-
-    std::ostringstream oss;
-
-    if (s.stream()) {
-        if (brief_)
-            oss << s.uri() << std::endl;
-        else {
-            oss << "SRT Receiver " << s.uri() << std::endl;
-            oss << "H264 (" << s.stream()->decoderName() << ")" << std::endl;
-            oss << s.stream()->width() << " x " << s.stream()->height();
-        }
-    }
-    else
-        oss << "Undefined";
-
-    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
 
@@ -79,32 +91,26 @@ Optionnal:
 - 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 
+    ~$ 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):

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()

docs/index.md

@@ -4,10 +4,10 @@ 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 streamed or recorded live (no audio).
+The output image is typically projected full-screen on external monitors 
+or projectors, but can be streamed live (SRT) or recorded (without audio).
 
-![screenshot](vimix_0.2_beta.jpg)
+![screenshot](vimix_screenshot.png)
 
 Check the [Graphical User Manual](https://github.com/brunoherbelin/vimix/wiki/User-manual) or [demo videos](https://vimeo.com/vimix) to discover vimix.
 Watch this selection of [videos by Jean Detheux](https://vimeo.com/showcase/7871359) to see what vimix can do.
@@ -18,11 +18,11 @@ Watch this selection of [videos by Jean Detheux](https://vimeo.com/showcase/7871
 
 ### Linux
 
-[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/vimix)
+Install the [flathub](https://flathub.org/apps/details/io.github.brunoherbelin.Vimix), [snap](https://snapcraft.io/vimix) or [Deb](https://tracker.debian.org/pkg/vimix) package. 
 
 ### Mac OSX
 
-Download package from [Github Releases](https://github.com/brunoherbelin/vimix/releases) page.
+Download package from [Github Releases](https://github.com/brunoherbelin/vimix/releases).
 
 ### Windows
 
@@ -31,18 +31,18 @@ Download package from [Github Releases](https://github.com/brunoherbelin/vimix/r
 ## Control vimix with OSC
 
 You can control remotely vimix with [OSC](https://en.wikipedia.org/wiki/Open_Sound_Control), using [TouchOSC Mk1](https://github.com/brunoherbelin/vimix/wiki/TouchOSC-companion)
-or using the [vimix OSC API](https://github.com/brunoherbelin/vimix/wiki/Open-Sound-Control-API) from your other OSC applications.
+or using the [vimix OSC API](https://github.com/brunoherbelin/vimix/wiki/Open-Sound-Control-API) from your OSC applications.
 
 ## About
 
-vimix is free and open source (GPL3).
+vimix is free and open source (GPL3+).
 
 vimix is the successor of [GLMixer](https://sourceforge.net/projects/glmixer/), benefiting
-from these 10 years of refinement of User-Experience design since its [first draft](https://sourceforge.net/p/glmixer/wiki/GLMixer%20History/).
+from 10 years of refinement of User-Experience design since its [first draft](https://sourceforge.net/p/glmixer/wiki/GLMixer%20History/).
 
-vimix is in its early infancy, open to [features requests and bugs reports](https://github.com/brunoherbelin/vimix/issues).
+vimix is open to [feature requests and bug reports](https://github.com/brunoherbelin/vimix/issues).
 
-vimix welcomes contributions and support: check the [wiki](https://github.com/brunoherbelin/vimix/wiki) for more info
+vimix welcomes contributions and support: check the [wiki](https://github.com/brunoherbelin/vimix/wiki) for more info.
 
 
 

docs/vimix.1

@@ -0,0 +1,63 @@
+.\"Created by Bruno Herbelin
+
+.TH vimix 1 "March 2022" "0.7.0" "vimix manpage"
+
+.SH NAME
+vimix \- Video live mixer
+
+..SH SYNOPSIS
+.B vimix
+.RI [ OPTIONS ]
+.RI [ FILE ]
+.br
+
+.SH DESCRIPTION
+.B vimix
+performs graphical mixing and blending of several movie clips and 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 or VJ-ing sessions.
+
+The output image is typically projected full-screen on an external monitor or a projector, but can be streamed live (SRT) or recorded (no audio).
+
+.SH OPTIONS
+
+.TP
+.BR \-V ", " \-\^\-version
+Output the version number of
+.B vimix
+and exit.
+
+.TP
+.BR \-C ", " \-\^\-clean
+Clean the user stored preferences of
+.B vimix
+and exit.
+
+.TP
+.BR \-T ", " \-\^\-test
+Perform a minimal rendering test and exit.
+
+.SH FILE
+
+Launches 
+.B vimix
+and tries to open the provided session file (.mix extension).
+
+.SH "SEE ALSO"
+.SS "Regular Manual Pages"
+.BR gst-launch-1.0 (1),
+.BR gst-inspect-1.0 (1)
+
+.SS "Documentation"
+A user manual and tutorials are available online (https://github.com/brunoherbelin/vimix/wiki).
+
+.SH BUGS
+.SS "Reporting bugs"
+Report bugs and issues on github (https://github.com/brunoherbelin/vimix).
+
+.SH COPYRIGHT
+GPL3+ license
+.PP
+Copyright (c) 2022 Bruno Herbelin
+.PP
+This document is part of the vimix software.