diff --git a/README.md b/README.md index 6105915d3..a03ce11ec 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ https://github.com/OpenShot/libopenshot/issues ### License -Copyright (c) 2008-2020 OpenShot Studios, LLC. +Copyright (c) 2008-2021 OpenShot Studios, LLC. OpenShot Library (libopenshot) is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index b020592bd..7d5889213 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -58,6 +58,26 @@ endif() set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON) set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot) +# Set the SWIG_FLAGS from the library target, IFF its +# COMPILE_DEFINITIONS property is set (in practice, always true) +if(CMAKE_VERSION VERSION_GREATER 3.15) + set(_defs + $>) +elseif(CMAKE_VERSION VERSION_GREATER 3.12) + set(_defs $) +endif() +if(DEFINED _defs) + set_property(SOURCE openshot.i PROPERTY + COMPILE_DEFINITIONS ${_defs}) +else() + get_property(_defs TARGET openshot PROPERTY COMPILE_DEFINITIONS) + foreach(_d ${_defs}) + list(APPEND _flags -D${_d}) + endforeach() + set_property(SOURCE openshot.i PROPERTY + SWIG_FLAGS ${_flags}) +endif() + ### Suppress a ton of warnings in the generated SWIG C++ code set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \ -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \ @@ -65,13 +85,15 @@ set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \ separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS}) set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags}) -### Take include dirs from target, automatically if possible -if (CMAKE_VERSION VERSION_GREATER 3.13) - set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True) -elseif (CMAKE_VERSION VERSION_GREATER 3.12) - set_property(SOURCE openshot.i PROPERTY - INCLUDE_DIRECTORIES $) -endif () +### Take include dirs from target +if(CMAKE_VERSION VERSION_GREATER 3.15) + set(_inc $>) +elseif(CMAKE_VERSION VERSION_GREATER 3.12) + set(_inc $) +endif() +if (DEFINED _inc) + set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES ${_inc}) +endif() ### Add the SWIG interface file (which defines all the SWIG methods) if (CMAKE_VERSION VERSION_LESS 3.8.0) diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt index 72d1a9857..b145494bd 100644 --- a/bindings/ruby/CMakeLists.txt +++ b/bindings/ruby/CMakeLists.txt @@ -74,6 +74,26 @@ endif() set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON) set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot) +# Set the SWIG_FLAGS from the library target, IFF its +# COMPILE_DEFINITIONS property is set (in practice, always true) +if(CMAKE_VERSION VERSION_GREATER 3.15) + set(_defs + $>) +elseif(CMAKE_VERSION VERSION_GREATER 3.12) + set(_defs $) +endif() +if(DEFINED _defs) + set_property(SOURCE openshot.i PROPERTY + COMPILE_DEFINITIONS ${_defs}) +else() + get_property(_defs TARGET openshot PROPERTY COMPILE_DEFINITIONS) + foreach(_d ${_defs}) + list(APPEND _flags -D${_d}) + endforeach() + set_property(SOURCE openshot.i PROPERTY + SWIG_FLAGS ${_flags}) +endif() + ### Suppress a ton of warnings in the generated SWIG C++ code set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \ -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \ @@ -81,13 +101,15 @@ set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \ separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS}) set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags}) -### Take include dirs from target, automatically if possible -if (CMAKE_VERSION VERSION_GREATER 3.13) - set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True) -else () - set_property(SOURCE openshot.i PROPERTY - INCLUDE_DIRECTORIES $) -endif () +### Take include dirs from target +if(CMAKE_VERSION VERSION_GREATER 3.15) + set(_inc $>) +elseif(CMAKE_VERSION VERSION_GREATER 3.12) + set(_inc $) +endif() +if (DEFINED _inc) + set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES ${_inc}) +endif() ### Add the SWIG interface file (which defines all the SWIG methods) if (CMAKE_VERSION VERSION_LESS 3.8.0) diff --git a/cmake/Modules/FindResvg.cmake b/cmake/Modules/FindResvg.cmake index 452a81c8b..7a03c33ee 100644 --- a/cmake/Modules/FindResvg.cmake +++ b/cmake/Modules/FindResvg.cmake @@ -50,6 +50,7 @@ endif() find_path(Resvg_INCLUDE_DIRS ResvgQt.h PATHS + ${Resvg_ROOT} ${RESVGDIR} ${RESVGDIR}/include $ENV{RESVGDIR} @@ -65,6 +66,7 @@ find_path(Resvg_INCLUDE_DIRS find_library(Resvg_LIBRARIES NAMES resvg PATHS + ${Resvg_ROOT} ${RESVGDIR} ${RESVGDIR}/lib $ENV{RESVGDIR} diff --git a/iwyu.txt b/iwyu.txt new file mode 100644 index 000000000..15b7fda00 --- /dev/null +++ b/iwyu.txt @@ -0,0 +1,4174 @@ +error: no such file or directory: '/home/ferd/devel/libopenshot/build/src/openshot_autogen/mocs_compilation.cpp' +error: no input files +error: unable to handle compilation, expected exactly one compiler job in '' + + +/home/ferd/devel/libopenshot/src/AudioResampler.h should add these lines: +#include // for AudioS... +#include // for AudioS... +namespace juce { class ResamplingAudioSource; } +namespace openshot { class AudioBufferSource; } + +/home/ferd/devel/libopenshot/src/AudioResampler.h should remove these lines: +- #include "AudioBufferSource.h" // lines 34-34 +- #include "Exceptions.h" // lines 35-35 +- #include "JuceHeader.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/AudioResampler.h: +#include // for AudioS... +#include // for AudioS... +namespace juce { class ResamplingAudioSource; } +namespace openshot { class AudioBufferSource; } +--- + +/home/ferd/devel/libopenshot/src/AudioResampler.cpp should add these lines: +#include +#include // for round +#include // for NULL +#include "AudioBufferSource.h" + +/home/ferd/devel/libopenshot/src/AudioResampler.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/AudioResampler.cpp: +#include "AudioResampler.h" +#include +#include // for round +#include // for NULL +#include "AudioBufferSource.h" +--- + + +/home/ferd/devel/libopenshot/src/AudioBufferSource.h should add these lines: +#include +#include +#include +namespace juce { struct AudioSourceChannelInfo; } + +/home/ferd/devel/libopenshot/src/AudioBufferSource.h should remove these lines: +- #include // lines 34-34 +- #include "JuceHeader.h" // lines 35-35 + +The full include-list for /home/ferd/devel/libopenshot/src/AudioBufferSource.h: +#include +#include +#include +namespace juce { struct AudioSourceChannelInfo; } +--- + +/home/ferd/devel/libopenshot/src/AudioBufferSource.cpp should add these lines: +#include // for AudioSourceC... +#include // for NULL, std + +/home/ferd/devel/libopenshot/src/AudioBufferSource.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/AudioBufferSource.cpp: +#include "AudioBufferSource.h" +#include // for AudioSourceC... +#include // for NULL, std +--- + + +/home/ferd/devel/libopenshot/src/AudioReaderSource.h should add these lines: +#include +#include +#include +#include +#include +namespace juce { struct AudioSourceChannelInfo; } +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/AudioReaderSource.h should remove these lines: +- #include // lines 34-34 +- #include "JuceHeader.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/AudioReaderSource.h: +#include +#include +#include +#include +#include +#include "ReaderBase.h" +namespace juce { struct AudioSourceChannelInfo; } +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/AudioReaderSource.cpp should add these lines: +#include // for AudioSourceC... +#include // for NULL, std +#include "Exceptions.h" // for OutOfBoundsF... +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot +#include "ZmqLogger.h" // for ZmqLogger + +/home/ferd/devel/libopenshot/src/AudioReaderSource.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/AudioReaderSource.cpp: +#include "AudioReaderSource.h" +#include // for AudioSourceC... +#include // for NULL, std +#include "Exceptions.h" // for OutOfBoundsF... +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot +#include "ZmqLogger.h" // for ZmqLogger +--- + + +/home/ferd/devel/libopenshot/src/CacheBase.h should add these lines: +#include // for int64_t +#include // for string +#include "json/json.h" // for Value +namespace juce { class CriticalSection; } +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/CacheBase.h should remove these lines: +- #include // lines 35-35 +- #include "Exceptions.h" // lines 37-37 +- #include "Frame.h" // lines 36-36 +- #include "Json.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/src/CacheBase.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "json/json.h" // for Value +namespace juce { class CriticalSection; } +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/CacheBase.cpp should add these lines: +#include // for CriticalSection +#include // for stringstream +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/CacheBase.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/CacheBase.cpp: +#include "CacheBase.h" +#include // for CriticalSection +#include // for stringstream +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/CacheDisk.h should add these lines: +#include // for QDir +#include // for int64_t +#include // for string +#include // for vector +#include "json/json.h" // for Value +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/CacheDisk.h should remove these lines: +- #include // lines 40-40 +- #include "Exceptions.h" // lines 39-39 +- #include "Frame.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/src/CacheDisk.h: +#include // for QDir +#include // for int64_t +#include // for deque +#include // for map +#include // for shared_ptr +#include // for string +#include // for vector +#include "CacheBase.h" // for CacheBase +#include "json/json.h" // for Value +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/CacheDisk.cpp should add these lines: +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for QFile +#include // for QImage, QImage::... +#include // for QIODevice, QIODe... +#include // for QString, operator+ +#include // for QTextStream, ope... +#include // for NULL +#include // for sort +#include // for int64_t +#include // for operator!= +#include // for stringstream +#include "ChannelLayouts.h" // for ChannelLayout +#include "Exceptions.h" // for InvalidJSON +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/CacheDisk.cpp should remove these lines: +- #include // lines 34-34 +- #include // lines 35-35 +- #include // lines 33-33 + +The full include-list for /home/ferd/devel/libopenshot/src/CacheDisk.cpp: +#include "CacheDisk.h" +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for QFile +#include // for QImage, QImage::... +#include // for QIODevice, QIODe... +#include // for QString, operator+ +#include // for QTextStream, ope... +#include // for NULL +#include // for sort +#include // for int64_t +#include // for operator!= +#include // for stringstream +#include "ChannelLayouts.h" // for ChannelLayout +#include "Exceptions.h" // for InvalidJSON +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "QtUtilities.h" // for endl +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/CacheMemory.h should add these lines: +#include // for int64_t +#include // for string +#include // for vector +#include "json/json.h" // for Value +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/CacheMemory.h should remove these lines: +- #include "Exceptions.h" // lines 39-39 +- #include "Frame.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/src/CacheMemory.h: +#include // for int64_t +#include // for deque +#include // for map +#include // for shared_ptr +#include // for string +#include // for vector +#include "CacheBase.h" // for CacheBase +#include "json/json.h" // for Value +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/CacheMemory.cpp should add these lines: +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for sort +#include // for NULL, std +#include // for int64_t +#include // for operator!=, reve... +#include "Exceptions.h" // for InvalidJSON +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/CacheMemory.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/CacheMemory.cpp: +#include "CacheMemory.h" +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for sort +#include // for NULL, std +#include // for int64_t +#include // for operator!=, reve... +#include "Exceptions.h" // for InvalidJSON +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/Color.h should add these lines: +#include // for int64_t +#include // for string +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/Color.h should remove these lines: +- #include // lines 35-35 + +The full include-list for /home/ferd/devel/libopenshot/src/Color.h: +#include // for int64_t +#include // for string +#include "KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/Color.cpp should add these lines: +#include // for exception +#include // for sqrt +#include // for QColor +#include // for QString +#include "Exceptions.h" // for InvalidJSON, openshot +#include "Json.h" // for stringToJson + +/home/ferd/devel/libopenshot/src/Color.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Color.cpp: +#include "Color.h" +#include // for exception +#include // for sqrt +#include // for QColor +#include // for QString +#include "Exceptions.h" // for InvalidJSON, openshot +#include "Json.h" // for stringToJson +--- + + +/home/ferd/devel/libopenshot/src/ChunkWriter.h should add these lines: +#include // for int64_t +#include // for shared_ptr +#include // for string +namespace openshot { class FFmpegWriter; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } + +/home/ferd/devel/libopenshot/src/ChunkWriter.h should remove these lines: +- #include // lines 48-48 +- #include // lines 47-47 +- #include // lines 49-49 +- #include // lines 41-41 +- #include // lines 45-45 +- #include // lines 42-42 +- #include // lines 44-44 +- #include // lines 43-43 +- #include // lines 46-46 +- #include "CacheMemory.h" // lines 37-37 +- #include "Exceptions.h" // lines 38-38 +- #include "FFmpegWriter.h" // lines 36-36 +- #include "Json.h" // lines 39-39 +- #include "ReaderBase.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/src/ChunkWriter.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "WriterBase.h" // for WriterBase +namespace openshot { class FFmpegWriter; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +--- + +/home/ferd/devel/libopenshot/src/ChunkWriter.cpp should add these lines: +#include // for QDir +#include // for operator+, QString +#include // for ofstream, basic_ostream, stringstream, endl +#include "Exceptions.h" // for WriterClosed +#include "FFmpegWriter.h" // for FFmpegWriter +#include "Frame.h" // for Frame +#include "ReaderBase.h" // for ReaderBase +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/ChunkWriter.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/ChunkWriter.cpp: +#include "ChunkWriter.h" +#include // for QDir +#include // for operator+, QString +#include // for ofstream, basic_ostream, stringstream, endl +#include "Exceptions.h" // for WriterClosed +#include "FFmpegWriter.h" // for FFmpegWriter +#include "Frame.h" // for Frame +#include "ReaderBase.h" // for ReaderBase +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/effects/../ChunkReader.h should add these lines: +#include // for NULL + +/home/ferd/devel/libopenshot/src/effects/../ChunkReader.h should remove these lines: +- #include // lines 36-36 +- #include // lines 35-35 +- #include "CacheMemory.h" // lines 40-40 +- #include "Frame.h" // lines 38-38 +- #include "Json.h" // lines 39-39 +- #include "ReaderBase.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/../ChunkReader.h: +#include // for NULL +--- + +/home/ferd/devel/libopenshot/src/ChunkReader.cpp should add these lines: +#include // for exception +#include // for QDir +#include // for operator+, QString +#include // for int64_t +#include // for shared_ptr, __shared_ptr_access +#include // for stringstream, ifstream, basic_o... +#include // for string, stoll, getline, operator<< +#include "Settings.h" // for openshot +#include "effects/../ChunkReader.h" // for ChunkReader, ChunkLocation, Chu... +#include "effects/../Exceptions.h" // for InvalidJSON, InvalidFile, Chunk... +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../ReaderBase.h" // for ReaderInfo, ReaderBase +#include "json/json.h" // for Value, parseFromStream, CharRea... + +/home/ferd/devel/libopenshot/src/ChunkReader.cpp should remove these lines: +- #include // lines 34-34 +- #include "FFmpegReader.h" // lines 32-32 + +The full include-list for /home/ferd/devel/libopenshot/src/ChunkReader.cpp: +#include "ChunkReader.h" +#include // for exception +#include // for QDir +#include // for operator+, QString +#include // for int64_t +#include // for shared_ptr, __shared_ptr_access +#include // for stringstream, ifstream, basic_o... +#include // for string, stoll, getline, operator<< +#include "Settings.h" // for openshot +#include "effects/../ChunkReader.h" // for ChunkReader, ChunkLocation, Chu... +#include "effects/../Exceptions.h" // for InvalidJSON, InvalidFile, Chunk... +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../ReaderBase.h" // for ReaderInfo, ReaderBase +#include "json/json.h" // for Value, parseFromStream, CharRea... +--- + + +/home/ferd/devel/libopenshot/src/Coordinate.h should add these lines: +#include // for string +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/Coordinate.h should remove these lines: +- #include // lines 34-34 +- #include "Exceptions.h" // lines 35-35 +- #include "Fraction.h" // lines 36-36 +- #include "Json.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/Coordinate.h: +#include // for string +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/Coordinate.cpp should add these lines: +#include // for exception +#include // for std +#include "Exceptions.h" // for InvalidJSON, openshot +#include "Json.h" // for stringToJson + +/home/ferd/devel/libopenshot/src/Coordinate.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Coordinate.cpp: +#include "Coordinate.h" +#include // for exception +#include // for std +#include "Exceptions.h" // for InvalidJSON, openshot +#include "Json.h" // for stringToJson +--- + + +/home/ferd/devel/libopenshot/src/ClipBase.h should add these lines: +#include // for NULL +#include // for int64_t +#include // for string +#include "json/json.h" // for Value +namespace openshot { class Frame; } +namespace openshot { class Keyframe; } +namespace openshot { class TimelineBase; } + +/home/ferd/devel/libopenshot/src/ClipBase.h should remove these lines: +- #include // lines 35-35 +- #include "Exceptions.h" // lines 37-37 +- #include "Frame.h" // lines 38-38 +- #include "Json.h" // lines 41-41 +- #include "KeyFrame.h" // lines 40-40 +- #include "Point.h" // lines 39-39 +- #include "TimelineBase.h" // lines 42-42 + +The full include-list for /home/ferd/devel/libopenshot/src/ClipBase.h: +#include // for NULL +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "CacheMemory.h" // for CacheMemory +#include "json/json.h" // for Value +namespace openshot { class Frame; } +namespace openshot { class Keyframe; } +namespace openshot { class TimelineBase; } +--- + +/home/ferd/devel/libopenshot/src/ClipBase.cpp should add these lines: +#include "Coordinate.h" // for Coordinate +#include "KeyFrame.h" // for Keyframe +#include "Point.h" // for Point, CONSTANT +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/ClipBase.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/ClipBase.cpp: +#include "ClipBase.h" +#include "Coordinate.h" // for Coordinate +#include "KeyFrame.h" // for Keyframe +#include "Point.h" // for Point, CONSTANT +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/CrashHandler.h should add these lines: +#include // for siginfo_t + +/home/ferd/devel/libopenshot/src/CrashHandler.h should remove these lines: +- #include // lines 45-45 +- #include // lines 44-44 +- #include // lines 42-42 +- #include // lines 36-36 +- #include // lines 34-34 +- #include "ZmqLogger.h" // lines 46-46 + +The full include-list for /home/ferd/devel/libopenshot/src/CrashHandler.h: +#include // for siginfo_t +#include // for FILE +--- + +/home/ferd/devel/libopenshot/src/CrashHandler.cpp should add these lines: +#include // for __cxa_demangle +#include // for backtrace, backtrace_symbols +#include // for sigaction, sigemptyset, SIGABRT, SIGBUS, SIGFPE +#include // for NULL, exit, free +#include // for operator<<, setw, left +#include // for operator<<, basic_ostream, char_traits, endl +#include "Settings.h" // for openshot +#include "ZmqLogger.h" // for ZmqLogger + +/home/ferd/devel/libopenshot/src/CrashHandler.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/CrashHandler.cpp: +#include "CrashHandler.h" +#include // for __cxa_demangle +#include // for backtrace, backtrace_symbols +#include // for sigaction, sigemptyset, SIGABRT, SIGBUS, SIGFPE +#include // for NULL, exit, free +#include // for operator<<, setw, left +#include // for operator<<, basic_ostream, char_traits, endl +#include "Settings.h" // for openshot +#include "ZmqLogger.h" // for ZmqLogger +--- + + +/home/ferd/devel/libopenshot/src/Clip.h should add these lines: +#include // for AudioS... +#include // for Critic... +#include // for int64_t +#include // for list +#include "CacheMemory.h" // for CacheM... +#include "effects/../Color.h" // for Color +#include "effects/../EffectBase.h" // for Effect... +#include "json/json.h" // for Value +namespace openshot { class AudioResampler; } +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/Clip.h should remove these lines: +- #include // lines 36-36 +- #include "AudioResampler.h" // lines 37-37 +- #include "Color.h" // lines 39-39 +- #include "EffectBase.h" // lines 41-41 +- #include "EffectInfo.h" // lines 43-43 +- #include "Effects.h" // lines 42-42 +- #include "Fraction.h" // lines 44-44 +- #include "Frame.h" // lines 45-45 +- #include "JuceHeader.h" // lines 48-48 + +The full include-list for /home/ferd/devel/libopenshot/src/Clip.h: +#include // for AudioS... +#include // for Critic... +#include // for int64_t +#include // for list +#include // for shared... +#include // for string +#include "CacheMemory.h" // for CacheM... +#include "ClipBase.h" // for ClipBase +#include "Enums.h" // for Anchor... +#include "KeyFrame.h" // for Keyframe +#include "ReaderBase.h" // for Reader... +#include "effects/../Color.h" // for Color +#include "effects/../EffectBase.h" // for Effect... +#include "json/json.h" // for Value +namespace openshot { class AudioResampler; } +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/Clip.cpp should add these lines: +#include // for QFlags +#include // for exception +#include // for tolower +#include // for GenericScopedLock +#include // for fabs, round, abs +#include // for QColor +#include // for QImage +#include // for KeepAspectRatio, Igno... +#include // for QPainter, operator| +#include // for QSize +#include // for QString +#include // for QTransform +#include // for NULL, abs, strtof +#include // for transform +#include // for map +#include // for operator<<, stringstream +#include "AudioBufferSource.h" // for openshot +#include "AudioResampler.h" // for AudioResampler +#include "EffectInfo.h" // for EffectInfo +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROCESSORS +#include "TimelineBase.h" // for TimelineBase +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../Exceptions.h" // for ReaderClosed, Invalid... +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/Clip.cpp should remove these lines: +- #include "FrameMapper.h" // lines 33-33 + +The full include-list for /home/ferd/devel/libopenshot/src/Clip.cpp: +#include "Clip.h" +#include // for QFlags +#include // for exception +#include // for tolower +#include // for GenericScopedLock +#include // for fabs, round, abs +#include // for QColor +#include // for QImage +#include // for KeepAspectRatio, Igno... +#include // for QPainter, operator| +#include // for QSize +#include // for QString +#include // for QTransform +#include // for NULL, abs, strtof +#include // for transform +#include // for map +#include // for operator<<, stringstream +#include "AudioBufferSource.h" // for openshot +#include "AudioResampler.h" // for AudioResampler +#include "ChunkReader.h" // for ChunkReader, ChunkVer... +#include "DummyReader.h" // for DummyReader +#include "EffectInfo.h" // for EffectInfo +#include "FFmpegReader.h" // for FFmpegReader +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROCESSORS +#include "QtImageReader.h" // for QtImageReader +#include "Timeline.h" // for Timeline +#include "TimelineBase.h" // for TimelineBase +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../Exceptions.h" // for ReaderClosed, Invalid... +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/RendererBase.h should add these lines: +#include // for int64_t +class QImage; + +/home/ferd/devel/libopenshot/src/RendererBase.h should remove these lines: +- #include // lines 35-35 +- #include "Frame.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/src/RendererBase.h: +#include // for int64_t +#include // for shared_ptr +class QImage; +namespace openshot { class Frame; } // lines 40-40 +--- + +/home/ferd/devel/libopenshot/src/RendererBase.cpp should add these lines: +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/RendererBase.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/RendererBase.cpp: +#include "RendererBase.h" +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/DummyReader.h should add these lines: +#include // for int64_t +#include // for string +#include "json/json.h" // for Value +namespace openshot { class CacheBase; } +namespace openshot { class Fraction; } +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/DummyReader.h should remove these lines: +- #include // lines 39-39 +- #include // lines 40-40 +- #include // lines 36-36 +- #include // lines 38-38 +- #include "Exceptions.h" // lines 43-43 +- #include "Fraction.h" // lines 44-44 + +The full include-list for /home/ferd/devel/libopenshot/src/DummyReader.h: +#include // for int64_t +#include // for NULL +#include // for shared_ptr +#include // for string +#include "CacheMemory.h" // for CacheMemory +#include "ReaderBase.h" // for ReaderBase +#include "json/json.h" // for Value +namespace openshot { class CacheBase; } +namespace openshot { class Fraction; } +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/DummyReader.cpp should add these lines: +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include "CacheBase.h" // for CacheBase +#include "Exceptions.h" // for InvalidFile, Inv... +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/DummyReader.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/DummyReader.cpp: +#include "DummyReader.h" +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include "CacheBase.h" // for CacheBase +#include "Exceptions.h" // for InvalidFile, Inv... +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/ReaderBase.h should add these lines: +#include // for CriticalSection +#include // for int64_t +#include // for map +#include // for string +#include "json/json.h" // for Value +namespace openshot { class CacheBase; } +namespace openshot { class ClipBase; } +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/ReaderBase.h should remove these lines: +- #include // lines 47-47 +- #include // lines 49-49 +- #include // lines 48-48 +- #include // lines 50-50 +- #include // lines 46-46 +- #include // lines 37-37 +- #include // lines 35-35 +- #include // lines 34-34 +- #include // lines 38-38 +- #include "CacheMemory.h" // lines 39-39 +- #include "ClipBase.h" // lines 41-41 +- #include "Frame.h" // lines 43-43 +- #include "Json.h" // lines 44-44 +- #include "ZmqLogger.h" // lines 45-45 + +The full include-list for /home/ferd/devel/libopenshot/src/ReaderBase.h: +#include // for CriticalSection +#include // for int64_t +#include // for map +#include // for shared_ptr +#include // for string +#include "ChannelLayouts.h" // for ChannelLayout +#include "Fraction.h" // for Fraction +#include "json/json.h" // for Value +namespace openshot { class CacheBase; } +namespace openshot { class ClipBase; } +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/ReaderBase.cpp should add these lines: +#include // for NULL +#include // for operator<<, setprecision +#include // for operator<<, endl, basic_ostream, basic_ostream... +#include // for pair +#include "Settings.h" // for openshot +namespace openshot { class ClipBase; } + +/home/ferd/devel/libopenshot/src/ReaderBase.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/ReaderBase.cpp: +#include "ReaderBase.h" +#include // for NULL +#include // for operator<<, setprecision +#include // for operator<<, endl, basic_ostream, basic_ostream... +#include // for pair +#include "Settings.h" // for openshot +namespace openshot { class ClipBase; } +--- + + +/home/ferd/devel/libopenshot/src/EffectBase.h should add these lines: +#include // for string +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/EffectBase.h should remove these lines: +- #include // lines 35-35 +- #include // lines 34-34 +- #include // lines 36-36 +- #include "Frame.h" // lines 39-39 +- #include "Json.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/src/EffectBase.h: +#include // for string +#include "ClipBase.h" // for ClipBase +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/EffectBase.cpp should add these lines: +#include // for exception +#include // for NULL +#include // for operator<<, setprecision +#include // for operator<<, endl, basic_ostream, cout +#include "Exceptions.h" // for InvalidJSON +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/EffectBase.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/EffectBase.cpp: +#include "EffectBase.h" +#include // for exception +#include // for NULL +#include // for operator<<, setprecision +#include // for operator<<, endl, basic_ostream, cout +#include "Exceptions.h" // for InvalidJSON +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/WriterBase.h should add these lines: +#include // for int64_t +#include // for map +#include // for shared_ptr +#include // for string +#include "json/json.h" // for Value +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } + +/home/ferd/devel/libopenshot/src/WriterBase.h should remove these lines: +- #include // lines 35-35 +- #include // lines 34-34 +- #include "Frame.h" // lines 38-38 +- #include "ReaderBase.h" // lines 39-39 +- #include "ZmqLogger.h" // lines 40-40 + +The full include-list for /home/ferd/devel/libopenshot/src/WriterBase.h: +#include // for int64_t +#include // for map +#include // for shared_ptr +#include // for string +#include "ChannelLayouts.h" // for ChannelLayout +#include "Fraction.h" // for Fraction +#include "json/json.h" // for Value +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +--- + +/home/ferd/devel/libopenshot/src/WriterBase.cpp should add these lines: +#include // for exception +#include // for operator<<, setprecision +#include // for operator<<, endl, basic_ostream, basic_o... +#include "Exceptions.h" // for InvalidJSON +#include "Json.h" // for stringToJson +#include "ReaderBase.h" // for ReaderBase, ReaderInfo + +/home/ferd/devel/libopenshot/src/WriterBase.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/WriterBase.cpp: +#include "WriterBase.h" +#include // for exception +#include // for operator<<, setprecision +#include // for operator<<, endl, basic_ostream, basic_o... +#include "Exceptions.h" // for InvalidJSON +#include "Json.h" // for stringToJson +#include "ReaderBase.h" // for ReaderBase, ReaderInfo +--- + + +/home/ferd/devel/libopenshot/src/EffectInfo.h should add these lines: +#include // for string +#include "json/json.h" // for Value +namespace openshot { class EffectBase; } + +/home/ferd/devel/libopenshot/src/EffectInfo.h should remove these lines: +- #include "Effects.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/src/EffectInfo.h: +#include // for string +#include "json/json.h" // for Value +namespace openshot { class EffectBase; } +--- + +/home/ferd/devel/libopenshot/src/EffectInfo.cpp should add these lines: +#include // for NULL +#include "Settings.h" // for openshot +#include "effects/Bars.h" // for Bars +#include "effects/Blur.h" // for Blur +#include "effects/Brightness.h" // for Brightness +#include "effects/Caption.h" // for Caption +#include "effects/ChromaKey.h" // for ChromaKey +#include "effects/ColorShift.h" // for ColorShift +#include "effects/Crop.h" // for Crop +#include "effects/Deinterlace.h" // for Deinterlace +#include "effects/Hue.h" // for Hue +#include "effects/Mask.h" // for Mask +#include "effects/Negate.h" // for Negate +#include "effects/Pixelate.h" // for Pixelate +#include "effects/Saturation.h" // for Saturation +#include "effects/Shift.h" // for Shift +#include "effects/Wave.h" // for Wave +namespace openshot { class EffectBase; } + +/home/ferd/devel/libopenshot/src/EffectInfo.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/EffectInfo.cpp: +#include "EffectInfo.h" +#include // for NULL +#include "Settings.h" // for openshot +#include "effects/Bars.h" // for Bars +#include "effects/Blur.h" // for Blur +#include "effects/Brightness.h" // for Brightness +#include "effects/Caption.h" // for Caption +#include "effects/ChromaKey.h" // for ChromaKey +#include "effects/ColorShift.h" // for ColorShift +#include "effects/Crop.h" // for Crop +#include "effects/Deinterlace.h" // for Deinterlace +#include "effects/Hue.h" // for Hue +#include "effects/Mask.h" // for Mask +#include "effects/Negate.h" // for Negate +#include "effects/Pixelate.h" // for Pixelate +#include "effects/Saturation.h" // for Saturation +#include "effects/Shift.h" // for Shift +#include "effects/Wave.h" // for Wave +namespace openshot { class EffectBase; } +--- + + +/home/ferd/devel/libopenshot/src/Fraction.h should add these lines: + +/home/ferd/devel/libopenshot/src/Fraction.h should remove these lines: +- #include // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/src/Fraction.h: +--- + +/home/ferd/devel/libopenshot/src/Fraction.cpp should add these lines: +#include // for round + +/home/ferd/devel/libopenshot/src/Fraction.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Fraction.cpp: +#include "Fraction.h" +#include // for round +--- + +/home/ferd/devel/libopenshot/src/FFmpegReader.cpp:42:9: warning: You are compiling with experimental hardware decode [-W#pragma-messages] +#pragma message "You are compiling with experimental hardware decode" + ^ + +/home/ferd/devel/libopenshot/src/effects/../FFmpegReader.h should add these lines: + +/home/ferd/devel/libopenshot/src/effects/../FFmpegReader.h should remove these lines: +- #include // lines 45-45 +- #include // lines 42-42 +- #include // lines 43-43 +- #include // lines 44-44 +- #include // lines 46-46 +- #include "CacheMemory.h" // lines 47-47 +- #include "Clip.h" // lines 48-48 +- #include "Exceptions.h" // lines 49-49 +- #include "FFmpegUtilities.h" // lines 40-40 +- #include "OpenMPUtilities.h" // lines 50-50 +- #include "ReaderBase.h" // lines 37-37 +- #include "Settings.h" // lines 51-51 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/../FFmpegReader.h: +--- + +/home/ferd/devel/libopenshot/src/FFmpegReader.cpp should add these lines: +#include // for exception +#include // for EAGAIN, EINVAL +#include // for CriticalSection +#include // for GenericScopedLock +#include // for AVCodecContext +#include // for AVStream, AVForm... +#include // for avio_size +#include // for AVMEDIA_TYPE_AUDIO +#include // for av_buffer_unref +#include // for av_get_default_c... +#include // for AVDictionaryEntry +#include // for AVERROR, AVERROR... +#include // for AVFrame, av_fram... +#include // for AVHWFramesConstr... +#include // for av_image_alloc +#include // for av_freep, av_free +#include // for av_opt_set_int +#include // for AVPixelFormat +#include // for AVRational +#include // for AV_SAMPLE_FMT_S16 +#include // for sws_freeContext +#include // for omp_set_max_acti... +#include // for QImage, QImage::... +#include // for QSize +#include // for QString +#include // for fprintf, snprintf +#include // for abs +#include // for memcpy +#include // for access, W_OK +#include // for max, min +#include // for round, abs +#include // for int64_t, uint8_t +#include // for NULL +#include // for multimap, map +#include // for shared_ptr, __sh... +#include // for string +#include // for pair +#include "CacheMemory.h" // for CacheMemory +#include "ChannelLayouts.h" // for ChannelLayout +#include "Clip.h" // for Clip +#include "Coordinate.h" // for Coordinate +#include "Enums.h" // for SCALE_CROP, SCAL... +#include "FFmpegUtilities.h" // for AV_GET_CODEC_ATT... +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROC... +#include "Point.h" // for Point +#include "Settings.h" // for Settings, openshot +#include "TimelineBase.h" // for TimelineBase +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../Exceptions.h" // for InvalidCodec +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/../ReaderBase.h" // for ReaderInfo, Read... +#include "json/json.h" // for Value +struct SwsContext; + +/home/ferd/devel/libopenshot/src/FFmpegReader.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/FFmpegReader.cpp: +#include "FFmpegReader.h" +#include // for exception +#include // for EAGAIN, EINVAL +#include // for CriticalSection +#include // for GenericScopedLock +#include // for AVCodecContext +#include // for AVStream, AVForm... +#include // for avio_size +#include // for AVMEDIA_TYPE_AUDIO +#include // for av_buffer_unref +#include // for av_get_default_c... +#include // for AVDictionaryEntry +#include // for AVERROR, AVERROR... +#include // for AVFrame, av_fram... +#include // for AVHWFramesConstr... +#include // for av_image_alloc +#include // for av_freep, av_free +#include // for av_opt_set_int +#include // for AVPixelFormat +#include // for AVRational +#include // for AV_SAMPLE_FMT_S16 +#include // for sws_freeContext +#include // for omp_set_max_acti... +#include // for QImage, QImage::... +#include // for QSize +#include // for QString +#include // for fprintf, snprintf +#include // for abs +#include // for memcpy +#include // for access, W_OK +#include // for max, min +#include // for milliseconds +#include // for round, abs +#include // for int64_t, uint8_t +#include // for NULL +#include // for multimap, map +#include // for shared_ptr, __sh... +#include // for string +#include // for sleep_for +#include // for pair +#include "CacheMemory.h" // for CacheMemory +#include "ChannelLayouts.h" // for ChannelLayout +#include "Clip.h" // for Clip +#include "Coordinate.h" // for Coordinate +#include "Enums.h" // for SCALE_CROP, SCAL... +#include "FFmpegUtilities.h" // for AV_GET_CODEC_ATT... +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROC... +#include "Point.h" // for Point +#include "Settings.h" // for Settings, openshot +#include "TimelineBase.h" // for TimelineBase +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../Exceptions.h" // for InvalidCodec +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/../ReaderBase.h" // for ReaderInfo, Read... +#include "json/json.h" // for Value +struct SwsContext; +--- + + +/home/ferd/devel/libopenshot/src/Frame.h should add these lines: +#include // for AudioS... +#include // for Critic... +#include // for QImage +#include // for int64_t +#include // for string +class QApplication; +namespace openshot { class AudioResampler; } + +/home/ferd/devel/libopenshot/src/Frame.h should remove these lines: +- #include // lines 40-40 +- #include // lines 37-37 +- #include // lines 38-38 +- #include // lines 34-34 +- #include // lines 36-36 +- #include // lines 35-35 +- #include "AudioBufferSource.h" // lines 43-43 +- #include "AudioResampler.h" // lines 44-44 +- #include "JuceHeader.h" // lines 46-46 +- #include "ZmqLogger.h" // lines 41-41 + +The full include-list for /home/ferd/devel/libopenshot/src/Frame.h: +#include // for AudioS... +#include // for Critic... +#include // for QImage +#include // for int64_t +#include // for shared... +#include // for string +#include "ChannelLayouts.h" // for Channe... +#include "Fraction.h" // for Fraction +class QApplication; +namespace openshot { class AudioResampler; } +--- + +/home/ferd/devel/libopenshot/src/Frame.cpp should add these lines: +#include +#include +#include +#include +#include +#include +#include +#include +#include // for fmod +#include +#include +#include +#include +#include +#include +#include +#include +#include // for qGray +#include // for QSize +#include +#include +#include +#include +#include +#include // for max +#include // for cout +#include +#include "AudioBufferSource.h" +#include "AudioResampler.h" +#include "Settings.h" + +/home/ferd/devel/libopenshot/src/Frame.cpp should remove these lines: +- #include // lines 34-34 +- #include // lines 37-37 +- #include // lines 38-38 +- #include // lines 42-42 +- #include // lines 35-35 +- #include // lines 44-44 +- #include // lines 41-41 +- #include // lines 36-36 +- #include // lines 45-45 +- #include // lines 39-39 +- #include // lines 40-40 +- #include // lines 43-43 +- #include // lines 46-46 +- #include "JuceHeader.h" // lines 32-32 + +The full include-list for /home/ferd/devel/libopenshot/src/Frame.cpp: +#include "Frame.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include // for fmod +#include +#include +#include +#include +#include +#include +#include +#include +#include // for qGray +#include // for QSize +#include +#include +#include +#include +#include +#include // for max +#include +#include // for cout +#include +#include +#include "AudioBufferSource.h" +#include "AudioResampler.h" +#include "Settings.h" +--- + +/home/ferd/devel/libopenshot/src/FFmpegWriter.cpp:41:9: warning: You are compiling with experimental hardware encode [-W#pragma-messages] +#pragma message "You are compiling with experimental hardware encode" + ^ +/home/ferd/devel/libopenshot/src/FFmpegWriter.cpp:562:13: warning: 456 enumeration values not handled in switch: 'AV_CODEC_ID_NONE', 'AV_CODEC_ID_MPEG1VIDEO', 'AV_CODEC_ID_MPEG2VIDEO'... [-Wswitch] + switch (c->codec_id) { + ^ + +/home/ferd/devel/libopenshot/src/FFmpegWriter.h should add these lines: +#include // for AVCodecContext +#include // for AVStream, AVFormatContext, AVOutpu... +#include // for AVFrame +#include // for int64_t, uint8_t, int16_t +#include // for deque +#include // for map +#include // for shared_ptr +#include // for string +#include // for vector +#include "ChannelLayouts.h" // for ChannelLayout +namespace openshot { class Fraction; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +struct SwsContext; + +/home/ferd/devel/libopenshot/src/FFmpegWriter.h should remove these lines: +- #include // lines 50-50 +- #include // lines 48-48 +- #include // lines 49-49 +- #include "CacheMemory.h" // lines 51-51 +- #include "Exceptions.h" // lines 52-52 +- #include "OpenMPUtilities.h" // lines 53-53 +- #include "ReaderBase.h" // lines 42-42 +- #include "Settings.h" // lines 55-55 +- #include "ZmqLogger.h" // lines 54-54 + +The full include-list for /home/ferd/devel/libopenshot/src/FFmpegWriter.h: +#include // for AVCodecContext +#include // for AVStream, AVFormatContext, AVOutpu... +#include // for AVFrame +#include // for int64_t, uint8_t, int16_t +#include // for deque +#include // for map +#include // for shared_ptr +#include // for string +#include // for vector +#include "ChannelLayouts.h" // for ChannelLayout +#include "FFmpegUtilities.h" // for SWRCONTEXT, PixelFormat +#include "WriterBase.h" // for WriterBase +namespace openshot { class Fraction; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +struct SwsContext; +--- + +/home/ferd/devel/libopenshot/src/FFmpegWriter.cpp should add these lines: +#include // for EAGAIN, EINVAL, ENOMEM +#include // for LIBAVCODEC_VERSION_MAJOR, LIBAVCO... +#include // for avio_close, avio_open, AVIO_FLAG_... +#include // for LIBAVFORMAT_VERSION_MAJOR +#include // for AV_NOPTS_VALUE, AVMEDIA_TYPE_VIDEO +#include // for av_buffer_unref, AVBufferRef, av_... +#include // for av_dict_set, av_dict_free, AVDict... +#include // for AVERROR, AVERROR_EOF +#include // for AVHWFramesContext, av_hwdevice_ct... +#include // for av_rescale_q +#include // for av_freep, av_malloc +#include // for av_opt_set_int, av_opt_set, av_op... +#include // for av_get_pix_fmt_name +#include // for AV_PIX_FMT_NV12, AVPixelFormat +#include // for av_make_q, AVRational, av_inv_q +#include // for av_get_bytes_per_sample, AV_SAMPL... +#include // for AV_VERSION_INT +#include // for sws_getContext, sws_freeContext +#include // for omp_set_max_active_levels, omp_se... +#include // for uchar +#include // for snprintf +#include // for strstr, memcpy, strcmp +#include // for access, W_OK +#include // for min, max +#include // for NULL +#include // for pair +#include "Exceptions.h" // for InvalidCodec, InvalidOptions, Inv... +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "OpenMPUtilities.h" // for FF_NUM_PROCESSORS, OPEN_MP_MAX_AC... +#include "ReaderBase.h" // for ReaderBase +#include "Settings.h" // for Settings, openshot +#include "ZmqLogger.h" // for ZmqLogger +#include "common.h" // for FFMIN +struct SwsContext; + +/home/ferd/devel/libopenshot/src/FFmpegWriter.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/FFmpegWriter.cpp: +#include "FFmpegWriter.h" +#include // for EAGAIN, EINVAL, ENOMEM +#include // for LIBAVCODEC_VERSION_MAJOR, LIBAVCO... +#include // for avio_close, avio_open, AVIO_FLAG_... +#include // for LIBAVFORMAT_VERSION_MAJOR +#include // for AV_NOPTS_VALUE, AVMEDIA_TYPE_VIDEO +#include // for av_buffer_unref, AVBufferRef, av_... +#include // for av_dict_set, av_dict_free, AVDict... +#include // for AVERROR, AVERROR_EOF +#include // for AVHWFramesContext, av_hwdevice_ct... +#include // for av_rescale_q +#include // for av_freep, av_malloc +#include // for av_opt_set_int, av_opt_set, av_op... +#include // for av_get_pix_fmt_name +#include // for AV_PIX_FMT_NV12, AVPixelFormat +#include // for av_make_q, AVRational, av_inv_q +#include // for av_get_bytes_per_sample, AV_SAMPL... +#include // for AV_VERSION_INT +#include // for sws_getContext, sws_freeContext +#include // for omp_set_max_active_levels, omp_se... +#include // for uchar +#include // for snprintf +#include // for strstr, memcpy, strcmp +#include // for access, W_OK +#include // for min, max +#include // for NULL +#include // for operator<<, basic_istream::operat... +#include // for pair +#include "Exceptions.h" // for InvalidCodec, InvalidOptions, Inv... +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "OpenMPUtilities.h" // for FF_NUM_PROCESSORS, OPEN_MP_MAX_AC... +#include "ReaderBase.h" // for ReaderBase +#include "Settings.h" // for Settings, openshot +#include "ZmqLogger.h" // for ZmqLogger +#include "common.h" // for FFMIN +struct SwsContext; +--- + + +/home/ferd/devel/libopenshot/src/Json.h should add these lines: + +/home/ferd/devel/libopenshot/src/Json.h should remove these lines: +- #include "Exceptions.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/Json.h: +#include // for string +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/Json.cpp should add these lines: +#include "Exceptions.h" // for InvalidJSON + +/home/ferd/devel/libopenshot/src/Json.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Json.cpp: +#include "Json.h" +#include "Exceptions.h" // for InvalidJSON +--- + + +/home/ferd/devel/libopenshot/build/src/OpenShotVersion.h should add these lines: +#include // for string + +/home/ferd/devel/libopenshot/build/src/OpenShotVersion.h should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/build/src/OpenShotVersion.h: +#include // for basic_ostream::operator<<, operator<<, basic_ostream +#include // for string +--- + +(/home/ferd/devel/libopenshot/src/OpenShotVersion.cpp has correct #includes/fwd-decls) + + +/home/ferd/devel/libopenshot/src/KeyFrame.h should add these lines: +#include // for int64_t +#include // for string +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/KeyFrame.h should remove these lines: +- #include // lines 37-37 +- #include // lines 36-36 +- #include // lines 35-35 +- #include // lines 34-34 +- #include "Coordinate.h" // lines 41-41 +- #include "Exceptions.h" // lines 39-39 +- #include "Json.h" // lines 43-43 + +The full include-list for /home/ferd/devel/libopenshot/src/KeyFrame.h: +#include // for int64_t +#include // for string +#include // for vector +#include "Fraction.h" // for Fraction +#include "Point.h" // for Point, InterpolationType +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/KeyFrame.cpp should add these lines: +#include // for assert +#include // for exception +#include // for __alloc_traits<>::value_type +#include // for size_t +#include // for round, fabs +#include // for operator<<, setprecision +#include // for operator<<, basic_ostream<>::__ostream... +#include // for end, begin +#include // for allocator_traits<>::value_type +#include "Coordinate.h" // for Coordinate +#include "Exceptions.h" // for OutOfBoundsPoint, InvalidJSON, openshot +#include "Json.h" // for stringToJson + +/home/ferd/devel/libopenshot/src/KeyFrame.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/KeyFrame.cpp: +#include "KeyFrame.h" +#include // for assert +#include // for exception +#include // for __alloc_traits<>::value_type +#include // for size_t +#include // for lower_bound, move_backward +#include // for round, fabs +#include // for greater, greater_equal, less, less_equal +#include // for operator<<, setprecision +#include // for operator<<, basic_ostream<>::__ostream... +#include // for end, begin +#include // for allocator_traits<>::value_type +#include // for swap +#include "Coordinate.h" // for Coordinate +#include "Exceptions.h" // for OutOfBoundsPoint, InvalidJSON, openshot +#include "Json.h" // for stringToJson +--- + + +/home/ferd/devel/libopenshot/src/ZmqLogger.h should add these lines: +#include // for CriticalSection +namespace zmq { class context_t; } +namespace zmq { class socket_t; } + +/home/ferd/devel/libopenshot/src/ZmqLogger.h should remove these lines: +- #include // lines 44-44 +- #include // lines 41-41 +- #include // lines 38-38 +- #include // lines 42-42 +- #include // lines 36-36 +- #include // lines 35-35 +- #include // lines 40-40 +- #include // lines 43-43 +- #include "JuceHeader.h" // lines 45-45 +- #include "Settings.h" // lines 46-46 + +The full include-list for /home/ferd/devel/libopenshot/src/ZmqLogger.h: +#include // for CriticalSection +#include // for ofstream +#include // for string +namespace zmq { class context_t; } +namespace zmq { class socket_t; } +--- + +/home/ferd/devel/libopenshot/src/ZmqLogger.cpp should add these lines: +#include // for GenericScopedLock +#include // for memcpy +#include // for ZMQ_MAKE_VERSION, ZMQ... +#include // for NULL +#include // for socket_t, message_t +#include "Settings.h" // for Settings, openshot +struct tm; + +/home/ferd/devel/libopenshot/src/ZmqLogger.cpp should remove these lines: +- #include // lines 39-39 + +The full include-list for /home/ferd/devel/libopenshot/src/ZmqLogger.cpp: +#include "ZmqLogger.h" +#include // for GenericScopedLock +#include // for memcpy +#include // for ZMQ_MAKE_VERSION, ZMQ... +#include // for milliseconds +#include // for NULL +#include // for asctime, localtime, time +#include // for operator<<, setprecision +#include // for cout +#include // for sleep_for +#include // for socket_t, message_t +#include "Settings.h" // for Settings, openshot +struct tm; +--- + + +/home/ferd/devel/libopenshot/src/FrameMapper.h should add these lines: +#include // for int64_t +#include // for string +#include "ChannelLayouts.h" // for ChannelLayout +#include "effects/../Fraction.h" // for Fraction +#include "effects/../ReaderBase.h" // for ReaderBase +#include "json/json.h" // for Value +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/FrameMapper.h should remove these lines: +- #include // lines 34-34 +- #include // lines 36-36 +- #include // lines 35-35 +- #include "Exceptions.h" // lines 43-43 +- #include "Fraction.h" // lines 42-42 +- #include "Frame.h" // lines 41-41 +- #include "KeyFrame.h" // lines 44-44 +- #include "OpenMPUtilities.h" // lines 49-49 +- #include "ReaderBase.h" // lines 40-40 + +The full include-list for /home/ferd/devel/libopenshot/src/FrameMapper.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include // for vector +#include "CacheMemory.h" // for CacheMemory +#include "ChannelLayouts.h" // for ChannelLayout +#include "FFmpegUtilities.h" // for SWRCONTEXT +#include "effects/../Fraction.h" // for Fraction +#include "effects/../ReaderBase.h" // for ReaderBase +#include "json/json.h" // for Value +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/FrameMapper.cpp should add these lines: +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for avcodec_fill_aud... +#include // for AVFrame +#include // for av_freep, av_malloc +#include // for av_opt_set_int +#include // for AV_SAMPLE_FMT_S16 +#include // for QImage +#include // for NULL, memcpy +#include // for fabs, round +#include // for operator<<, basi... +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROC... +#include "Settings.h" // for openshot +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../Exceptions.h" // for ReaderClosed +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson + +/home/ferd/devel/libopenshot/src/FrameMapper.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/FrameMapper.cpp: +#include "FrameMapper.h" +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for avcodec_fill_aud... +#include // for AVFrame +#include // for av_freep, av_malloc +#include // for av_opt_set_int +#include // for AV_SAMPLE_FMT_S16 +#include // for QImage +#include // for NULL, memcpy +#include // for fabs, round +#include // for operator<<, basi... +#include "Clip.h" // for Clip +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROC... +#include "Settings.h" // for openshot +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../Exceptions.h" // for ReaderClosed +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +--- + + +/home/ferd/devel/libopenshot/src/Point.h should add these lines: +#include // for string +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/Point.h should remove these lines: +- #include "Exceptions.h" // lines 35-35 +- #include "Json.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/Point.h: +#include // for string +#include "Coordinate.h" // for Coordinate +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/Point.cpp should add these lines: +#include // for exception +#include // for std +#include "Exceptions.h" // for InvalidJSON, openshot +#include "Json.h" // for stringToJson + +/home/ferd/devel/libopenshot/src/Point.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Point.cpp: +#include "Point.h" +#include // for exception +#include // for std +#include "Exceptions.h" // for InvalidJSON, openshot +#include "Json.h" // for stringToJson +--- + + +/home/ferd/devel/libopenshot/src/PlayerBase.h should add these lines: +#include // for int64_t +namespace openshot { class ReaderBase; } + +/home/ferd/devel/libopenshot/src/PlayerBase.h should remove these lines: +- #include // lines 34-34 +- #include "ReaderBase.h" // lines 35-35 + +The full include-list for /home/ferd/devel/libopenshot/src/PlayerBase.h: +#include // for int64_t +namespace openshot { class ReaderBase; } +--- + +/home/ferd/devel/libopenshot/src/PlayerBase.cpp should add these lines: +#include "Settings.h" // for openshot +namespace openshot { class ReaderBase; } + +/home/ferd/devel/libopenshot/src/PlayerBase.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/PlayerBase.cpp: +#include "PlayerBase.h" +#include "Settings.h" // for openshot +namespace openshot { class ReaderBase; } +--- + + +/home/ferd/devel/libopenshot/src/Profiles.h should add these lines: +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/Profiles.h should remove these lines: +- #include // lines 41-41 +- #include // lines 40-40 +- #include // lines 38-38 +- #include // lines 39-39 +- #include // lines 42-42 +- #include // lines 43-43 +- #include // lines 37-37 +- #include // lines 34-34 +- #include // lines 36-36 +- #include "Exceptions.h" // lines 44-44 +- #include "Json.h" // lines 46-46 + +The full include-list for /home/ferd/devel/libopenshot/src/Profiles.h: +#include // for string +#include "Fraction.h" // for Fraction +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/Profiles.cpp should add these lines: +#include // for exception +#include // for QFile +#include // for QIODevice, QIODevice::ReadOnly +#include // for QList +#include // for QString +#include // for QStringList +#include // for QTextStream +#include // for operator>>, stringstream +#include "Exceptions.h" // for InvalidFile, InvalidJSON, openshot +#include "Json.h" // for stringToJson + +/home/ferd/devel/libopenshot/src/Profiles.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Profiles.cpp: +#include "Profiles.h" +#include // for exception +#include // for QFile +#include // for QIODevice, QIODevice::ReadOnly +#include // for QList +#include // for QString +#include // for QStringList +#include // for QTextStream +#include // for operator>>, stringstream +#include "Exceptions.h" // for InvalidFile, InvalidJSON, openshot +#include "Json.h" // for stringToJson +--- + + +/home/ferd/devel/libopenshot/src/QtHtmlReader.h should add these lines: +#include // for int64_t +#include // for string +#include "CacheBase.h" // for CacheBase +#include "json/json.h" // for Value +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/QtHtmlReader.h should remove these lines: +- #include // lines 41-41 +- #include // lines 42-42 +- #include // lines 38-38 +- #include // lines 40-40 +- #include "CacheMemory.h" // lines 44-44 +- #include "Exceptions.h" // lines 46-46 +- namespace openshot { class CacheBase; } // lines 53-53 + +The full include-list for /home/ferd/devel/libopenshot/src/QtHtmlReader.h: +#include // for int64_t +#include // for NULL +#include // for shared_ptr +#include // for string +#include "CacheBase.h" // for CacheBase +#include "Enums.h" // for GravityType +#include "ReaderBase.h" // for ReaderBase +#include "json/json.h" // for Value +class QImage; // lines 48-48 +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/QtHtmlReader.cpp should add these lines: +#include // for exception +#include // for QAbstractTextDocumentLayout +#include // for QBrush +#include // for QColor +#include // for QImage, QImage::Format_RGBA... +#include // for AlignHCenter, AlignLeft +#include // for QPainter +#include // for QSize, QSizeF +#include // for QTextDocument +#include // for QTextOption +#include // for round +#include "Exceptions.h" // for InvalidJSON +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/QtHtmlReader.cpp should remove these lines: +- #include // lines 38-38 +- #include // lines 37-37 +- #include // lines 34-34 +- #include // lines 35-35 +- #include // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/QtHtmlReader.cpp: +#include "QtHtmlReader.h" +#include // for exception +#include // for QAbstractTextDocumentLayout +#include // for QBrush +#include // for QColor +#include // for QImage, QImage::Format_RGBA... +#include // for AlignHCenter, AlignLeft +#include // for QPainter +#include // for QSize, QSizeF +#include // for QTextDocument +#include // for QTextOption +#include // for round +#include "Exceptions.h" // for InvalidJSON +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/effects/../QtImageReader.h should add these lines: + +/home/ferd/devel/libopenshot/src/effects/../QtImageReader.h should remove these lines: +- #include // lines 37-37 +- #include // lines 38-38 +- #include // lines 34-34 +- #include // lines 36-36 +- #include // lines 39-39 +- #include "Exceptions.h" // lines 40-40 +- #include "ReaderBase.h" // lines 41-41 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/../QtImageReader.h: +#include // for NULL +--- + +/home/ferd/devel/libopenshot/src/QtImageReader.cpp should add these lines: +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for QT_VERSION, QT_V... +#include // for QImage +#include // for KeepAspectRatio +#include // for QSize +#include // for QString +#include // for int64_t +#include // for max +#include // for round +#include // for shared_ptr, make... +#include // for string +#include "Coordinate.h" // for Coordinate +#include "Enums.h" // for SCALE_CROP, SCAL... +#include "Point.h" // for Point +#include "TimelineBase.h" // for TimelineBase +#include "effects/../Exceptions.h" // for InvalidJSON, Inv... +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/../QtImageReader.h" // for QtImageReader +#include "effects/../ReaderBase.h" // for ReaderInfo, Read... +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/QtImageReader.cpp should remove these lines: +- #include // lines 35-35 +- #include // lines 36-36 +- #include // lines 37-37 +- #include "CacheMemory.h" // lines 34-34 +- #include "Settings.h" // lines 32-32 + +The full include-list for /home/ferd/devel/libopenshot/src/QtImageReader.cpp: +#include "QtImageReader.h" +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for QT_VERSION, QT_V... +#include // for QImage +#include // for KeepAspectRatio +#include // for QSize +#include // for QString +#include // for int64_t +#include // for max +#include // for round +#include // for shared_ptr, make... +#include // for string +#include "Clip.h" // for Clip +#include "Coordinate.h" // for Coordinate +#include "Enums.h" // for SCALE_CROP, SCAL... +#include "Point.h" // for Point +#include "TimelineBase.h" // for TimelineBase +#include "effects/../Exceptions.h" // for InvalidJSON, Inv... +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/../QtImageReader.h" // for QtImageReader +#include "effects/../ReaderBase.h" // for ReaderInfo, Read... +#include "json/json.h" // for Value +--- + + +/home/ferd/devel/libopenshot/src/QtPlayer.h should add these lines: +#include // for int64_t +#include // for string +#include "Qt/../ReaderBase.h" // for ReaderBase +namespace openshot { class PlayerPrivate; } +namespace openshot { class RendererBase; } +namespace openshot { struct AudioDeviceInfo; } + +/home/ferd/devel/libopenshot/src/QtPlayer.h should remove these lines: +- #include // lines 35-35 +- #include "Qt/PlayerPrivate.h" // lines 38-38 +- #include "RendererBase.h" // lines 39-39 + +The full include-list for /home/ferd/devel/libopenshot/src/QtPlayer.h: +#include // for int64_t +#include // for string +#include // for vector +#include "PlayerBase.h" // for PlaybackMode, PlayerBase +#include "Qt/../ReaderBase.h" // for ReaderBase +namespace openshot { class PlayerPrivate; } +namespace openshot { class RendererBase; } +namespace openshot { struct AudioDeviceInfo; } +--- + +/home/ferd/devel/libopenshot/src/QtPlayer.cpp should add these lines: +#include // for NULL +#include "Qt/../AudioDeviceInfo.h" // for AudioDeviceInfo +#include "Qt/../Qt/AudioPlaybackThread.h" // for AudioPlaybackThread, Audio... +#include "Qt/../Qt/VideoCacheThread.h" // for VideoCacheThread +#include "RendererBase.h" // for RendererBase + +/home/ferd/devel/libopenshot/src/QtPlayer.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/QtPlayer.cpp: +#include "QtPlayer.h" +#include // for NULL +#include "Clip.h" // for Clip +#include "FFmpegReader.h" // for FFmpegReader +#include "Qt/../AudioDeviceInfo.h" // for AudioDeviceInfo +#include "Qt/../Qt/AudioPlaybackThread.h" // for AudioPlaybackThread, Audio... +#include "Qt/../Qt/VideoCacheThread.h" // for VideoCacheThread +#include "Qt/PlayerPrivate.h" // for PlayerPrivate +#include "Qt/VideoRenderer.h" // for VideoRenderer +#include "RendererBase.h" // for RendererBase +#include "Timeline.h" // for Timeline +--- + + +(/home/ferd/devel/libopenshot/src/TimelineBase.h has correct #includes/fwd-decls) + +(/home/ferd/devel/libopenshot/src/TimelineBase.cpp has correct #includes/fwd-decls) + + +/home/ferd/devel/libopenshot/src/Settings.h should add these lines: + +/home/ferd/devel/libopenshot/src/Settings.h should remove these lines: +- #include // lines 44-44 +- #include // lines 41-41 +- #include // lines 38-38 +- #include // lines 42-42 +- #include // lines 37-37 +- #include // lines 36-36 +- #include // lines 35-35 +- #include // lines 40-40 +- #include // lines 43-43 +- #include "JuceHeader.h" // lines 45-45 + +The full include-list for /home/ferd/devel/libopenshot/src/Settings.h: +#include // for string +--- + +/home/ferd/devel/libopenshot/src/Settings.cpp should add these lines: +#include // for NULL +#include // for std + +/home/ferd/devel/libopenshot/src/Settings.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Settings.cpp: +#include "Settings.h" +#include // for NULL +#include // for std +--- + + +/home/ferd/devel/libopenshot/src/QtTextReader.h should add these lines: +#include // for QFont +#include // for int64_t +#include // for string +#include "CacheBase.h" // for CacheBase +#include "json/json.h" // for Value +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/QtTextReader.h should remove these lines: +- #include // lines 41-41 +- #include // lines 42-42 +- #include // lines 38-38 +- #include // lines 40-40 +- #include "CacheMemory.h" // lines 44-44 +- #include "Exceptions.h" // lines 46-46 +- namespace openshot { class CacheBase; } // lines 53-53 + +The full include-list for /home/ferd/devel/libopenshot/src/QtTextReader.h: +#include // for QFont +#include // for int64_t +#include // for NULL +#include // for shared_ptr +#include // for string +#include "CacheBase.h" // for CacheBase +#include "Enums.h" // for GravityType +#include "ReaderBase.h" // for ReaderBase +#include "json/json.h" // for Value +class QImage; // lines 48-48 +namespace openshot { class Frame; } +--- + +/home/ferd/devel/libopenshot/src/QtTextReader.cpp should add these lines: +#include // for QFlags +#include // for exception +#include // for QBrush +#include // for QColor +#include // for QImage, QImage::Format_RGBA8888_Premulti... +#include // for operator|, AlignBottom, AlignLeft, Align... +#include // for QPainter +#include // for QPen +#include // for QSize +#include // for QString +#include // for round +#include "Exceptions.h" // for InvalidJSON +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot + +/home/ferd/devel/libopenshot/src/QtTextReader.cpp should remove these lines: +- #include // lines 34-34 +- #include // lines 35-35 + +The full include-list for /home/ferd/devel/libopenshot/src/QtTextReader.cpp: +#include "QtTextReader.h" +#include // for QFlags +#include // for exception +#include // for QBrush +#include // for QColor +#include // for QImage, QImage::Format_RGBA8888_Premulti... +#include // for operator|, AlignBottom, AlignLeft, Align... +#include // for QPainter +#include // for QPen +#include // for QSize +#include // for QString +#include // for round +#include "Exceptions.h" // for InvalidJSON +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +--- + + +/home/ferd/devel/libopenshot/src/Timeline.h should add these lines: +#include // for int64_t +#include // for map +#include // for string +#include // for vector +#include "ChannelLayouts.h" // for ChannelLayout +#include "effects/../Color.h" // for Color +#include "json/json.h" // for Value +namespace openshot { class Fraction; } +namespace openshot { class Frame; } +namespace openshot { class FrameMapper; } + +/home/ferd/devel/libopenshot/src/Timeline.h should remove these lines: +- #include // lines 40-40 +- #include // lines 38-38 +- #include // lines 39-39 +- #include "CacheDisk.h" // lines 42-42 +- #include "CacheMemory.h" // lines 43-43 +- #include "Color.h" // lines 44-44 +- #include "CrashHandler.h" // lines 46-46 +- #include "EffectInfo.h" // lines 50-50 +- #include "Effects.h" // lines 49-49 +- #include "Fraction.h" // lines 51-51 +- #include "Frame.h" // lines 52-52 +- #include "FrameMapper.h" // lines 53-53 +- #include "OpenMPUtilities.h" // lines 55-55 +- #include "Point.h" // lines 47-47 +- #include "Settings.h" // lines 57-57 + +The full include-list for /home/ferd/devel/libopenshot/src/Timeline.h: +#include // for int64_t +#include // for list +#include // for map +#include // for shared_ptr +#include // for mutex +#include // for set +#include // for string +#include // for vector +#include "CacheBase.h" // for CacheBase +#include "ChannelLayouts.h" // for ChannelLayout +#include "Clip.h" // for Clip +#include "EffectBase.h" // for EffectBase +#include "KeyFrame.h" // for Keyframe +#include "ReaderBase.h" // for ReaderBase +#include "TimelineBase.h" // for TimelineBase +#include "effects/../Color.h" // for Color +#include "json/json.h" // for Value +namespace openshot { class Fraction; } +namespace openshot { class Frame; } +namespace openshot { class FrameMapper; } +--- + +/home/ferd/devel/libopenshot/src/Timeline.cpp should add these lines: +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for round, fabs +#include // for omp_get_thread_num +#include // for QByteArray +#include // for QDir +#include // for QFile +#include // for QFileInfo +#include // for uint +#include // for QImage +#include // for QIODevice::ReadOnly +#include // for KeepAspectRatio +#include // for QPainter, QPaint... +#include // for QRegularExpressi... +#include // for QSize +#include // for QString, operator+ +#include // for QStaticStringData +#include // for NULL +#include // for max, max_element +#include "CacheMemory.h" // for CacheMemory +#include "CrashHandler.h" // for CrashHandler +#include "EffectInfo.h" // for EffectInfo +#include "Enums.h" // for VOLUME_MIX_AVERAGE +#include "FrameMapper.h" // for FrameMapper, PUL... +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROC... +#include "Settings.h" // for Settings, openshot +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../EffectBase.h" // for EffectBase +#include "effects/../Exceptions.h" // for InvalidFile, Inv... +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/Timeline.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Timeline.cpp: +#include "Timeline.h" +#include // for exception +#include // for CriticalSection +#include // for GenericScopedLock +#include // for round, fabs +#include // for omp_get_thread_num +#include // for QByteArray +#include // for QDir +#include // for QFile +#include // for QFileInfo +#include // for uint +#include // for QImage +#include // for QIODevice::ReadOnly +#include // for KeepAspectRatio +#include // for QPainter, QPaint... +#include // for QRegularExpressi... +#include // for QSize +#include // for QString, operator+ +#include // for QStaticStringData +#include // for NULL +#include // for max, max_element +#include "CacheMemory.h" // for CacheMemory +#include "CrashHandler.h" // for CrashHandler +#include "EffectInfo.h" // for EffectInfo +#include "Enums.h" // for VOLUME_MIX_AVERAGE +#include "FrameMapper.h" // for FrameMapper, PUL... +#include "OpenMPUtilities.h" // for OPEN_MP_NUM_PROC... +#include "Settings.h" // for Settings, openshot +#include "ZmqLogger.h" // for ZmqLogger +#include "effects/../EffectBase.h" // for EffectBase +#include "effects/../Exceptions.h" // for InvalidFile, Inv... +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Bars.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Bars.h should remove these lines: +- #include "../Json.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Bars.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../Color.h" // for Color +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Bars.cpp should add these lines: +#include // for exception +#include // for QColor +#include // for QImage, QImage::Format_RGBA8888_P... +#include // for QString +#include // for memcpy, NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../Color.h" // for Color +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Bars.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Bars.cpp: +#include "Bars.h" +#include // for exception +#include // for QColor +#include // for QImage, QImage::Format_RGBA8888_P... +#include // for QString +#include // for memcpy, NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../Color.h" // for Color +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Blur.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Blur.h should remove these lines: +- #include "../Json.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Blur.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Blur.cpp should add these lines: +#include // for exception +#include // for round +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Blur.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Blur.cpp: +#include "Blur.h" +#include // for exception +#include // for round +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Brightness.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Brightness.h should remove these lines: +- #include "../Json.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Brightness.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Brightness.cpp should add these lines: +#include // for exception +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Brightness.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Brightness.cpp: +#include "Brightness.h" +#include // for exception +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/ChromaKey.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/ChromaKey.h should remove these lines: +- #include "../Exceptions.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/ChromaKey.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../Color.h" // for Color +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/ChromaKey.cpp should add these lines: +#include // for exception +#include // for QImage +#include // for NULL +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +#include "effects/../Color.h" // for Color +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Exceptions.h" // for InvalidJSON +#include "effects/../Frame.h" // for Frame +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/ChromaKey.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/ChromaKey.cpp: +#include "ChromaKey.h" +#include // for exception +#include // for QImage +#include // for NULL +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +#include "effects/../Color.h" // for Color +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Exceptions.h" // for InvalidJSON +#include "effects/../Frame.h" // for Frame +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Caption.h should add these lines: +#include // for QRegularExpressionMatch +#include // for int64_t +#include // for string +#include // for vector +#include "Color.h" // for Color +#include "EffectBase.h" // for EffectBase +#include "effects/../Frame.h" // for Frame +#include "json/json.h" // for Value +class QFont; +class QFontMetrics; + +/home/ferd/devel/libopenshot/src/effects/Caption.h should remove these lines: +- #include // lines 35-35 +- #include // lines 37-37 +- #include // lines 34-34 +- #include "../Color.h" // lines 38-38 +- #include "../EffectBase.h" // lines 39-39 +- #include "../Fraction.h" // lines 40-40 +- #include "../Json.h" // lines 41-41 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Caption.h: +#include // for QRegularExpressionMatch +#include // for int64_t +#include // for shared_ptr +#include // for string +#include // for vector +#include "../KeyFrame.h" // for Keyframe +#include "Color.h" // for Color +#include "EffectBase.h" // for EffectBase +#include "effects/../Frame.h" // for Frame +#include "json/json.h" // for Value +class QFont; +class QFontMetrics; +--- + +/home/ferd/devel/libopenshot/src/effects/Caption.cpp should add these lines: +#include // for QFlags +#include // for exception +#include // for QBrush +#include // for QColor +#include // for QFont +#include // for QFontMetricsF +#include // for QImage +#include // for QList +#include // for NoPen, SolidPattern, TextSingleLine +#include // for QPainter, operator|, QPainter::An... +#include // for QPainterPath +#include // for QPen +#include // for QPoint +#include // for QRectF +#include // for QString +#include // for QStringList +#include // for QStaticStringData, QStringLiteral +#include // for NULL +#include // for max +#include "Clip.h" // for Clip +#include "ReaderBase.h" // for ReaderInfo, ReaderBase +#include "effects/../Exceptions.h" // for InvalidJSON, openshot +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Caption.cpp should remove these lines: +- #include "../Clip.h" // lines 32-32 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Caption.cpp: +#include "Caption.h" +#include // for QFlags +#include // for exception +#include // for QBrush +#include // for QColor +#include // for QFont +#include // for QFontMetricsF +#include // for QImage +#include // for QList +#include // for NoPen, SolidPattern, TextSingleLine +#include // for QPainter, operator|, QPainter::An... +#include // for QPainterPath +#include // for QPen +#include // for QPoint +#include // for QRectF +#include // for QString +#include // for QStringList +#include // for QStaticStringData, QStringLiteral +#include // for NULL +#include // for max +#include "../Timeline.h" // for Timeline +#include "Clip.h" // for Clip +#include "ReaderBase.h" // for ReaderInfo, ReaderBase +#include "effects/../Exceptions.h" // for InvalidJSON, openshot +#include "effects/../Fraction.h" // for Fraction +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/ColorShift.h should add these lines: +#include // for int64_t +#include // for string +#include "Frame.h" // for Frame +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/ColorShift.h should remove these lines: +- #include // lines 37-37 +- #include // lines 36-36 +- #include "../Json.h" // lines 39-39 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/ColorShift.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../KeyFrame.h" // for Keyframe +#include "Frame.h" // for Frame +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/ColorShift.cpp should add these lines: +#include // for exception +#include // for QImage +#include // for NULL +#include // for memcpy +#include // for round, fabs, fmod +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/ColorShift.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/ColorShift.cpp: +#include "ColorShift.h" +#include // for exception +#include // for QImage +#include // for NULL +#include // for memcpy +#include // for round, fabs, fmod +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Deinterlace.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Deinterlace.h should remove these lines: +- #include "../Json.h" // lines 39-39 +- #include "../KeyFrame.h" // lines 40-40 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Deinterlace.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Deinterlace.cpp should add these lines: +#include // for exception +#include // for QImage, QImage::Format_RGBA8888_P... +#include // for FastTransformation, IgnoreAspectR... +#include // for NULL, memcpy +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson + +/home/ferd/devel/libopenshot/src/effects/Deinterlace.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Deinterlace.cpp: +#include "Deinterlace.h" +#include // for exception +#include // for QImage, QImage::Format_RGBA8888_P... +#include // for FastTransformation, IgnoreAspectR... +#include // for NULL, memcpy +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +--- + + +/home/ferd/devel/libopenshot/src/effects/Crop.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Crop.h should remove these lines: +- #include "../Json.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Crop.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../Color.h" // for Color +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Crop.cpp should add these lines: +#include // for exception +#include // for QColor +#include // for QImage, QImage::Format_RGBA8888_P... +#include // for QString +#include // for memcpy, NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Crop.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Crop.cpp: +#include "Crop.h" +#include // for exception +#include // for QColor +#include // for QImage, QImage::Format_RGBA8888_P... +#include // for QString +#include // for memcpy, NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Hue.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Hue.h should remove these lines: +- #include "../Json.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Hue.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Hue.cpp should add these lines: +#include // for exception +#include // for sqrtf, cos, sin +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Hue.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Hue.cpp: +#include "Hue.h" +#include // for exception +#include // for sqrtf, cos, sin +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Mask.h should add these lines: +#include // for int64_t +#include "EffectBase.h" // for EffectBase +#include "effects/../Frame.h" // for Frame +#include "json/json.h" // for Value +class QImage; + +/home/ferd/devel/libopenshot/src/effects/Mask.h should remove these lines: +- #include "../EffectBase.h" // lines 34-34 +- #include "../Json.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Mask.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../KeyFrame.h" // for Keyframe +#include "EffectBase.h" // for EffectBase +#include "effects/../Frame.h" // for Frame +#include "json/json.h" // for Value +class QImage; +namespace openshot { class ReaderBase; } // lines 45-45 +--- + +/home/ferd/devel/libopenshot/src/effects/Mask.cpp should add these lines: +#include // for exception +#include // for QImage +#include // for IgnoreAspectRatio, SmoothTrans... +#include // for qGray +#include // for operator!=, QSize +#include // for NULL +#include "Settings.h" // for openshot +#include "effects/../ChunkReader.h" // for ChunkReader, ChunkVersion +#include "effects/../Exceptions.h" // for InvalidJSON +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/../QtImageReader.h" // for QtImageReader + +/home/ferd/devel/libopenshot/src/effects/Mask.cpp should remove these lines: +- #include "FFmpegReader.h" // lines 32-32 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Mask.cpp: +#include "Mask.h" +#include // for exception +#include // for QImage +#include // for IgnoreAspectRatio, SmoothTrans... +#include // for qGray +#include // for operator!=, QSize +#include // for NULL +#include "ReaderBase.h" // for ReaderBase, ReaderInfo +#include "Settings.h" // for openshot +#include "effects/../ChunkReader.h" // for ChunkReader, ChunkVersion +#include "effects/../Exceptions.h" // for InvalidJSON +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/../QtImageReader.h" // for QtImageReader +--- + + +/home/ferd/devel/libopenshot/src/effects/Negate.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Negate.h should remove these lines: +- #include // lines 42-42 +- #include "../KeyFrame.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Negate.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Negate.cpp should add these lines: +#include // for exception +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame + +/home/ferd/devel/libopenshot/src/effects/Negate.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Negate.cpp: +#include "Negate.h" +#include // for exception +#include // for QImage +#include // for NULL +#include "Exceptions.h" // for InvalidJSON +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +--- + + +/home/ferd/devel/libopenshot/src/effects/Pixelate.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Pixelate.h should remove these lines: +- #include "../Json.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Pixelate.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Pixelate.cpp should add these lines: +#include // for exception +#include // for fabs, pow +#include // for QImage +#include // for SmoothTransformation +#include // for QPainter +#include // for QPoint +#include // for QRect +#include // for NULL +#include // for min +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Pixelate.cpp should remove these lines: +- #include // lines 34-34 +- #include // lines 35-35 +- #include // lines 37-37 +- #include // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Pixelate.cpp: +#include "Pixelate.h" +#include // for exception +#include // for fabs, pow +#include // for QImage +#include // for SmoothTransformation +#include // for QPainter +#include // for QPoint +#include // for QRect +#include // for NULL +#include // for min +#include "Exceptions.h" // for InvalidJSON +#include "Json.h" // for stringToJson +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Saturation.h should add these lines: +#include // for int64_t +#include // for string +#include "EffectBase.h" // for EffectBase +#include "effects/../Frame.h" // for Frame +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Saturation.h should remove these lines: +- #include // lines 39-39 +- #include // lines 40-40 +- #include // lines 36-36 +- #include // lines 37-37 +- #include // lines 38-38 +- #include "../ChunkReader.h" // lines 49-49 +- #include "../Color.h" // lines 42-42 +- #include "../EffectBase.h" // lines 34-34 +- #include "../Exceptions.h" // lines 43-43 +- #include "../FFmpegReader.h" // lines 47-47 +- #include "../Json.h" // lines 44-44 +- #include "../QtImageReader.h" // lines 48-48 +- #include "../ReaderBase.h" // lines 46-46 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Saturation.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../KeyFrame.h" // for Keyframe +#include "EffectBase.h" // for EffectBase +#include "effects/../Frame.h" // for Frame +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Saturation.cpp should add these lines: +#include // for exception +#include // for QImage +#include // for sqrt +#include // for NULL +#include "Settings.h" // for openshot +#include "effects/../Exceptions.h" // for InvalidJSON +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Saturation.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Saturation.cpp: +#include "Saturation.h" +#include // for exception +#include // for QImage +#include // for sqrt +#include // for NULL +#include "Settings.h" // for openshot +#include "effects/../Exceptions.h" // for InvalidJSON +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Shift.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Shift.h should remove these lines: +- #include "../Json.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Shift.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Shift.cpp should add these lines: +#include // for exception +#include // for round, fabs, fmod +#include // for QImage +#include // for memcpy, NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Shift.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Shift.cpp: +#include "Shift.h" +#include // for exception +#include // for round, fabs, fmod +#include // for QImage +#include // for memcpy, NULL +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/effects/Wave.h should add these lines: +#include // for int64_t +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/src/effects/Wave.h should remove these lines: +- #include "../Json.h" // lines 37-37 + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Wave.h: +#include // for int64_t +#include // for shared_ptr +#include // for string +#include "../EffectBase.h" // for EffectBase +#include "../Frame.h" // for Frame +#include "../KeyFrame.h" // for Keyframe +#include "json/json.h" // for Value +--- + +/home/ferd/devel/libopenshot/src/effects/Wave.cpp should add these lines: +#include // for exception +#include // for sin, round +#include // for QImage +#include // for NULL, memcpy +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/src/effects/Wave.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/effects/Wave.cpp: +#include "Wave.h" +#include // for exception +#include // for sin, round +#include // for QImage +#include // for NULL, memcpy +#include "Exceptions.h" // for InvalidJSON +#include "Settings.h" // for openshot +#include "effects/../EffectBase.h" // for EffectInfoStruct, EffectBase +#include "effects/../Frame.h" // for Frame +#include "effects/../Json.h" // for stringToJson +#include "effects/../KeyFrame.h" // for Keyframe +--- + + +/home/ferd/devel/libopenshot/src/Qt/AudioPlaybackThread.h should add these lines: +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } + +/home/ferd/devel/libopenshot/src/Qt/AudioPlaybackThread.h should remove these lines: +- #include "../ReaderBase.h" // lines 35-35 +- #include "../RendererBase.h" // lines 36-36 +- #include "../Settings.h" // lines 39-39 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/AudioPlaybackThread.h: +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../AudioDeviceInfo.h" +#include "../AudioReaderSource.h" +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +--- + +/home/ferd/devel/libopenshot/src/Qt/AudioPlaybackThread.cpp should add these lines: +#include // for Audi... +#include // for Owne... +#include // for String +#include // for Stri... +#include // for NULL +#include "Qt/../AudioDeviceInfo.h" // for Audi... +#include "Qt/../AudioReaderSource.h" // for Audi... +#include "Qt/../Settings.h" // for Sett... +#include "ReaderBase.h" // for Read... +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/src/Qt/AudioPlaybackThread.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/AudioPlaybackThread.cpp: +#include "AudioPlaybackThread.h" +#include // for Audi... +#include // for Owne... +#include // for String +#include // for Stri... +#include // for NULL +#include // for mill... +#include // for slee... +#include "Qt/../AudioDeviceInfo.h" // for Audi... +#include "Qt/../AudioReaderSource.h" // for Audi... +#include "Qt/../Settings.h" // for Sett... +#include "ReaderBase.h" // for Read... +namespace openshot { class Frame; } +--- + + +/home/ferd/devel/libopenshot/src/Qt/PlayerDemo.h should add these lines: +#include // for Q_DECL_OVERRIDE +#include // for Q_OBJECT, slots +#include // for QString +#include // for QWidget +class QCloseEvent; +class QKeyEvent; +class QMenuBar; +class QObject; +class QVBoxLayout; +class VideoRenderWidget; + +/home/ferd/devel/libopenshot/src/Qt/PlayerDemo.h should remove these lines: +- #include // lines 37-37 +- #include // lines 36-36 +- #include // lines 39-39 +- #include // lines 34-34 +- #include // lines 38-38 +- #include // lines 35-35 +- #include "VideoRenderWidget.h" // lines 41-41 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/PlayerDemo.h: +#include // for Q_DECL_OVERRIDE +#include // for Q_OBJECT, slots +#include // for QString +#include // for QWidget +class QCloseEvent; +class QKeyEvent; +class QMenuBar; +class QObject; +class QVBoxLayout; +class VideoRenderWidget; +namespace openshot { class QtPlayer; } // lines 46-46 +--- + +/home/ferd/devel/libopenshot/src/Qt/PlayerDemo.cpp should add these lines: +#include // for QAction +#include // for QApplication +#include // for QVBoxLayout +#include // for QKeyEvent, QCloseEvent (ptr only) +#include // for QFileDialog +#include // for QMenuBar +#include // for Key_Escape, Key_J, Key_K, Key_L +#include // for NULL +#include "PlayerBase.h" // for PLAYBACK_PAUSED, PLAYBACK_PLAY +#include "Qt/../ReaderBase.h" // for ReaderBase, ReaderInfo +#include "Qt/VideoRenderWidget.h" // for VideoRenderWidget +#include "Qt/VideoRenderer.h" // for VideoRenderer + +/home/ferd/devel/libopenshot/src/Qt/PlayerDemo.cpp should remove these lines: +- #include // lines 44-44 +- #include // lines 39-39 +- #include // lines 43-43 +- #include // lines 37-37 +- #include // lines 42-42 +- #include // lines 41-41 +- #include // lines 40-40 +- #include // lines 36-36 +- #include // lines 38-38 +- #include // lines 31-31 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/PlayerDemo.cpp: +#include "PlayerDemo.h" +#include // for QAction +#include // for QApplication +#include // for QVBoxLayout +#include // for QKeyEvent, QCloseEvent (ptr only) +#include // for QFileDialog +#include // for QMenuBar +#include // for Key_Escape, Key_J, Key_K, Key_L +#include // for NULL +#include "../QtPlayer.h" // for QtPlayer +#include "PlayerBase.h" // for PLAYBACK_PAUSED, PLAYBACK_PLAY +#include "Qt/../ReaderBase.h" // for ReaderBase, ReaderInfo +#include "Qt/VideoRenderWidget.h" // for VideoRenderWidget +#include "Qt/VideoRenderer.h" // for VideoRenderer +--- + + +/home/ferd/devel/libopenshot/src/Qt/PlayerPrivate.h should add these lines: +#include // for Thread +#include // for int64_t +#include // for shared_ptr +namespace openshot { class AudioPlaybackThread; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +namespace openshot { class RendererBase; } +namespace openshot { class VideoCacheThread; } + +/home/ferd/devel/libopenshot/src/Qt/PlayerPrivate.h should remove these lines: +- #include "../AudioReaderSource.h" // lines 37-37 +- #include "../Qt/AudioPlaybackThread.h" // lines 38-38 +- #include "../Qt/VideoCacheThread.h" // lines 40-40 +- #include "../ReaderBase.h" // lines 35-35 +- #include "../RendererBase.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/PlayerPrivate.h: +#include // for Thread +#include // for int64_t +#include // for shared_ptr +#include "../Qt/VideoPlaybackThread.h" // for Thread +namespace openshot { class AudioPlaybackThread; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +namespace openshot { class RendererBase; } +namespace openshot { class VideoCacheThread; } +--- + +/home/ferd/devel/libopenshot/src/Qt/PlayerPrivate.cpp should add these lines: +#include // for WaitableEvent +#include // for NULL +#include // for int64_t +#include "Exceptions.h" // for OutOfBoundsFrame +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Qt/../Qt/AudioPlaybackThread.h" // for AudioPlaybackThread +#include "Qt/../Qt/VideoCacheThread.h" // for VideoCacheThread +#include "Qt/../Qt/VideoPlaybackThread.h" // for VideoPlaybackThread +#include "ReaderBase.h" // for ReaderBase, Reader... +#include "ZmqLogger.h" // for ZmqLogger +namespace openshot { class RendererBase; } + +/home/ferd/devel/libopenshot/src/Qt/PlayerPrivate.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/PlayerPrivate.cpp: +#include "PlayerPrivate.h" +#include // for WaitableEvent +#include // for NULL +#include // for duration, duration... +#include // for int64_t +#include // for sleep_for +#include "Exceptions.h" // for OutOfBoundsFrame +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Qt/../Qt/AudioPlaybackThread.h" // for AudioPlaybackThread +#include "Qt/../Qt/VideoCacheThread.h" // for VideoCacheThread +#include "Qt/../Qt/VideoPlaybackThread.h" // for VideoPlaybackThread +#include "ReaderBase.h" // for ReaderBase, Reader... +#include "ZmqLogger.h" // for ZmqLogger +namespace openshot { class RendererBase; } +--- + + +/home/ferd/devel/libopenshot/src/Qt/VideoCacheThread.h should add these lines: +#include // for Thread +#include // for int64_t +#include // for atomic_int +#include // for shared_ptr +namespace juce { class WaitableEvent; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } + +/home/ferd/devel/libopenshot/src/Qt/VideoCacheThread.h should remove these lines: +- #include "../OpenMPUtilities.h" // lines 34-34 +- #include "../ReaderBase.h" // lines 35-35 +- #include "../RendererBase.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoCacheThread.h: +#include // for Thread +#include // for int64_t +#include // for atomic_int +#include // for shared_ptr +namespace juce { class WaitableEvent; } +namespace openshot { class Frame; } +namespace openshot { class ReaderBase; } +--- + +/home/ferd/devel/libopenshot/src/Qt/VideoCacheThread.cpp should add these lines: +#include // for NULL +#include "CacheBase.h" // for CacheBase +#include "Exceptions.h" // for OutOfBoundsFrame +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Qt/../OpenMPUtilities.h" // for OPEN_MP_NUM_PROCESSORS +#include "Qt/../ReaderBase.h" // for ReaderBase, ReaderInfo +#include "ZmqLogger.h" // for ZmqLogger + +/home/ferd/devel/libopenshot/src/Qt/VideoCacheThread.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoCacheThread.cpp: +#include "VideoCacheThread.h" +#include // for NULL +#include // for min +#include // for duration, duration<>::period, mil... +#include // for sleep_for +#include "CacheBase.h" // for CacheBase +#include "Exceptions.h" // for OutOfBoundsFrame +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Qt/../OpenMPUtilities.h" // for OPEN_MP_NUM_PROCESSORS +#include "Qt/../ReaderBase.h" // for ReaderBase, ReaderInfo +#include "ZmqLogger.h" // for ZmqLogger +--- + + +/home/ferd/devel/libopenshot/src/Qt/VideoPlaybackThread.h should add these lines: +#include // for Thread +#include // for WaitableEvent +#include // for int64_t +#include // for shared_ptr +namespace openshot { class Frame; } +namespace openshot { class RendererBase; } + +/home/ferd/devel/libopenshot/src/Qt/VideoPlaybackThread.h should remove these lines: +- #include "../ReaderBase.h" // lines 35-35 +- #include "../RendererBase.h" // lines 36-36 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoPlaybackThread.h: +#include // for Thread +#include // for WaitableEvent +#include // for int64_t +#include // for shared_ptr +namespace openshot { class Frame; } +namespace openshot { class RendererBase; } +--- + +/home/ferd/devel/libopenshot/src/Qt/VideoPlaybackThread.cpp should add these lines: +#include "Frame.h" // for Frame +#include "Qt/../RendererBase.h" // for RendererBase +#include "ZmqLogger.h" // for ZmqLogger + +/home/ferd/devel/libopenshot/src/Qt/VideoPlaybackThread.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoPlaybackThread.cpp: +#include "VideoPlaybackThread.h" +#include "Frame.h" // for Frame +#include "Qt/../RendererBase.h" // for RendererBase +#include "ZmqLogger.h" // for ZmqLogger +--- + + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderer.h should add these lines: +#include // for QObject +#include // for Q_OBJECT, signals, slots +#include // for QString +#include // for int64_t +class QImage; +class QWidget; + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderer.h should remove these lines: +- #include // lines 35-35 +- #include // lines 36-36 +- class QPainter; // lines 40-40 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoRenderer.h: +#include // for QObject +#include // for Q_OBJECT, signals, slots +#include // for QString +#include // for int64_t +#include // for shared_ptr +#include "../RendererBase.h" // for RendererBase +class QImage; +class QWidget; +--- + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderer.cpp should add these lines: +class QImage; +class QWidget; + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderer.cpp should remove these lines: + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoRenderer.cpp: +#include "VideoRenderer.h" +class QImage; +class QWidget; +--- + +error: no such file or directory: '/home/ferd/devel/libopenshot/build/examples/openshot-player_autogen/mocs_compilation.cpp' +error: no input files +error: unable to handle compilation, expected exactly one compiler job in '' + + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should add these lines: +#include // for free, malloc +#include // for array, array<>::value_type +#include // for deque +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for vector, vector<>::const_iterator + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should remove these lines: +- #include // lines 2440-2440 +- #include // lines 4154-4154 +- #include // lines 4163-4163 +- #include // lines 4164-4164 +- #include // lines 2442-2442 +- #include // lines 4155-4155 +- #include // lines 4156-4156 +- #include // lines 4157-4157 +- #include // lines 4158-4158 +- #include // lines 253-253 +- #include // lines 2443-2443 +- #include // lines 4159-4159 +- #include // lines 2444-2444 +- #include // lines 4160-4160 + +The full include-list for /home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp: +#include // for free, malloc +#include // for min +#include // for array, array<>::value_type +#include // for assert +#include // for localeconv, lconv +#include // for isfinite, isnan, modf +#include // for size_t, ptrdiff_t +#include // for sscanf, size_t, EOF +#include // for strlen, memcmp, memcpy, strchr +#include // for deque +#include // for operator<<, char_traits, basic_ostream, basic... +#include // for numeric_limits +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for allocator, unique_ptr, allocator_traits<>::va... +#include // for set, operator==, _Rb_tree_iterator, operator!= +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for move, pair, swap +#include // for vector, vector<>::const_iterator +#include "json/json.h" // for Value, String, Reader, Value::ValueHolder +--- + + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderWidget.h should add these lines: +#include // for QImage +#include // for Q_OBJECT, slots +#include // for QRect +#include // for QString +#include // for QWidget +#include "Fraction.h" // for Fraction +class QObject; +class QPaintEvent; +class VideoRenderer; + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderWidget.h should remove these lines: +- #include // lines 38-38 +- #include // lines 39-39 +- #include // lines 40-40 +- #include // lines 37-37 +- #include "../Fraction.h" // lines 34-34 +- #include "VideoRenderer.h" // lines 35-35 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoRenderWidget.h: +#include // for QImage +#include // for Q_OBJECT, slots +#include // for QRect +#include // for QString +#include // for QWidget +#include "Fraction.h" // for Fraction +class QObject; +class QPaintEvent; +class VideoRenderer; +--- + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderWidget.cpp should add these lines: +#include // for QPaintEvent +#include // for WA_OpaquePaintEvent, black +#include // for QPainter +#include // for QPalette, QPalette::Window +#include // for QSizePolicy, QSizePolicy::Preferred +#include "Qt/VideoRenderer.h" // for VideoRenderer + +/home/ferd/devel/libopenshot/src/Qt/VideoRenderWidget.cpp should remove these lines: +- #include // lines 33-33 +- #include // lines 35-35 +- #include // lines 34-34 +- #include // lines 37-37 +- #include // lines 36-36 +- #include // lines 32-32 + +The full include-list for /home/ferd/devel/libopenshot/src/Qt/VideoRenderWidget.cpp: +#include "VideoRenderWidget.h" +#include // for QPaintEvent +#include // for WA_OpaquePaintEvent, black +#include // for QPainter +#include // for QPalette, QPalette::Window +#include // for QSizePolicy, QSizePolicy::Preferred +#include "Qt/VideoRenderer.h" // for VideoRenderer +--- + + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should add these lines: +#include // for free, malloc +#include // for array, array<>::value_type +#include // for deque +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for vector, vector<>::const_iterator + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should remove these lines: +- #include // lines 2440-2440 +- #include // lines 4154-4154 +- #include // lines 4163-4163 +- #include // lines 4164-4164 +- #include // lines 2442-2442 +- #include // lines 4155-4155 +- #include // lines 4156-4156 +- #include // lines 4157-4157 +- #include // lines 4158-4158 +- #include // lines 253-253 +- #include // lines 2443-2443 +- #include // lines 4159-4159 +- #include // lines 2444-2444 +- #include // lines 4160-4160 + +The full include-list for /home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp: +#include // for free, malloc +#include // for min +#include // for array, array<>::value_type +#include // for assert +#include // for localeconv, lconv +#include // for isfinite, isnan, modf +#include // for size_t, ptrdiff_t +#include // for sscanf, size_t, EOF +#include // for strlen, memcmp, memcpy, strchr +#include // for deque +#include // for operator<<, char_traits, basic_ostream, basic... +#include // for numeric_limits +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for allocator, unique_ptr, allocator_traits<>::va... +#include // for set, operator==, _Rb_tree_iterator, operator!= +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for move, pair, swap +#include // for vector, vector<>::const_iterator +#include "json/json.h" // for Value, String, Reader, Value::ValueHolder +--- + + +/home/ferd/devel/libopenshot/examples/qt-demo/main.cpp should add these lines: +#include // for QApplication + +/home/ferd/devel/libopenshot/examples/qt-demo/main.cpp should remove these lines: +- #include // lines 33-33 + +The full include-list for /home/ferd/devel/libopenshot/examples/qt-demo/main.cpp: +#include // for QApplication +#include "Qt/PlayerDemo.h" // for PlayerDemo +--- + + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should add these lines: +#include // for free, malloc +#include // for array, array<>::value_type +#include // for deque +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for vector, vector<>::const_iterator + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should remove these lines: +- #include // lines 2440-2440 +- #include // lines 4154-4154 +- #include // lines 4163-4163 +- #include // lines 4164-4164 +- #include // lines 2442-2442 +- #include // lines 4155-4155 +- #include // lines 4156-4156 +- #include // lines 4157-4157 +- #include // lines 4158-4158 +- #include // lines 253-253 +- #include // lines 2443-2443 +- #include // lines 4159-4159 +- #include // lines 2444-2444 +- #include // lines 4160-4160 + +The full include-list for /home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp: +#include // for free, malloc +#include // for min +#include // for array, array<>::value_type +#include // for assert +#include // for localeconv, lconv +#include // for isfinite, isnan, modf +#include // for size_t, ptrdiff_t +#include // for sscanf, size_t, EOF +#include // for strlen, memcmp, memcpy, strchr +#include // for deque +#include // for operator<<, char_traits, basic_ostream, basic... +#include // for numeric_limits +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for allocator, unique_ptr, allocator_traits<>::va... +#include // for set, operator==, _Rb_tree_iterator, operator!= +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for move, pair, swap +#include // for vector, vector<>::const_iterator +#include "json/json.h" // for Value, String, Reader, Value::ValueHolder +--- + + +/home/ferd/devel/libopenshot/examples/ExampleHtml.cpp should add these lines: +#include // for QGuiApplication +#include // for SLOT +#include // for QTimer +#include // for map, map<>::mapped_type +#include // for string +#include "Enums.h" // for GRAVITY_BOTTOM_RIGHT +#include "FFmpegWriter.h" // for FFmpegWriter +#include "OpenShotVersion.h" // for openshot +#include "QtHtmlReader.h" // for QtHtmlReader +#include "WriterBase.h" // for WriterInfo +#include "effects/../Fraction.h" // for Fraction +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/examples/ExampleHtml.cpp should remove these lines: +- #include // lines 35-35 +- #include // lines 36-36 +- #include // lines 32-32 +- #include // lines 33-33 +- #include "CrashHandler.h" // lines 39-39 +- #include "OpenShot.h" // lines 38-38 + +The full include-list for /home/ferd/devel/libopenshot/examples/ExampleHtml.cpp: +#include // for QGuiApplication +#include // for SLOT +#include // for QTimer +#include // for map, map<>::mapped_type +#include // for shared_ptr +#include // for string +#include "Enums.h" // for GRAVITY_BOTTOM_RIGHT +#include "FFmpegWriter.h" // for FFmpegWriter +#include "OpenShotVersion.h" // for openshot +#include "QtHtmlReader.h" // for QtHtmlReader +#include "WriterBase.h" // for WriterInfo +#include "effects/../Fraction.h" // for Fraction +namespace openshot { class Frame; } +--- + +error: no such file or directory: '/home/ferd/devel/libopenshot/build/bindings/python/CMakeFiles/pyopenshot.dir/openshotPYTHON_wrap.cxx' +error: no input files +error: unable to handle compilation, expected exactly one compiler job in '' + + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should add these lines: +#include // for free, malloc +#include // for array, array<>::value_type +#include // for deque +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for vector, vector<>::const_iterator + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should remove these lines: +- #include // lines 2440-2440 +- #include // lines 4154-4154 +- #include // lines 4163-4163 +- #include // lines 4164-4164 +- #include // lines 2442-2442 +- #include // lines 4155-4155 +- #include // lines 4156-4156 +- #include // lines 4157-4157 +- #include // lines 4158-4158 +- #include // lines 253-253 +- #include // lines 2443-2443 +- #include // lines 4159-4159 +- #include // lines 2444-2444 +- #include // lines 4160-4160 + +The full include-list for /home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp: +#include // for free, malloc +#include // for min +#include // for array, array<>::value_type +#include // for assert +#include // for localeconv, lconv +#include // for isfinite, isnan, modf +#include // for size_t, ptrdiff_t +#include // for sscanf, size_t, EOF +#include // for strlen, memcmp, memcpy, strchr +#include // for deque +#include // for operator<<, char_traits, basic_ostream, basic... +#include // for numeric_limits +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for allocator, unique_ptr, allocator_traits<>::va... +#include // for set, operator==, _Rb_tree_iterator, operator!= +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for move, pair, swap +#include // for vector, vector<>::const_iterator +#include "json/json.h" // for Value, String, Reader, Value::ValueHolder +--- + + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should add these lines: +#include // for free, malloc +#include // for array, array<>::value_type +#include // for deque +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for vector, vector<>::const_iterator + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should remove these lines: +- #include // lines 2440-2440 +- #include // lines 4154-4154 +- #include // lines 4163-4163 +- #include // lines 4164-4164 +- #include // lines 2442-2442 +- #include // lines 4155-4155 +- #include // lines 4156-4156 +- #include // lines 4157-4157 +- #include // lines 4158-4158 +- #include // lines 253-253 +- #include // lines 2443-2443 +- #include // lines 4159-4159 +- #include // lines 2444-2444 +- #include // lines 4160-4160 + +The full include-list for /home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp: +#include // for free, malloc +#include // for min +#include // for array, array<>::value_type +#include // for assert +#include // for localeconv, lconv +#include // for isfinite, isnan, modf +#include // for size_t, ptrdiff_t +#include // for sscanf, size_t, EOF +#include // for strlen, memcmp, memcpy, strchr +#include // for deque +#include // for operator<<, char_traits, basic_ostream, basic... +#include // for numeric_limits +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for allocator, unique_ptr, allocator_traits<>::va... +#include // for set, operator==, _Rb_tree_iterator, operator!= +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for move, pair, swap +#include // for vector, vector<>::const_iterator +#include "json/json.h" // for Value, String, Reader, Value::ValueHolder +--- + + +/home/ferd/devel/libopenshot/tests/tests.cpp should add these lines: +#include "TestDetails.h" // for UnitTest +#include "TestRunner.h" // for RunAllTests + +/home/ferd/devel/libopenshot/tests/tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 32-32 + +The full include-list for /home/ferd/devel/libopenshot/tests/tests.cpp: +#include // for operator<<, endl, basic_ostream, cout, ostream +#include "TestDetails.h" // for UnitTest +#include "TestRunner.h" // for RunAllTests +--- + + +/home/ferd/devel/libopenshot/examples/Example.cpp should add these lines: +#include // for map, map<>::mapped_type +#include // for string +#include "FFmpegReader.h" // for FFmpegReader +#include "FFmpegWriter.h" // for FFmpegWriter +#include "OpenShotVersion.h" // for openshot +#include "Settings.h" // for Settings +#include "WriterBase.h" // for WriterInfo +#include "effects/../Fraction.h" // for Fraction +#include "effects/../ReaderBase.h" // for ReaderInfo +namespace openshot { class Frame; } + +/home/ferd/devel/libopenshot/examples/Example.cpp should remove these lines: +- #include // lines 31-31 +- #include "CrashHandler.h" // lines 35-35 +- #include "OpenShot.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/examples/Example.cpp: +#include // for operator<<, endl, basic_ostream +#include // for map, map<>::mapped_type +#include // for shared_ptr +#include // for string +#include "FFmpegReader.h" // for FFmpegReader +#include "FFmpegWriter.h" // for FFmpegWriter +#include "OpenShotVersion.h" // for openshot +#include "Settings.h" // for Settings +#include "WriterBase.h" // for WriterInfo +#include "effects/../Fraction.h" // for Fraction +#include "effects/../ReaderBase.h" // for ReaderInfo +namespace openshot { class Frame; } +--- + + +/home/ferd/devel/libopenshot/tests/Color_Tests.cpp should add these lines: +#include // for int64_t +#include "CheckMacros.h" // for CHECK_CLOSE, CHECK_EQUAL, CHECK_THROW +#include "TestMacros.h" // for TEST, SUITE +#include "json/json.h" // for Value +namespace openshot { class InvalidJSON; } + +/home/ferd/devel/libopenshot/tests/Color_Tests.cpp should remove these lines: +- #include "Json.h" // lines 39-39 +- #include "UnitTest++.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/tests/Color_Tests.cpp: +#include // for int64_t +#include // for string +#include // for vector +#include "CheckMacros.h" // for CHECK_CLOSE, CHECK_EQUAL, CHECK_THROW +#include "Color.h" // for Color +#include "KeyFrame.h" // for Keyframe +#include "TestMacros.h" // for TEST, SUITE +#include "json/json.h" // for Value +namespace openshot { class InvalidJSON; } +--- + + +/home/ferd/devel/libopenshot/tests/Clip_Tests.cpp should add these lines: +#include // for QImage +#include // for list +#include // for string +#include "AudioBufferSource.h" // for openshot +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK_THROW +#include "Enums.h" // for ANCHOR_CANVAS, GRAVITY_CENTER, SCAL... +#include "RequireMacros.h" // for REQUIRE +#include "TestMacros.h" // for TEST, SUITE +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/Negate.h" // for Negate +#include "json/json.h" // for Value, CharReader, CharReaderBuilder +namespace openshot { class ReaderClosed; } + +/home/ferd/devel/libopenshot/tests/Clip_Tests.cpp should remove these lines: +- #include "Json.h" // lines 47-47 +- #include "UnitTest++.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/tests/Clip_Tests.cpp: +#include // for QImage +#include // for list +#include // for shared_ptr, __shared_ptr_access +#include // for operator<<, stringstream, basic_ost... +#include // for string +#include "AudioBufferSource.h" // for openshot +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK_THROW +#include "Clip.h" // for Clip +#include "Enums.h" // for ANCHOR_CANVAS, GRAVITY_CENTER, SCAL... +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "RequireMacros.h" // for REQUIRE +#include "TestMacros.h" // for TEST, SUITE +#include "Timeline.h" // for Timeline +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/Negate.h" // for Negate +#include "json/json.h" // for Value, CharReader, CharReaderBuilder +namespace openshot { class ReaderClosed; } +--- + + +/home/ferd/devel/libopenshot/tests/Coordinate_Tests.cpp should add these lines: +#include "CheckMacros.h" // for CHECK_CLOSE +#include "Exceptions.h" // for openshot +#include "TestMacros.h" // for TEST + +/home/ferd/devel/libopenshot/tests/Coordinate_Tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 31-31 + +The full include-list for /home/ferd/devel/libopenshot/tests/Coordinate_Tests.cpp: +#include "CheckMacros.h" // for CHECK_CLOSE +#include "Coordinate.h" // for Coordinate +#include "Exceptions.h" // for openshot +#include "TestMacros.h" // for TEST +--- + + +/home/ferd/devel/libopenshot/tests/Cache_Tests.cpp should add these lines: +#include // for QDir +#include // for operator+, QString +#include // for NULL +#include // for string +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/tests/Cache_Tests.cpp should remove these lines: +- #include // lines 40-40 +- #include "Json.h" // lines 38-38 +- #include "UnitTest++.h" // lines 33-33 + +The full include-list for /home/ferd/devel/libopenshot/tests/Cache_Tests.cpp: +#include // for QDir +#include // for operator+, QString +#include // for NULL +#include // for shared_ptr, operator!=, __shared_ptr_access +#include // for string +#include "CacheDisk.h" // for CacheDisk +#include "CacheMemory.h" // for CacheMemory +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST +#include "json/json.h" // for Value +--- + + +/home/ferd/devel/libopenshot/tests/ImageWriter_Tests.cpp should add these lines: + +/home/ferd/devel/libopenshot/tests/ImageWriter_Tests.cpp should remove these lines: +- #include // lines 32-32 +- #include // lines 31-31 +- #include "UnitTest++.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/tests/ImageWriter_Tests.cpp: +--- + +/home/ferd/devel/libopenshot/tests/DummyReader_Tests.cpp:149:29: warning: expression result unused [-Wunused-value] + CHECK_THROW(r.GetFrame(3)->number, InvalidFile); + ~~~~~~~~~~~~~ ^~~~~~ +/usr/include/UnitTest++/CheckMacros.h:205:27: note: expanded from macro 'CHECK_THROW' + #define CHECK_THROW UNITTEST_CHECK_THROW + ^ +/usr/include/UnitTest++/CheckMacros.h:185:10: note: expanded from macro 'UNITTEST_CHECK_THROW' + try { expression; } \ + ^~~~~~~~~~ + +/home/ferd/devel/libopenshot/tests/DummyReader_Tests.cpp should add these lines: +#include // for int64_t +#include // for std +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK_THROW +#include "ReaderBase.h" // for ReaderInfo +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST +namespace openshot { class InvalidFile; } + +/home/ferd/devel/libopenshot/tests/DummyReader_Tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 33-33 + +The full include-list for /home/ferd/devel/libopenshot/tests/DummyReader_Tests.cpp: +#include // for int64_t +#include // for std +#include // for shared_ptr, __shared_ptr_access +#include "CacheMemory.h" // for CacheMemory +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK_THROW +#include "DummyReader.h" // for DummyReader +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "ReaderBase.h" // for ReaderInfo +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST +namespace openshot { class InvalidFile; } +--- + + +/home/ferd/devel/libopenshot/tests/ReaderBase_Tests.cpp should add these lines: +#include // for int64_t +#include // for NULL, std +#include // for string +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE +#include "Fraction.h" // for Fraction +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/tests/ReaderBase_Tests.cpp should remove these lines: +- #include "Json.h" // lines 39-39 +- #include "UnitTest++.h" // lines 33-33 + +The full include-list for /home/ferd/devel/libopenshot/tests/ReaderBase_Tests.cpp: +#include // for int64_t +#include // for NULL, std +#include // for shared_ptr +#include // for string +#include "CacheBase.h" // for CacheBase +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "ReaderBase.h" // for ReaderInfo, ReaderBase +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST +#include "json/json.h" // for Value +--- + + +/home/ferd/devel/libopenshot/tests/FFmpegReader_Tests.cpp should add these lines: +#include // for QImage +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK... +#include "Clip.h" // for Clip +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Fraction.h" // for Fraction +#include "effects/../ReaderBase.h" // for ReaderInfo +namespace openshot { class InvalidFile; } +namespace openshot { class ReaderClosed; } + +/home/ferd/devel/libopenshot/tests/FFmpegReader_Tests.cpp should remove these lines: +- #include "FFmpegReader.h" // lines 37-37 +- #include "Json.h" // lines 40-40 +- #include "UnitTest++.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/tests/FFmpegReader_Tests.cpp: +#include // for QImage +#include // for shared_ptr, __shared_ptr_access +#include // for operator<<, stringstream, basic... +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK... +#include "Clip.h" // for Clip +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "Timeline.h" // for Timeline +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../Fraction.h" // for Fraction +#include "effects/../ReaderBase.h" // for ReaderInfo +namespace openshot { class InvalidFile; } +namespace openshot { class ReaderClosed; } +--- + + +/home/ferd/devel/libopenshot/tests/Fraction_Tests.cpp should add these lines: +#include // for std +#include "CheckMacros.h" // for CHECK_CLOSE, CHECK_EQUAL +#include "TestMacros.h" // for TEST + +/home/ferd/devel/libopenshot/tests/Fraction_Tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 31-31 + +The full include-list for /home/ferd/devel/libopenshot/tests/Fraction_Tests.cpp: +#include // for std +#include "CheckMacros.h" // for CHECK_CLOSE, CHECK_EQUAL +#include "Fraction.h" // for Fraction, openshot +#include "TestMacros.h" // for TEST +--- + + +/home/ferd/devel/libopenshot/tests/FFmpegWriter_Tests.cpp should add these lines: +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../ReaderBase.h" // for ReaderInfo + +/home/ferd/devel/libopenshot/tests/FFmpegWriter_Tests.cpp should remove these lines: +- #include "FFmpegReader.h" // lines 38-38 +- #include "UnitTest++.h" // lines 34-34 + +The full include-list for /home/ferd/devel/libopenshot/tests/FFmpegWriter_Tests.cpp: +#include // for shared_ptr, __shared_ptr_access +#include // for operator<<, stringstream, basic... +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE +#include "FFmpegWriter.h" // for FFmpegWriter +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "effects/../FFmpegReader.h" // for FFmpegReader +#include "effects/../ReaderBase.h" // for ReaderInfo +--- + + +/home/ferd/devel/libopenshot/tests/FrameMapper_Tests.cpp should add these lines: +#include // for sin, M_PI, abs +#include // for int64_t +#include // for abs +#include // for shared_ptr, __shared_ptr_access +#include // for operator<<, stringstream, basic_ostream +#include // for char_traits, string +#include // for vector +#include "ChannelLayouts.h" // for LAYOUT_STEREO, LAYOUT_MONO, LAYOUT_SURROUND +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK_THROW +#include "ReaderBase.h" // for ReaderInfo +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +namespace openshot { class OutOfBoundsFrame; } +namespace openshot { class ReaderClosed; } + +/home/ferd/devel/libopenshot/tests/FrameMapper_Tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 31-31 + +The full include-list for /home/ferd/devel/libopenshot/tests/FrameMapper_Tests.cpp: +#include // for sin, M_PI, abs +#include // for int64_t +#include // for abs +#include // for shared_ptr, __shared_ptr_access +#include // for operator<<, stringstream, basic_ostream +#include // for char_traits, string +#include // for vector +#include "CacheMemory.h" // for CacheMemory +#include "ChannelLayouts.h" // for LAYOUT_STEREO, LAYOUT_MONO, LAYOUT_SURROUND +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE, CHECK_THROW +#include "Clip.h" // for Clip +#include "DummyReader.h" // for DummyReader +#include "FFmpegReader.h" // for FFmpegReader +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "FrameMapper.h" // for FrameMapper, MappedFrame, Field, PULLDOW... +#include "ReaderBase.h" // for ReaderInfo +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "Timeline.h" // for Timeline +namespace openshot { class OutOfBoundsFrame; } +namespace openshot { class ReaderClosed; } +--- + + +/home/ferd/devel/libopenshot/tests/Frame_Tests.cpp should add these lines: +#include // for QImage +#include // for QString +#include // for string +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "effects/../Frame.h" // for Frame + +/home/ferd/devel/libopenshot/tests/Frame_Tests.cpp should remove these lines: +- #include // lines 42-42 +- #include "Frame.h" // lines 38-38 +- #include "UnitTest++.h" // lines 35-35 + +The full include-list for /home/ferd/devel/libopenshot/tests/Frame_Tests.cpp: +#include // for QImage +#include // for QString +#include // for shared_ptr, __shared_ptr_access, opera... +#include // for operator<<, stringstream, basic_ostream +#include // for string +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK +#include "Clip.h" // for Clip +#include "Fraction.h" // for Fraction +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "effects/../Frame.h" // for Frame +--- + + +/home/ferd/devel/libopenshot/tests/KeyFrame_Tests.cpp should add these lines: +#include // for int64_t +#include // for std +#include "CheckMacros.h" // for CHECK_CLOSE, CHECK_EQUAL, CHECK_THROW +#include "Exceptions.h" // for OutOfBoundsPoint (ptr only), openshot +#include "TestMacros.h" // for TEST +#include "TimeConstraint.h" // for UNITTEST_TIME_CONSTRAINT + +/home/ferd/devel/libopenshot/tests/KeyFrame_Tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 31-31 + +The full include-list for /home/ferd/devel/libopenshot/tests/KeyFrame_Tests.cpp: +#include // for int64_t +#include // for std +#include "CheckMacros.h" // for CHECK_CLOSE, CHECK_EQUAL, CHECK_THROW +#include "Coordinate.h" // for Coordinate +#include "Exceptions.h" // for OutOfBoundsPoint (ptr only), openshot +#include "Fraction.h" // for Fraction +#include "KeyFrame.h" // for Keyframe +#include "Point.h" // for Point, BEZIER, CONSTANT, LINEAR +#include "TestMacros.h" // for TEST +#include "TimeConstraint.h" // for UNITTEST_TIME_CONSTRAINT +--- + + +/home/ferd/devel/libopenshot/tests/Point_Tests.cpp should add these lines: +#include // for operator<<, stringstream, basic_ostream +#include "CheckMacros.h" // for CHECK_EQUAL +#include "TestMacros.h" // for TEST, SUITE +#include "json/json.h" // for Value + +/home/ferd/devel/libopenshot/tests/Point_Tests.cpp should remove these lines: +- #include "Enums.h" // lines 35-35 +- #include "Json.h" // lines 37-37 +- #include "UnitTest++.h" // lines 31-31 + +The full include-list for /home/ferd/devel/libopenshot/tests/Point_Tests.cpp: +#include // for operator<<, stringstream, basic_ostream +#include "CheckMacros.h" // for CHECK_EQUAL +#include "Coordinate.h" // for Coordinate +#include "Point.h" // for Point, InterpolationType, BEZIER, HandleType +#include "TestMacros.h" // for TEST, SUITE +#include "json/json.h" // for Value +--- + + +/home/ferd/devel/libopenshot/tests/Settings_Tests.cpp should add these lines: +#include // for std +#include "CheckMacros.h" // for CHECK_EQUAL +#include "TestMacros.h" // for TEST + +/home/ferd/devel/libopenshot/tests/Settings_Tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 31-31 + +The full include-list for /home/ferd/devel/libopenshot/tests/Settings_Tests.cpp: +#include // for std +#include "CheckMacros.h" // for CHECK_EQUAL +#include "Settings.h" // for Settings, openshot +#include "TestMacros.h" // for TEST +--- + + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should add these lines: +#include // for free, malloc +#include // for array, array<>::value_type +#include // for deque +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for vector, vector<>::const_iterator + +/home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp should remove these lines: +- #include // lines 2440-2440 +- #include // lines 4154-4154 +- #include // lines 4163-4163 +- #include // lines 4164-4164 +- #include // lines 2442-2442 +- #include // lines 4155-4155 +- #include // lines 4156-4156 +- #include // lines 4157-4157 +- #include // lines 4158-4158 +- #include // lines 253-253 +- #include // lines 2443-2443 +- #include // lines 4159-4159 +- #include // lines 2444-2444 +- #include // lines 4160-4160 + +The full include-list for /home/ferd/devel/libopenshot/thirdparty/jsoncpp/jsoncpp.cpp: +#include // for free, malloc +#include // for min +#include // for array, array<>::value_type +#include // for assert +#include // for localeconv, lconv +#include // for isfinite, isnan, modf +#include // for size_t, ptrdiff_t +#include // for sscanf, size_t, EOF +#include // for strlen, memcmp, memcpy, strchr +#include // for deque +#include // for operator<<, char_traits, basic_ostream, basic... +#include // for numeric_limits +#include // for map<>::iterator, map<>::const_iterator, opera... +#include // for allocator, unique_ptr, allocator_traits<>::va... +#include // for set, operator==, _Rb_tree_iterator, operator!= +#include // for stack +#include // for basic_string, operator+, operator<<, operator== +#include // for move, pair, swap +#include // for vector, vector<>::const_iterator +#include "json/json.h" // for Value, String, Reader, Value::ValueHolder +--- + + +/home/ferd/devel/libopenshot/tests/Timeline_Tests.cpp should add these lines: +#include // for string +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE +#include "ReaderBase.h" // for ReaderInfo +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "effects/../EffectBase.h" // for EffectBase +#include "effects/../KeyFrame.h" // for Keyframe + +/home/ferd/devel/libopenshot/tests/Timeline_Tests.cpp should remove these lines: +- #include "UnitTest++.h" // lines 35-35 + +The full include-list for /home/ferd/devel/libopenshot/tests/Timeline_Tests.cpp: +#include // for list, list<>::iterator, operator!= +#include // for shared_ptr, __shared_ptr_access +#include // for operator<<, stringstream, basic_o... +#include // for string +#include "ChannelLayouts.h" // for LAYOUT_STEREO +#include "CheckMacros.h" // for CHECK_EQUAL, CHECK_CLOSE +#include "Clip.h" // for Clip +#include "Fraction.h" // for Fraction +#include "Frame.h" // for Frame +#include "ReaderBase.h" // for ReaderInfo +#include "Settings.h" // for openshot +#include "TestMacros.h" // for TEST, SUITE +#include "Timeline.h" // for Timeline +#include "effects/../EffectBase.h" // for EffectBase +#include "effects/../KeyFrame.h" // for Keyframe +#include "effects/Blur.h" // for Blur +#include "effects/Negate.h" // for Negate +--- + diff --git a/src/AudioReaderSource.cpp b/src/AudioReaderSource.cpp index f5f0a4c84..acd69deb5 100644 --- a/src/AudioReaderSource.cpp +++ b/src/AudioReaderSource.cpp @@ -29,6 +29,7 @@ */ #include "AudioReaderSource.h" +#include "Exceptions.h" using namespace std; using namespace openshot; diff --git a/src/AudioResampler.h b/src/AudioResampler.h index d88eb7cbe..02c5cec1d 100644 --- a/src/AudioResampler.h +++ b/src/AudioResampler.h @@ -32,7 +32,6 @@ #define OPENSHOT_RESAMPLER_H #include "AudioBufferSource.h" -#include "Exceptions.h" #include "JuceHeader.h" namespace openshot { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b88e67d6..ee9adf56b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -212,7 +212,6 @@ if(ImageMagick_FOUND) # define a preprocessor macro (used in the C++ source) target_compile_definitions(openshot PUBLIC USE_IMAGEMAGICK=1) - list(APPEND CMAKE_SWIG_FLAGS -DUSE_IMAGEMAGICK=1) # Link with ImageMagick library target_link_libraries(openshot PUBLIC ImageMagick::Magick++) @@ -346,8 +345,7 @@ if (TARGET Resvg::Resvg) #include_directories(${Resvg_INCLUDE_DIRS}) target_link_libraries(openshot PUBLIC Resvg::Resvg) - target_compile_definitions(openshot PUBLIC -DUSE_RESVG=1) - list(APPEND CMAKE_SWIG_FLAGS -DUSE_RESVG=1) + target_compile_definitions(openshot PUBLIC USE_RESVG=1) set(HAVE_RESVG TRUE CACHE BOOL "Building with Resvg support" FORCE) mark_as_advanced(HAVE_RESVG) @@ -373,8 +371,7 @@ if (ENABLE_BLACKMAGIC) target_link_libraries(openshot PUBLIC ${BLACKMAGIC_LIBRARY_DIR}) # define a preprocessor macro (used in the C++) - target_compile_definitions(openshot PUBLIC -DUSE_BLACKMAGIC=1) - list(APPEND CMAKE_SWIG_FLAGS -DUSE_BLACKMAGIC=1) + target_compile_definitions(openshot PUBLIC USE_BLACKMAGIC=1) endif() endif() diff --git a/src/CacheBase.h b/src/CacheBase.h index da72e5dbd..0033c8825 100644 --- a/src/CacheBase.h +++ b/src/CacheBase.h @@ -34,7 +34,6 @@ #include #include #include "Frame.h" -#include "Exceptions.h" #include "Json.h" namespace openshot { diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp index ba5f5d9e2..6d1241ed0 100644 --- a/src/CacheDisk.cpp +++ b/src/CacheDisk.cpp @@ -29,6 +29,7 @@ */ #include "CacheDisk.h" +#include "Exceptions.h" #include "QtUtilities.h" #include #include diff --git a/src/CacheDisk.h b/src/CacheDisk.h index c60f5f6e3..ef63686b4 100644 --- a/src/CacheDisk.h +++ b/src/CacheDisk.h @@ -36,7 +36,6 @@ #include #include "CacheBase.h" #include "Frame.h" -#include "Exceptions.h" #include namespace openshot { diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp index 685c86ecf..62dc99576 100644 --- a/src/CacheMemory.cpp +++ b/src/CacheMemory.cpp @@ -29,6 +29,7 @@ */ #include "CacheMemory.h" +#include "Exceptions.h" using namespace std; using namespace openshot; diff --git a/src/CacheMemory.h b/src/CacheMemory.h index ba771cedf..e5402ad9c 100644 --- a/src/CacheMemory.h +++ b/src/CacheMemory.h @@ -36,7 +36,6 @@ #include #include "CacheBase.h" #include "Frame.h" -#include "Exceptions.h" namespace openshot { diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp index 1675962ee..95a6613f4 100644 --- a/src/ChunkReader.cpp +++ b/src/ChunkReader.cpp @@ -29,6 +29,7 @@ */ #include "ChunkReader.h" +#include "Exceptions.h" #include "FFmpegReader.h" #include diff --git a/src/ChunkWriter.cpp b/src/ChunkWriter.cpp index 80ea6d57b..3b03ae273 100644 --- a/src/ChunkWriter.cpp +++ b/src/ChunkWriter.cpp @@ -29,6 +29,7 @@ */ #include "ChunkWriter.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/ChunkWriter.h b/src/ChunkWriter.h index a63e4ca12..ff1aee369 100644 --- a/src/ChunkWriter.h +++ b/src/ChunkWriter.h @@ -35,7 +35,6 @@ #include "WriterBase.h" #include "FFmpegWriter.h" #include "CacheMemory.h" -#include "Exceptions.h" #include "Json.h" #include diff --git a/src/Clip.cpp b/src/Clip.cpp index f11f5cb7b..df746751a 100644 --- a/src/Clip.cpp +++ b/src/Clip.cpp @@ -29,6 +29,7 @@ */ #include "Clip.h" +#include "Exceptions.h" #include "FFmpegReader.h" #include "FrameMapper.h" #ifdef USE_IMAGEMAGICK diff --git a/src/ClipBase.h b/src/ClipBase.h index ac2c02378..9e30ea1d1 100644 --- a/src/ClipBase.h +++ b/src/ClipBase.h @@ -34,7 +34,6 @@ #include #include #include "CacheMemory.h" -#include "Exceptions.h" #include "Frame.h" #include "Point.h" #include "KeyFrame.h" diff --git a/src/Color.cpp b/src/Color.cpp index 622a912ca..fe3055918 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -29,6 +29,7 @@ */ #include "Color.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/Coordinate.h b/src/Coordinate.h index 8a3ce97c2..35fa966a4 100644 --- a/src/Coordinate.h +++ b/src/Coordinate.h @@ -32,6 +32,7 @@ #define OPENSHOT_COORDINATE_H #include +#include "Fraction.h" #include "Json.h" namespace openshot { diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp index bb31f316d..30f23fc67 100644 --- a/src/DecklinkReader.cpp +++ b/src/DecklinkReader.cpp @@ -29,6 +29,7 @@ */ #include "DecklinkReader.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/DecklinkReader.h b/src/DecklinkReader.h index d846cca90..6008e5eb7 100644 --- a/src/DecklinkReader.h +++ b/src/DecklinkReader.h @@ -46,7 +46,6 @@ #include #include "CacheMemory.h" -#include "Exceptions.h" #include "Frame.h" #include "DecklinkInput.h" diff --git a/src/DecklinkWriter.h b/src/DecklinkWriter.h index 84117d0ea..49691ee51 100644 --- a/src/DecklinkWriter.h +++ b/src/DecklinkWriter.h @@ -46,7 +46,6 @@ #include #include "CacheMemory.h" -#include "Exceptions.h" #include "Frame.h" #include "DecklinkOutput.h" diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp index c295c2985..e6c5fce1d 100644 --- a/src/DummyReader.cpp +++ b/src/DummyReader.cpp @@ -29,6 +29,7 @@ */ #include "DummyReader.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/DummyReader.h b/src/DummyReader.h index af06656d8..280ed171f 100644 --- a/src/DummyReader.h +++ b/src/DummyReader.h @@ -40,7 +40,6 @@ #include #include #include "CacheMemory.h" -#include "Exceptions.h" #include "Fraction.h" namespace openshot diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp index 458381ced..81ba72998 100644 --- a/src/EffectBase.cpp +++ b/src/EffectBase.cpp @@ -29,6 +29,7 @@ */ #include "EffectBase.h" +#include "Exceptions.h" using namespace openshot; @@ -148,4 +149,4 @@ openshot::ClipBase* EffectBase::ParentClip() { /// Set parent clip object of this reader void EffectBase::ParentClip(openshot::ClipBase* new_clip) { clip = new_clip; -} \ No newline at end of file +} diff --git a/src/Exceptions.h b/src/Exceptions.h index 9cced3138..46137d532 100644 --- a/src/Exceptions.h +++ b/src/Exceptions.h @@ -365,6 +365,31 @@ namespace openshot { virtual ~ResampleError() noexcept {} }; +#define TMS_DEP_MSG "The library no longer throws this exception. It will be removed in a future release." + +#ifndef SWIG + /// Exception when too many seek attempts happen + class + __attribute__ ((deprecated (TMS_DEP_MSG) )) + TooManySeeks : public ExceptionBase + { + public: + std::string file_path; + /** + * @brief Constructor + * + * @param message A message to accompany the exception + * @param file_path (optional) The input file being processed + */ + TooManySeeks(std::string message, std::string file_path="") +#ifndef SWIG + __attribute__ ((deprecated (TMS_DEP_MSG) )) +#endif + : ExceptionBase(message), file_path(file_path) { } + virtual ~TooManySeeks() noexcept {} + }; +#endif + /// Exception when a writer is closed, and a frame is requested class WriterClosed : public ExceptionBase { diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index 01f371582..b51d0b06f 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -32,6 +32,7 @@ */ #include "FFmpegReader.h" +#include "Exceptions.h" #include // for std::this_thread::sleep_for #include // for std::chrono::milliseconds @@ -422,6 +423,14 @@ void FFmpegReader::Open() { } #endif // HAVE_HW_ACCEL + // Disable per-frame threading for album arts + // Using FF_THREAD_FRAME adds one frame decoding delay per thread, + // but there's only one frame in this case. + if (HasAlbumArt()) + { + pCodecCtx->thread_type &= ~FF_THREAD_FRAME; + } + // Open video codec if (avcodec_open2(pCodecCtx, pCodec, &opts) < 0) throw InvalidCodec("A video codec was found, but could not be opened.", path); @@ -628,6 +637,14 @@ void FFmpegReader::Close() { } } +bool FFmpegReader::HasAlbumArt() { + // Check if the video stream we use is an attached picture + // This won't return true if the file has a cover image as a secondary stream + // like an MKV file with an attached image file + return pFormatCtx && videoStream >= 0 && pFormatCtx->streams[videoStream] + && (pFormatCtx->streams[videoStream]->disposition & AV_DISPOSITION_ATTACHED_PIC); +} + void FFmpegReader::UpdateAudioInfo() { // Set values of FileInfo struct info.has_audio = true; @@ -1768,8 +1785,8 @@ void FFmpegReader::Seek(int64_t requested_frame) { bool seek_worked = false; int64_t seek_target = 0; - // Seek video stream (if any) - if (!seek_worked && info.has_video) { + // Seek video stream (if any), except album arts + if (!seek_worked && info.has_video && !HasAlbumArt()) { seek_target = ConvertFrameToVideoPTS(requested_frame - buffer_amount); if (av_seek_frame(pFormatCtx, info.video_stream_index, seek_target, AVSEEK_FLAG_BACKWARD) < 0) { fprintf(stderr, "%s: error while seeking video stream\n", pFormatCtx->AV_FILENAME); @@ -2100,14 +2117,12 @@ bool FFmpegReader::CheckMissingFrame(int64_t requested_frame) { // Special MP3 Handling (ignore more than 1 video frame) if (info.has_audio and info.has_video) { - AVCodecID aCodecId = AV_FIND_DECODER_CODEC_ID(aStream); - AVCodecID vCodecId = AV_FIND_DECODER_CODEC_ID(pStream); // If MP3 with single video frame, handle this special case by copying the previously // decoded image to the new frame. Otherwise, it will spend a huge amount of // CPU time looking for missing images for all the audio-only frames. if (checked_frames[requested_frame] > 8 && !missing_video_frames.count(requested_frame) && !processing_audio_frames.count(requested_frame) && processed_audio_frames.count(requested_frame) && - last_frame && last_video_frame && last_video_frame->has_image_data && aCodecId == AV_CODEC_ID_MP3 && (vCodecId == AV_CODEC_ID_MJPEGB || vCodecId == AV_CODEC_ID_MJPEG)) { + last_video_frame && last_video_frame->has_image_data && HasAlbumArt()) { missing_video_frames.insert(std::pair(requested_frame, last_video_frame->number)); missing_video_frames_source.insert(std::pair(last_video_frame->number, requested_frame)); missing_frames.Add(last_video_frame); diff --git a/src/FFmpegReader.h b/src/FFmpegReader.h index 35e11a426..dde0cb371 100644 --- a/src/FFmpegReader.h +++ b/src/FFmpegReader.h @@ -46,7 +46,6 @@ #include #include "CacheMemory.h" #include "Clip.h" -#include "Exceptions.h" #include "OpenMPUtilities.h" #include "Settings.h" @@ -195,6 +194,9 @@ namespace openshot { /// Get the PTS for the current video packet int64_t GetVideoPTS(); + /// Check if there's an album art + bool HasAlbumArt(); + /// Remove partial frames due to seek bool IsPartialFrame(int64_t requested_frame); diff --git a/src/FFmpegUtilities.h b/src/FFmpegUtilities.h index c1a7ccd37..2f914128a 100644 --- a/src/FFmpegUtilities.h +++ b/src/FFmpegUtilities.h @@ -127,14 +127,10 @@ #endif // Does ffmpeg pixel format contain an alpha channel? - inline static const bool ffmpeg_has_alpha(PixelFormat pix_fmt) - { - if (pix_fmt == AV_PIX_FMT_ARGB || pix_fmt == AV_PIX_FMT_RGBA || pix_fmt == AV_PIX_FMT_ABGR || pix_fmt == AV_PIX_FMT_BGRA || pix_fmt == AV_PIX_FMT_YUVA420P) { - return true; - } else { - return false; - } - } + inline static const bool ffmpeg_has_alpha(PixelFormat pix_fmt) { + const AVPixFmtDescriptor *fmt_desc = av_pix_fmt_desc_get(pix_fmt); + return bool(fmt_desc->flags & AV_PIX_FMT_FLAG_ALPHA); + } // FFmpeg's libavutil/common.h defines an RSHIFT incompatible with Ruby's // definition in ruby/config.h, so we move it to FF_RSHIFT diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp index e5e92fd4f..210a6e435 100644 --- a/src/FFmpegWriter.cpp +++ b/src/FFmpegWriter.cpp @@ -32,6 +32,7 @@ */ #include "FFmpegWriter.h" +#include "Exceptions.h" #include diff --git a/src/FFmpegWriter.h b/src/FFmpegWriter.h index 6d9da6e53..44f7cb355 100644 --- a/src/FFmpegWriter.h +++ b/src/FFmpegWriter.h @@ -49,7 +49,6 @@ #include #include #include "CacheMemory.h" -#include "Exceptions.h" #include "OpenMPUtilities.h" #include "ZmqLogger.h" #include "Settings.h" diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp index d66138257..98b0c112c 100644 --- a/src/FrameMapper.cpp +++ b/src/FrameMapper.cpp @@ -29,6 +29,7 @@ */ #include "FrameMapper.h" +#include "Exceptions.h" #include "Clip.h" using namespace std; diff --git a/src/FrameMapper.h b/src/FrameMapper.h index 5b3e00e36..09f198992 100644 --- a/src/FrameMapper.h +++ b/src/FrameMapper.h @@ -40,7 +40,6 @@ #include "ReaderBase.h" #include "Frame.h" #include "Fraction.h" -#include "Exceptions.h" #include "KeyFrame.h" diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp index ad21be157..a4c21b80c 100644 --- a/src/ImageReader.cpp +++ b/src/ImageReader.cpp @@ -32,6 +32,7 @@ #ifdef USE_IMAGEMAGICK #include "ImageReader.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/ImageReader.h b/src/ImageReader.h index 2fcb963aa..39c505dc8 100644 --- a/src/ImageReader.h +++ b/src/ImageReader.h @@ -43,7 +43,7 @@ #include #include #include "CacheMemory.h" -#include "Exceptions.h" + #include "MagickUtilities.h" namespace openshot diff --git a/src/ImageWriter.cpp b/src/ImageWriter.cpp index 275ea2703..78b0d1a92 100644 --- a/src/ImageWriter.cpp +++ b/src/ImageWriter.cpp @@ -35,6 +35,7 @@ #ifdef USE_IMAGEMAGICK #include "ImageWriter.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/ImageWriter.h b/src/ImageWriter.h index 798d67d64..be12e5d12 100644 --- a/src/ImageWriter.h +++ b/src/ImageWriter.h @@ -48,6 +48,7 @@ #include "CacheMemory.h" #include "Exceptions.h" #include "Fraction.h" + #include "OpenMPUtilities.h" #include "MagickUtilities.h" diff --git a/src/Json.cpp b/src/Json.cpp index 9d6d9ba4d..ee3d06ba4 100644 --- a/src/Json.cpp +++ b/src/Json.cpp @@ -29,6 +29,7 @@ */ #include "Json.h" +#include "Exceptions.h" const Json::Value openshot::stringToJson(const std::string value) { diff --git a/src/Json.h b/src/Json.h index 0bdf6e2c3..9837f2164 100644 --- a/src/Json.h +++ b/src/Json.h @@ -33,7 +33,7 @@ #include #include "json/json.h" -#include "Exceptions.h" + namespace openshot { const Json::Value stringToJson(const std::string value); diff --git a/src/KeyFrame.h b/src/KeyFrame.h index 82a212046..7e912f6ca 100644 --- a/src/KeyFrame.h +++ b/src/KeyFrame.h @@ -33,6 +33,7 @@ #include #include + #include "Fraction.h" #include "Point.h" #include "Json.h" diff --git a/src/OpenShot.h b/src/OpenShot.h index 56f847d17..c1428342d 100644 --- a/src/OpenShot.h +++ b/src/OpenShot.h @@ -75,7 +75,7 @@ * * \anchor License * ### License & Copyright ### - * Copyright (c) 2008-2019 OpenShot Studios, LLC + * Copyright (c) 2008-2021 OpenShot Studios, LLC * . This file is part of * OpenShot Library (libopenshot), an open-source project dedicated to * delivering high quality video editing and animation solutions to the @@ -118,7 +118,7 @@ #include "Effects.h" #include "EffectInfo.h" #include "Enums.h" -#include "Exceptions.h" + #include "ReaderBase.h" #include "WriterBase.h" #include "FFmpegReader.h" diff --git a/src/Point.cpp b/src/Point.cpp index 006d84e4c..44b6883f9 100644 --- a/src/Point.cpp +++ b/src/Point.cpp @@ -29,6 +29,7 @@ */ #include "Point.h" +#include "Exceptions.h" using namespace std; using namespace openshot; diff --git a/src/Point.h b/src/Point.h index d6ff1d87d..8df34aa93 100644 --- a/src/Point.h +++ b/src/Point.h @@ -32,7 +32,7 @@ #define OPENSHOT_POINT_H #include "Coordinate.h" -#include "Exceptions.h" + #include "Json.h" namespace openshot diff --git a/src/Profiles.cpp b/src/Profiles.cpp index 167affe2c..529bf3cd2 100644 --- a/src/Profiles.cpp +++ b/src/Profiles.cpp @@ -29,6 +29,7 @@ */ #include "Profiles.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/Profiles.h b/src/Profiles.h index 1de7c0722..9d8c6d3b0 100644 --- a/src/Profiles.h +++ b/src/Profiles.h @@ -41,7 +41,6 @@ #include #include #include -#include "Exceptions.h" #include "Fraction.h" #include "Json.h" diff --git a/src/Qt/PlayerPrivate.cpp b/src/Qt/PlayerPrivate.cpp index 9f53a0c51..fd92655e2 100644 --- a/src/Qt/PlayerPrivate.cpp +++ b/src/Qt/PlayerPrivate.cpp @@ -30,6 +30,7 @@ */ #include "PlayerPrivate.h" +#include "Exceptions.h" #include // for std::this_thread::sleep_for #include // for std::chrono milliseconds, high_resolution_clock diff --git a/src/Qt/VideoCacheThread.cpp b/src/Qt/VideoCacheThread.cpp index e1e53f5d4..1ec52dd7c 100644 --- a/src/Qt/VideoCacheThread.cpp +++ b/src/Qt/VideoCacheThread.cpp @@ -29,6 +29,7 @@ */ #include "VideoCacheThread.h" +#include "Exceptions.h" #include #include // for std::this_thread::sleep_for diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp index d2d96186c..f14bcfa07 100644 --- a/src/QtHtmlReader.cpp +++ b/src/QtHtmlReader.cpp @@ -31,6 +31,7 @@ */ #include "QtHtmlReader.h" +#include "Exceptions.h" #include #include #include diff --git a/src/QtHtmlReader.h b/src/QtHtmlReader.h index cd5a2750a..6564477d6 100644 --- a/src/QtHtmlReader.h +++ b/src/QtHtmlReader.h @@ -43,7 +43,7 @@ #include #include "CacheMemory.h" #include "Enums.h" -#include "Exceptions.h" + class QImage; diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp index 8fb222db4..90af26a0d 100644 --- a/src/QtImageReader.cpp +++ b/src/QtImageReader.cpp @@ -29,6 +29,7 @@ */ #include "QtImageReader.h" +#include "Exceptions.h" #include "Settings.h" #include "Clip.h" #include "CacheMemory.h" diff --git a/src/QtImageReader.h b/src/QtImageReader.h index b61ca3af3..1150b4636 100644 --- a/src/QtImageReader.h +++ b/src/QtImageReader.h @@ -37,7 +37,7 @@ #include #include #include -#include "Exceptions.h" + #include "ReaderBase.h" namespace openshot diff --git a/src/QtTextReader.cpp b/src/QtTextReader.cpp index 0a4410cb2..00627e1c2 100644 --- a/src/QtTextReader.cpp +++ b/src/QtTextReader.cpp @@ -31,6 +31,7 @@ */ #include "QtTextReader.h" +#include "Exceptions.h" #include #include diff --git a/src/QtTextReader.h b/src/QtTextReader.h index d66681f31..bd6a6a538 100644 --- a/src/QtTextReader.h +++ b/src/QtTextReader.h @@ -43,7 +43,7 @@ #include #include "CacheMemory.h" #include "Enums.h" -#include "Exceptions.h" + class QImage; diff --git a/src/TextReader.cpp b/src/TextReader.cpp index 0407460a2..9ef8142f9 100644 --- a/src/TextReader.cpp +++ b/src/TextReader.cpp @@ -32,6 +32,7 @@ #ifdef USE_IMAGEMAGICK #include "TextReader.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/TextReader.h b/src/TextReader.h index b5488f5fe..2a9fb92a4 100644 --- a/src/TextReader.h +++ b/src/TextReader.h @@ -44,7 +44,7 @@ #include #include "CacheMemory.h" #include "Enums.h" -#include "Exceptions.h" + #include "MagickUtilities.h" namespace openshot diff --git a/src/Timeline.cpp b/src/Timeline.cpp index 60dfdbca0..a57390f2b 100644 --- a/src/Timeline.cpp +++ b/src/Timeline.cpp @@ -29,6 +29,7 @@ */ #include "Timeline.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/WriterBase.cpp b/src/WriterBase.cpp index 9755c61d5..fff93988a 100644 --- a/src/WriterBase.cpp +++ b/src/WriterBase.cpp @@ -29,6 +29,7 @@ */ #include "WriterBase.h" +#include "Exceptions.h" using namespace openshot; diff --git a/src/ZmqLogger.cpp b/src/ZmqLogger.cpp index e19b20e3a..4d8d8be62 100644 --- a/src/ZmqLogger.cpp +++ b/src/ZmqLogger.cpp @@ -29,6 +29,7 @@ */ #include "ZmqLogger.h" +#include "Exceptions.h" #if USE_RESVG == 1 #include "ResvgQt.h" diff --git a/src/effects/Bars.cpp b/src/effects/Bars.cpp index 8a519ba12..562ce8c37 100644 --- a/src/effects/Bars.cpp +++ b/src/effects/Bars.cpp @@ -29,6 +29,7 @@ */ #include "Bars.h" +#include "Exceptions.h" using namespace openshot; @@ -62,7 +63,7 @@ void Bars::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Bars::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Bars::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp index c7e36b7bc..b301f1e85 100644 --- a/src/effects/Blur.cpp +++ b/src/effects/Blur.cpp @@ -29,6 +29,7 @@ */ #include "Blur.h" +#include "Exceptions.h" using namespace openshot; @@ -63,7 +64,7 @@ void Blur::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Blur::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Blur::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp index d73de8993..dbb80f376 100644 --- a/src/effects/Brightness.cpp +++ b/src/effects/Brightness.cpp @@ -29,6 +29,7 @@ */ #include "Brightness.h" +#include "Exceptions.h" using namespace openshot; @@ -61,7 +62,7 @@ void Brightness::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Brightness::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Brightness::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Caption.cpp b/src/effects/Caption.cpp index 053c27de5..73c53cc24 100644 --- a/src/effects/Caption.cpp +++ b/src/effects/Caption.cpp @@ -29,6 +29,7 @@ */ #include "Caption.h" +#include "Exceptions.h" #include "../Clip.h" #include "../Timeline.h" diff --git a/src/effects/ChromaKey.cpp b/src/effects/ChromaKey.cpp index 0f4d626e5..721c6a0ec 100644 --- a/src/effects/ChromaKey.cpp +++ b/src/effects/ChromaKey.cpp @@ -29,6 +29,7 @@ */ #include "ChromaKey.h" +#include "Exceptions.h" using namespace openshot; @@ -66,7 +67,7 @@ void ChromaKey::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr ChromaKey::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr ChromaKey::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Determine the current HSL (Hue, Saturation, Lightness) for the Chrome int threshold = fuzz.GetInt(frame_number); diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp index 361f852d8..1140d0253 100644 --- a/src/effects/ColorShift.cpp +++ b/src/effects/ColorShift.cpp @@ -29,6 +29,7 @@ */ #include "ColorShift.h" +#include "Exceptions.h" using namespace openshot; @@ -62,7 +63,7 @@ void ColorShift::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Crop.cpp b/src/effects/Crop.cpp index a095245d9..6b3c6f8a6 100644 --- a/src/effects/Crop.cpp +++ b/src/effects/Crop.cpp @@ -29,6 +29,7 @@ */ #include "Crop.h" +#include "Exceptions.h" using namespace openshot; @@ -62,7 +63,7 @@ void Crop::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Crop::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Crop::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Deinterlace.cpp b/src/effects/Deinterlace.cpp index c119c2ca4..6d4dfa152 100644 --- a/src/effects/Deinterlace.cpp +++ b/src/effects/Deinterlace.cpp @@ -29,6 +29,7 @@ */ #include "Deinterlace.h" +#include "Exceptions.h" using namespace openshot; @@ -62,7 +63,7 @@ void Deinterlace::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Deinterlace::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Deinterlace::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get original size of frame's image int original_width = frame->GetImage()->width(); diff --git a/src/effects/Hue.cpp b/src/effects/Hue.cpp index 35ee37098..f2c50c62b 100644 --- a/src/effects/Hue.cpp +++ b/src/effects/Hue.cpp @@ -29,6 +29,7 @@ */ #include "Hue.h" +#include "Exceptions.h" using namespace openshot; @@ -61,7 +62,7 @@ void Hue::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Hue::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Hue::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp index 2a87a218c..75e38a6ad 100644 --- a/src/effects/Mask.cpp +++ b/src/effects/Mask.cpp @@ -29,6 +29,7 @@ */ #include "Mask.h" +#include "Exceptions.h" #include "FFmpegReader.h" #ifdef USE_IMAGEMAGICK #include "ImageReader.h" @@ -67,7 +68,7 @@ void Mask::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Mask::GetFrame(std::shared_ptr frame, int64_t frame_number) { +std::shared_ptr Mask::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the mask image (from the mask reader) std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Negate.cpp b/src/effects/Negate.cpp index 9cffd613b..c6772b31d 100644 --- a/src/effects/Negate.cpp +++ b/src/effects/Negate.cpp @@ -29,6 +29,7 @@ */ #include "Negate.h" +#include "Exceptions.h" using namespace openshot; @@ -48,7 +49,7 @@ Negate::Negate() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Negate::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Negate::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Make a negative of the images pixels frame->GetImage()->invertPixels(); diff --git a/src/effects/Pixelate.cpp b/src/effects/Pixelate.cpp index 15c416fbb..6d1962bbb 100644 --- a/src/effects/Pixelate.cpp +++ b/src/effects/Pixelate.cpp @@ -29,6 +29,7 @@ */ #include "Pixelate.h" +#include "Exceptions.h" #include "Json.h" #include diff --git a/src/effects/Saturation.cpp b/src/effects/Saturation.cpp index df2ddad3b..119c30651 100644 --- a/src/effects/Saturation.cpp +++ b/src/effects/Saturation.cpp @@ -29,6 +29,7 @@ */ #include "Saturation.h" +#include "Exceptions.h" using namespace openshot; @@ -62,7 +63,7 @@ void Saturation::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Saturation::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Saturation::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Shift.cpp b/src/effects/Shift.cpp index e591a1715..38b5be584 100644 --- a/src/effects/Shift.cpp +++ b/src/effects/Shift.cpp @@ -29,6 +29,7 @@ */ #include "Shift.h" +#include "Exceptions.h" using namespace openshot; @@ -61,7 +62,7 @@ void Shift::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Shift::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Shift::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp index 1e796d4c0..ff8a8230b 100644 --- a/src/effects/Wave.cpp +++ b/src/effects/Wave.cpp @@ -29,6 +29,7 @@ */ #include "Wave.h" +#include "Exceptions.h" using namespace openshot; @@ -63,7 +64,7 @@ void Wave::init_effect_details() // This method is required for all derived classes of EffectBase, and returns a // modified openshot::Frame object -std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t frame_number) +std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t frame_number) { // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); diff --git a/src/effects/Wave.h b/src/effects/Wave.h index 38f808227..ca10c21ed 100644 --- a/src/effects/Wave.h +++ b/src/effects/Wave.h @@ -83,7 +83,7 @@ namespace openshot /// /// @returns A new openshot::Frame object /// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline. - std::shared_ptr GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr (new Frame()), frame_number); } + std::shared_ptr GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr (new Frame()), frame_number); } /// @brief This method is required for all derived classes of ClipBase, and returns a /// modified openshot::Frame object diff --git a/tests/Color_Tests.cpp b/tests/Color_Tests.cpp index 6827ddf03..8b110f9e1 100644 --- a/tests/Color_Tests.cpp +++ b/tests/Color_Tests.cpp @@ -35,6 +35,7 @@ // Prevent name clashes with juce::UnitTest #define DONT_SET_USING_JUCE_NAMESPACE 1 #include "Color.h" +#include "Exceptions.h" #include "KeyFrame.h" #include "Json.h" diff --git a/tests/DummyReader_Tests.cpp b/tests/DummyReader_Tests.cpp index f2f1823d3..b8a86d02e 100644 --- a/tests/DummyReader_Tests.cpp +++ b/tests/DummyReader_Tests.cpp @@ -35,6 +35,7 @@ #define DONT_SET_USING_JUCE_NAMESPACE 1 #include "DummyReader.h" +#include "Exceptions.h" #include "CacheMemory.h" #include "Fraction.h" #include "Frame.h" diff --git a/tests/FFmpegReader_Tests.cpp b/tests/FFmpegReader_Tests.cpp index a72fd90e2..f5dc44350 100644 --- a/tests/FFmpegReader_Tests.cpp +++ b/tests/FFmpegReader_Tests.cpp @@ -35,6 +35,7 @@ // Prevent name clashes with juce::UnitTest #define DONT_SET_USING_JUCE_NAMESPACE 1 #include "FFmpegReader.h" +#include "Exceptions.h" #include "Frame.h" #include "Timeline.h" #include "Json.h" diff --git a/tests/FFmpegWriter_Tests.cpp b/tests/FFmpegWriter_Tests.cpp index 606b359d0..0160ac929 100644 --- a/tests/FFmpegWriter_Tests.cpp +++ b/tests/FFmpegWriter_Tests.cpp @@ -35,6 +35,7 @@ // Prevent name clashes with juce::UnitTest #define DONT_SET_USING_JUCE_NAMESPACE 1 #include "FFmpegWriter.h" +#include "Exceptions.h" #include "FFmpegReader.h" #include "Fraction.h" #include "Frame.h" diff --git a/tests/ImageWriter_Tests.cpp b/tests/ImageWriter_Tests.cpp index 36b1288a0..c4afaee00 100644 --- a/tests/ImageWriter_Tests.cpp +++ b/tests/ImageWriter_Tests.cpp @@ -37,6 +37,7 @@ #ifdef USE_IMAGEMAGICK #include "ImageWriter.h" +#include "Exceptions.h" #include "ImageReader.h" #include "FFmpegReader.h" #include "Frame.h" diff --git a/tests/KeyFrame_Tests.cpp b/tests/KeyFrame_Tests.cpp index 7baba8110..e3a1d06a5 100644 --- a/tests/KeyFrame_Tests.cpp +++ b/tests/KeyFrame_Tests.cpp @@ -32,6 +32,7 @@ // Prevent name clashes with juce::UnitTest #define DONT_SET_USING_JUCE_NAMESPACE 1 #include "KeyFrame.h" +#include "Exceptions.h" #include "Coordinate.h" #include "Fraction.h" #include "Point.h"