Update Flathub version 0.8.0

Attempt at linking vimix to MIME type .mix

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 output image is typically projected full-screen on an external
-monitor or a projector, but can be streamed live (SRT) or recorded (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 flathub](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/io.github.brunoherbelin.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
 
@@ -40,7 +40,7 @@ vimix is free and open source (GPL3+).
 vimix is the successor of [GLMixer](https://sourceforge.net/projects/glmixer/), benefiting
 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 [feature requests and bug 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.
 

osx/Info.plist.in

@@ -7,6 +7,11 @@
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                        <string>mix</string>
+                        <string>MIX</string>
+                        </array>
 			<key>CFBundleTypeName</key>
 			<string>vimix session</string>
 			<key>CFBundleTypeRole</key>
@@ -17,14 +22,14 @@
 			<true/>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>com.bhbn.mix</string>
+                            <string>com.bhbn.vimix</string>
 			</array>
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>vimix</string>
 	<key>CFBundleGetInfoString</key>
-	<string>vimix - Video Live Mix</string>
+        <string>vimix - Video Live Mixer</string>
 	<key>CFBundleIconFile</key>
 	<string>vimix.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -32,15 +37,15 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-        <string>0.7.0</string>
+        <string>version ${VIMIX_VERSION_MAJOR}.${VIMIX_VERSION_MINOR}.${VIMIX_VERSION_PATCH}</string>
 	<key>CFBundleName</key>
 	<string>vimix</string>
 	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-        <string>0.7</string>
-	<key>CFBundleVersion</key>
-        <string>0.7.0</string>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>${VIMIX_VERSION_MAJOR}.${VIMIX_VERSION_MINOR}</string>
+        <key>CFBundleVersion</key>
+        <string>${VIMIX_VERSION_MAJOR}.${VIMIX_VERSION_MINOR}.${VIMIX_VERSION_PATCH}</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSAppNapIsDisabled</key>
@@ -48,7 +53,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.video</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -61,7 +66,7 @@
         <key>NSMicrophoneUsageDescription</key>
         <string>vimix needs to access the microphone to enable sound sources.</string>
 	<key>NSHumanReadableCopyright</key>
-        <string>Copyright © 2022 Bruno Herbelin. All rights reserved.</string>
+        <string>Copyright © 2023 Bruno Herbelin. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>

share/metainfo/io.github.brunoherbelin.Vimix.metainfo.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2022 Bruno Herbelin -->
+<!-- Copyright 2023 Bruno Herbelin -->
 <component type="desktop-application">
   <id>io.github.brunoherbelin.Vimix</id>
   <launchable type="desktop-id">vimix.desktop</launchable>
@@ -7,15 +7,17 @@
   <summary>Video live mixer</summary>
   <description>
     <p>vimix performs graphical mixing and blending of several movie clips and
-   computer generated graphics, with image processing effects in real-time.</p>
-    <p>The documentation can be accessed on vimix github wiki.</p>
-  </description>
+   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.</p>
+    <p>The documentation is in the github wiki.</description>
   <screenshots>
     <screenshot type="default">
-      <image type="source">https://brunoherbelin.github.io/vimix/vimix_0.2_beta.jpg</image>
+      <image type="source">https://brunoherbelin.github.io/vimix/vimix_screenshot.png</image>
     </screenshot>
   </screenshots>
   <releases>
+    <release version="0.8.0" date="2023-03-31"/>
     <release version="0.7.3" date="2022-12-10"/>
     <release version="0.7.2" date="2022-11-19"/>
     <release version="0.7.1" date="2022-07-21"/>
@@ -27,8 +29,6 @@
   <developer_name>Bruno Herbelin</developer_name>
   <project_license>GPL-3.0-or-later</project_license>
   <metadata_license>CC0-1.0</metadata_license>
-  <content_rating type="oars-1.1">
-    <content_attribute id="social-audio">moderate</content_attribute>
-  </content_rating>
+  <content_rating type="oars-1.1" />
 </component>
 

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: vimix
-base: core18
+base: core20
 version: '0.8.0'
 summary: Live video mixing
 title: vimix
@@ -21,8 +21,8 @@ confinement: strict # use 'strict' once you have the right plugs and slots
 
 apps:
   vimix:
-    extensions: [gnome-3-28]
-    command: bin/vimix
+    extensions: [gnome-3-38]
+    command: usr/bin/vimix
     adapter: full
     plugs:
       - desktop
@@ -47,8 +47,8 @@ parts:
   vimix-binary:
     plugin: cmake
     source: .
-    configflags: 
-    - -DCMAKE_INSTALL_PREFIX=/
+    cmake-parameters:
+    - -DCMAKE_INSTALL_PREFIX=/usr
     - -DCMAKE_BUILD_TYPE=RelWithDebInfo
     build-packages:
     -  g++
@@ -80,6 +80,6 @@ parts:
     -  gstreamer1.0-plugins-ugly
     -  libgpm2
     -  libslang2
+    -  libpango-1.0-0
+    -  libicu66
 
-    
-    

src/CMakeLists.txt

@@ -110,7 +110,7 @@ IF(APPLE)
     )
 
     # set the Info.plist file
-    set(MACOSX_BUNDLE_PLIST_FILE ${CMAKE_SOURCE_DIR}/osx/Info.plist)
+    set(MACOSX_BUNDLE_PLIST_FILE ${CMAKE_SOURCE_DIR}/osx/Info.plist.in)
     set_target_properties(${VMIX_BINARY} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MACOSX_BUNDLE_PLIST_FILE})
 
     set(PLATFORM_LIBS

src/ImGuiVisitor.cpp

@@ -1446,6 +1446,8 @@ void ImGuiVisitor::visit (GenericStreamSource& s)
             Action::manager().store( s.name() + ": Change pipeline");
         }
 
+        botom = ImGui::GetCursorPos();
+
         // icon (>) to open player
         if ( s.playable() ) {
             ImGui::SetCursorPos(top);