From b5ebee0bd7b9b81951405e17a48893cacde5ab15 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Mon, 13 Jul 2020 18:17:02 -0500 Subject: [PATCH 1/9] Updating linux to use Ubuntu Bionic build server --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b026a88..0b2de687 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ linux-builder: except: - tags tags: - - linux + - linux-bionic mac-builder: stage: build-libopenshot From 128deb51f53e9930f47373630e9777dc50ca9942 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Mon, 27 Jul 2020 18:56:56 -0500 Subject: [PATCH 2/9] Updating path to Qt5 on Mac builder --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b2de687..fe18593d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ mac-builder: - unzip artifacts.zip - export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64 - mkdir -p build; cd build; - - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc@8/bin/g++-8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc@8/bin/gcc-8 -DCMAKE_PREFIX_PATH=/usr/local/qt5/5.5/clang_64 -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../ + - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc@8/bin/g++-8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc@8/bin/gcc-8 -DCMAKE_PREFIX_PATH=/usr/local/qt5.12.x/Qt5.12.9/5.12.9/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../ - make - make install - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME" From 1bf6facab59ef113f3157bf2032d1ea87abbea1e Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Tue, 4 Aug 2020 17:06:02 -0500 Subject: [PATCH 3/9] Using new 5.15 qt install for mac builder --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe18593d..10e498cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ mac-builder: - unzip artifacts.zip - export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64 - mkdir -p build; cd build; - - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc@8/bin/g++-8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc@8/bin/gcc-8 -DCMAKE_PREFIX_PATH=/usr/local/qt5.12.x/Qt5.12.9/5.12.9/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../ + - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc@8/bin/g++-8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc@8/bin/gcc-8 -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../ - make - make install - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME" From 1a3a3a647ce65318f3fd8f712f2e8cc249474654 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 6 Aug 2020 02:23:01 -0500 Subject: [PATCH 4/9] Testing -stdlib=libc++ to prevent linking with gcc's libstd++ --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10e498cb..302b2f19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ mac-builder: - unzip artifacts.zip - export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64 - mkdir -p build; cd build; - - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc@8/bin/g++-8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc@8/bin/gcc-8 -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../ + - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc@8/bin/g++-8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc@8/bin/gcc-8 -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" -stdlib=libc++ ../ - make - make install - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME" From 099504246b5238587c0cce02a25bd13cbe5dd89a Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 6 Aug 2020 19:32:08 -0500 Subject: [PATCH 5/9] Experimental clang++ compiling of libopenshot --- .gitlab-ci.yml | 2 +- src/CMakeLists.txt | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 302b2f19..6b0235d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ mac-builder: - unzip artifacts.zip - export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64 - mkdir -p build; cd build; - - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc@8/bin/g++-8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc@8/bin/gcc-8 -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" -stdlib=libc++ ../ + - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" -stdlib=libc++ ../ - make - make install - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ccc31949..6c196379 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,6 +34,16 @@ if (POLICY CMP0057) cmake_policy(SET CMP0057 NEW) endif() +# Juce requires either DEBUG or NDEBUG to be defined on MacOS. +# -DNDEBUG is set by cmake for all release configs, so add +# -DDEBUG for debug builds. We'll do this for all OSes, even +# though only MacOS requires it. +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") +# Make sure we've picked some build type, default to debug +if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "") + set(CMAKE_BUILD_TYPE "Debug") +endif() + ################ WINDOWS ################## # Set some compiler options for Windows # required for libopenshot-audio headers @@ -45,7 +55,6 @@ endif() if (APPLE) # If you still get errors compiling with GCC 4.8, mac headers need to be patched: http://hamelot.co.uk/programming/osx-gcc-dispatch_block_t-has-not-been-declared-invalid-typedef/ set_property(GLOBAL PROPERTY JUCE_MAC "JUCE_MAC") - add_definitions(-DNDEBUG) set(EXTENSION "mm") set(JUCE_PLATFORM_SPECIFIC_DIR build/macosx/platform_specific_code) set(JUCE_PLATFORM_SPECIFIC_LIBRARIES "-framework Carbon -framework Cocoa -framework CoreFoundation -framework CoreAudio -framework CoreMidi -framework IOKit -framework AGL -framework AudioToolbox -framework QuartzCore -lobjc -framework Accelerate") From cdd2efd32bebd55103efa54f435ae579ba358eb1 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 6 Aug 2020 21:28:56 -0400 Subject: [PATCH 6/9] Replace math.h header with cmath --- include/Fraction.h | 2 +- include/FrameMapper.h | 2 +- include/KeyFrame.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Fraction.h b/include/Fraction.h index 9ffcda1f..88c16fbc 100644 --- a/include/Fraction.h +++ b/include/Fraction.h @@ -31,7 +31,7 @@ #ifndef OPENSHOT_FRACTION_H #define OPENSHOT_FRACTION_H -#include +#include namespace openshot { diff --git a/include/FrameMapper.h b/include/FrameMapper.h index 35dc8fb7..e78401a9 100644 --- a/include/FrameMapper.h +++ b/include/FrameMapper.h @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include "CacheMemory.h" diff --git a/include/KeyFrame.h b/include/KeyFrame.h index ee58da8f..6424473a 100644 --- a/include/KeyFrame.h +++ b/include/KeyFrame.h @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include "Exceptions.h" From cf8080a67e8dd12b485611ee1251151bba0ac50c Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 6 Aug 2020 23:48:16 -0400 Subject: [PATCH 7/9] Remove .../usr/include path on MacOS --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b0235d6..fd6f1e2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ mac-builder: - unzip artifacts.zip - export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64 - mkdir -p build; cd build; - - cmake -DCMAKE_CXX_FLAGS=-I\ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" -stdlib=libc++ ../ + - cmake -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_SHARED_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../ - make - make install - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME" From 9f4cdd46fbc58169bdff0a7c415c00f49d7f2ae1 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 7 Aug 2020 01:49:35 -0400 Subject: [PATCH 8/9] Frame: juce::String supports std::basic_ostream --- src/Frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Frame.cpp b/src/Frame.cpp index 764b9651..cf47556a 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -992,7 +992,7 @@ void Frame::Play() // Output error (if any) if (error.isNotEmpty()) { - cout << "Error on initialise(): " << error.toStdString() << endl; + cout << "Error on initialise(): " << error << endl; } juce::AudioSourcePlayer audioSourcePlayer; From 6b94dbb9dd7b398a9b3f77d5da23b82224f4947f Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 7 Aug 2020 00:49:36 -0400 Subject: [PATCH 9/9] Replace C compatibility headers with C++ --- include/ChunkReader.h | 4 ++-- include/ChunkWriter.h | 12 ++++++------ include/OpenMPUtilities.h | 4 ++-- include/Profiles.h | 10 +++++----- include/Qt/PlayerDemo.h | 12 ++++++------ include/ReaderBase.h | 2 +- include/RendererBase.h | 2 +- include/Settings.h | 6 +++--- include/ZmqLogger.h | 6 +++--- src/Qt/PlayerDemo.cpp | 9 ++++++++- src/examples/ExampleHtml.cpp | 5 +++-- 11 files changed, 40 insertions(+), 32 deletions(-) diff --git a/include/ChunkReader.h b/include/ChunkReader.h index cd7cd67f..50b26083 100644 --- a/include/ChunkReader.h +++ b/include/ChunkReader.h @@ -37,10 +37,10 @@ #include #include #include -#include -#include +#include #include #include +#include #include "Json.h" #include "CacheMemory.h" #include "Exceptions.h" diff --git a/include/ChunkWriter.h b/include/ChunkWriter.h index 5fee5a37..a63e4ca1 100644 --- a/include/ChunkWriter.h +++ b/include/ChunkWriter.h @@ -34,19 +34,19 @@ #include "ReaderBase.h" #include "WriterBase.h" #include "FFmpegWriter.h" +#include "CacheMemory.h" +#include "Exceptions.h" +#include "Json.h" #include #include #include #include -#include -#include -#include +#include #include #include -#include "CacheMemory.h" -#include "Exceptions.h" -#include "Json.h" +#include +#include namespace openshot diff --git a/include/OpenMPUtilities.h b/include/OpenMPUtilities.h index 9810d636..30bdd199 100644 --- a/include/OpenMPUtilities.h +++ b/include/OpenMPUtilities.h @@ -32,8 +32,8 @@ #define OPENSHOT_OPENMP_UTILITIES_H #include -#include -#include +#include +#include #include "Settings.h" diff --git a/include/Profiles.h b/include/Profiles.h index 3b5ebd0d..1de7c072 100644 --- a/include/Profiles.h +++ b/include/Profiles.h @@ -35,12 +35,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include "Exceptions.h" #include "Fraction.h" #include "Json.h" diff --git a/include/Qt/PlayerDemo.h b/include/Qt/PlayerDemo.h index f444334b..8dca83fc 100644 --- a/include/Qt/PlayerDemo.h +++ b/include/Qt/PlayerDemo.h @@ -31,12 +31,12 @@ #ifndef OPENSHOT_PLAYER_DEMO_H #define OPENSHOT_PLAYER_DEMO_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "VideoRenderWidget.h" diff --git a/include/ReaderBase.h b/include/ReaderBase.h index dfb9873d..ab765753 100644 --- a/include/ReaderBase.h +++ b/include/ReaderBase.h @@ -43,7 +43,7 @@ #include "Frame.h" #include "Json.h" #include "ZmqLogger.h" -#include +#include #include #include #include diff --git a/include/RendererBase.h b/include/RendererBase.h index 1c526937..5e65ea87 100644 --- a/include/RendererBase.h +++ b/include/RendererBase.h @@ -32,7 +32,7 @@ #define OPENSHOT_RENDERER_BASE_H #include "Frame.h" -#include // for realloc +#include // for realloc #include namespace openshot diff --git a/include/Settings.h b/include/Settings.h index e82bf56b..4b12c612 100644 --- a/include/Settings.h +++ b/include/Settings.h @@ -35,11 +35,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include "JuceHeader.h" diff --git a/include/ZmqLogger.h b/include/ZmqLogger.h index c165299e..af1eea6f 100644 --- a/include/ZmqLogger.h +++ b/include/ZmqLogger.h @@ -35,11 +35,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include "JuceHeader.h" diff --git a/src/Qt/PlayerDemo.cpp b/src/Qt/PlayerDemo.cpp index ba20e5cf..e5f0e11d 100644 --- a/src/Qt/PlayerDemo.cpp +++ b/src/Qt/PlayerDemo.cpp @@ -28,11 +28,18 @@ * along with OpenShot Library. If not, see . */ -#include "stdio.h" +#include #include "../../include/QtPlayer.h" #include "../../include/Qt/PlayerDemo.h" #include #include +#include +#include +#include +#include +#include +#include +#include PlayerDemo::PlayerDemo(QWidget *parent) : QWidget(parent) diff --git a/src/examples/ExampleHtml.cpp b/src/examples/ExampleHtml.cpp index f315e252..576961bc 100644 --- a/src/examples/ExampleHtml.cpp +++ b/src/examples/ExampleHtml.cpp @@ -32,11 +32,12 @@ #include #include #include -#include "../../include/OpenShot.h" -//#include "../../include/CrashHandler.h" #include #include +#include "../../include/OpenShot.h" +#include "../../include/CrashHandler.h" + using namespace openshot; int main(int argc, char* argv[]) {