Merge branch 'develop' into ferdnyc-patch-1

Author: ferdnyc

.github/labeler.yml

@@ -1,4 +1,4 @@
 # Add 'build' label to CMake changes
 build:
-  - **/CMakeList.txt
+  - /**/CMakeList.txt
   - /cmake/**/*.cmake

.gitlab-ci.yml

@@ -17,7 +17,7 @@ linux-builder:
     - export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64
     - mkdir -p build; cd build;
     - mkdir -p install-x64/python;
-    - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"CMAKE_BUILD_TYPE:STRING=Release" ../
+    - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"USE_SYSTEM_JSONCPP=0" ../
     - make
     - make install
     - make doc
@@ -70,7 +70,6 @@ windows-builder-x64:
     - Expand-Archive -Path artifacts.zip -DestinationPath .
     - $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x64"
     - $env:UNITTEST_DIR = "C:\msys64\usr"
-    - $env:ZMQDIR = "C:\msys64\usr"
     - $env:RESVGDIR = "C:\msys64\usr"
     - $env:Path = "C:\msys64\mingw64\bin;C:\msys64\mingw64\lib;C:\msys64\usr\lib\cmake\UnitTest++;C:\msys64\home\jonathan\depot_tools;C:\msys64\usr;C:\msys64\usr\lib;" + $env:Path;
     - New-Item -ItemType Directory -Force -Path build
@@ -101,7 +100,6 @@ windows-builder-x86:
     - $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x86"
     - $env:UNITTEST_DIR = "C:\msys32\usr"
     - $env:RESVGDIR = "C:\msys32\usr"
-    - $env:ZMQDIR = "C:\msys32\usr"
     - $env:Path = "C:\msys32\mingw32\bin;C:\msys32\mingw32\lib;C:\msys32\usr\lib\cmake\UnitTest++;C:\msys32\home\jonathan\depot_tools;C:\msys32\usr;C:\msys32\usr\lib;" + $env:Path;
     - New-Item -ItemType Directory -Force -Path build
     - New-Item -ItemType Directory -Force -Path build\install-x86\python

.travis.yml

@@ -1,4 +1,5 @@
 language: cpp
+compiler: gcc
 
 # This section uses a rather esoteric (and tricky!) feature of YAML,
 # &aliases and *anchors, to build package lists out of sublists without
@@ -32,7 +33,7 @@ addons:
 
 matrix:
   include:
-    - name: "FFmpeg 2 (Ubuntu 16.04 Xenial)"
+    - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
       env: BUILD_VERSION=ffmpeg2
       os: linux
       dist: xenial
@@ -44,7 +45,7 @@ matrix:
           packages:
           - *ff_common
 
-    - name: "FFmpeg 3 (Ubuntu 18.04 Bionic)"
+    - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
       env: BUILD_VERSION=ffmpeg3
       os: linux
       dist: bionic
@@ -57,7 +58,7 @@ matrix:
           - *ff_common
           - qt5-default
 
-    - name: "FFmpeg 4 (Ubuntu 18.04 Bionic)"
+    - name: "FFmpeg 4 GCC (Ubuntu 18.04 Bionic)"
       env: BUILD_VERSION=ffmpeg4
       os: linux
       dist: bionic
@@ -80,6 +81,21 @@ matrix:
           - libavresample4
           - libswresample3
 
+    - name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)"
+      env: BUILD_VERSION=ffmpeg3
+      os: linux
+      dist: bionic
+      compiler: clang
+      addons:
+        apt:
+          sources:
+          - sourceline: 'ppa:openshot.developers/libopenshot-daily'
+          - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
+          packages:
+          - *ff_common
+          - qt5-default
+          - libomp-dev
+
 script:
   - mkdir -p build; cd build;
   - cmake -DCMAKE_BUILD_TYPE:STRING="Debug" ../

CMakeLists.txt

@@ -72,13 +72,6 @@ configure_file(include/OpenShotVersion.h.in include/OpenShotVersion.h @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/OpenShotVersion.h
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libopenshot)
 
-############### Set up include paths #################
-list(APPEND OPENSHOT_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/effects
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/Qt
-    ${CMAKE_CURRENT_BINARY_DIR}/include )
-
 #### Enable C++11 (for std::shared_ptr support)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -88,9 +81,9 @@ IF (WIN32)
 	SET_PROPERTY(GLOBAL PROPERTY WIN32 "WIN32")
 ENDIF(WIN32)
 
-############## FIND ALL QT RELATED HEADERS ##############
-set(QT_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/Qt)
-FILE(GLOB QT_HEADER_FILES "${QT_HEADER_DIR}/*.h")
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}/include)
 
 ############## PROCESS src/ DIRECTORIES ##############
 add_subdirectory(src)
@@ -104,14 +97,14 @@ if (TARGET doc)
 	message(STATUS "Doxygen found, documentation target enabled")
 	message("\nTo compile documentation in doc/html, run: 'make doc'")
 
-# Install docs, if the user builds them with `make doc`
-install(CODE "MESSAGE(\"Checking for documentation files to install...\")")
-install(CODE "MESSAGE(\"(Compile with 'make doc' command, requires Doxygen)\")")
+  # Install docs, if the user builds them with `make doc`
+  install(CODE "MESSAGE(\"Checking for documentation files to install...\")")
+  install(CODE "MESSAGE(\"(Compile with 'make doc' command, requires Doxygen)\")")
 
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/
-        DESTINATION ${CMAKE_INSTALL_DOCDIR}/API
-        MESSAGE_NEVER # Don't spew about file copies
-        OPTIONAL )    # No error if the docs aren't found
+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/
+          DESTINATION ${CMAKE_INSTALL_DOCDIR}/API
+          MESSAGE_NEVER # Don't spew about file copies
+          OPTIONAL )    # No error if the docs aren't found
 endif()
 
 ############# PROCESS tests/ DIRECTORY ##############

Doxyfile.in

@@ -340,7 +340,7 @@ AUTOLINK_SUPPORT       = YES
 # diagrams that involve STL classes more complete and accurate.
 # The default value is: NO.
 
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
@@ -2096,7 +2096,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             =
+PREDEFINED             = USE_BLACKMAGIC USE_IMAGEMAGICK
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

cmake/Modules/FindFFmpeg.cmake

@@ -180,9 +180,16 @@ foreach (_component ${FFmpeg_FIND_COMPONENTS})
   endif ()
 endforeach ()
 
-# Build the include path with duplicates removed.
+# Build the result lists with duplicates removed, in case of repeated
+# invocations.
 if (FFmpeg_INCLUDE_DIRS)
   list(REMOVE_DUPLICATES FFmpeg_INCLUDE_DIRS)
+endif()
+if (FFmpeg_LIBRARIES)
+  list(REMOVE_DUPLICATES FFmpeg_LIBRARIES)
+endif()
+if(FFmpeg_DEFINITIONS)
+  list(REMOVE_DUPLICATES FFmpeg_DEFINITIONS)
 endif ()
 
 # cache the vars.

cmake/Modules/FindZeroMQ.cmake

@@ -0,0 +1,34 @@
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
+find_package(PkgConfig)
+pkg_check_modules(PC_LIBZMQ QUIET libzmq)
+
+set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
+
+find_path(ZeroMQ_INCLUDE_DIR zmq.h
+	  PATHS ${ZeroMQ_DIR}/include
+                ${PC_LIBZMQ_INCLUDE_DIRS})
+
+find_library(ZeroMQ_LIBRARY
+	     NAMES zmq
+	     PATHS ${ZeroMQ_DIR}/lib
+                   ${PC_LIBZMQ_LIBDIR}
+		   ${PC_LIBZMQ_LIBRARY_DIRS})
+
+if(ZeroMQ_LIBRARY)
+    set(ZeroMQ_FOUND ON)
+endif()
+
+set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+
+if(NOT TARGET libzmq)
+	add_library(libzmq UNKNOWN IMPORTED)
+	set_target_properties(libzmq PROPERTIES
+		IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
+		INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
+endif()
+
+include ( FindPackageHandleStandardArgs )
+# handle the QUIETLY and REQUIRED arguments and set ZMQ_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS )

include/AudioBufferSource.h

@@ -42,8 +42,6 @@
 #include <iomanip>
 #include "JuceHeader.h"
 
-using namespace std;
-
 /// This namespace is the default namespace for all code in the openshot library
 namespace openshot
 {

include/AudioDeviceInfo.h

@@ -37,10 +37,11 @@
  *
  * The type and name of the audio device.
  */
-struct AudioDeviceInfo
-{
-	string name;
-	string type;
-};
-
-#endif
+namespace openshot {
+	struct AudioDeviceInfo
+	{
+		std::string name;
+		std::string type;
+	};
+}
+#endif

include/AudioReaderSource.h

@@ -43,8 +43,6 @@
 #include "ReaderBase.h"
 #include "JuceHeader.h"
 
-using namespace std;
-
 /// This namespace is the default namespace for all code in the openshot library
 namespace openshot
 {