diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed8925ecc..c9fd64152 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ linux-builder: - ~/auto-update-docs "$CI_PROJECT_DIR/build" "$CI_COMMIT_REF_NAME" - PROJECT_VERSION=$(grep -E '^set\(PROJECT_VERSION_FULL "(.*)' ../CMakeLists.txt | awk '{print $2}' | tr -d '")') - PROJECT_SO=$(grep -E '^set\(PROJECT_SO_VERSION (.*)' ../CMakeLists.txt | awk '{print $2}' | tr -d ')') - - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID\nCI_PIPELINE_ID:$CI_PIPELINE_ID\nVERSION:$PROJECT_VERSION\nSO:$PROJECT_SO" > "install-x64/share/$CI_PROJECT_NAME" + - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID\nCI_PIPELINE_ID:$CI_PIPELINE_ID\nVERSION:$PROJECT_VERSION\nSO:$PROJECT_SO" > "install-x64/share/$CI_PROJECT_NAME.env" - git log $(git describe --tags --abbrev=0 @^)..@ --oneline --pretty=format:"- %C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log" when: always except: @@ -53,7 +53,7 @@ mac-builder: - make install - PROJECT_VERSION=$(grep -E '^set\(PROJECT_VERSION_FULL "(.*)' ../CMakeLists.txt | awk '{print $2}' | tr -d '")') - PROJECT_SO=$(grep -E '^set\(PROJECT_SO_VERSION (.*)' ../CMakeLists.txt | awk '{print $2}' | tr -d ')') - - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID\nCI_PIPELINE_ID:$CI_PIPELINE_ID\nVERSION:$PROJECT_VERSION\nSO:$PROJECT_SO" > "install-x64/share/$CI_PROJECT_NAME" + - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID\nCI_PIPELINE_ID:$CI_PIPELINE_ID\nVERSION:$PROJECT_VERSION\nSO:$PROJECT_SO" > "install-x64/share/$CI_PROJECT_NAME.env" - git log $(git describe --tags --abbrev=0 @^)..@ --oneline --pretty=format:"- %C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log" when: always except: @@ -79,7 +79,7 @@ windows-builder-x64: - cmake --install build - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value}) - $PROJECT_SO = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_SO_VERSION (.*)\)' | %{$_.Matches.Groups[1].value}) - - New-Item -path "build/install-x64/share/" -Name "$CI_PROJECT_NAME" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID`nCI_PIPELINE_ID:$CI_PIPELINE_ID`nVERSION:$PROJECT_VERSION`nSO:$PROJECT_SO" -ItemType file -force + - New-Item -path "build/install-x64/share/" -Name "$CI_PROJECT_NAME.env" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID`nCI_PIPELINE_ID:$CI_PIPELINE_ID`nVERSION:$PROJECT_VERSION`nSO:$PROJECT_SO" -ItemType file -force - $PREV_GIT_LABEL=(git describe --tags --abbrev=0 '@^') - git log "$PREV_GIT_LABEL..@" --oneline --pretty=format:"- %C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "build/install-x64/share/$CI_PROJECT_NAME.log" when: always @@ -106,7 +106,7 @@ windows-builder-x86: - cmake --install build - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value}) - $PROJECT_SO = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_SO_VERSION (.*)\)' | %{$_.Matches.Groups[1].value}) - - New-Item -path "build/install-x86/share/" -Name "$CI_PROJECT_NAME" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID`nCI_PIPELINE_ID:$CI_PIPELINE_ID`nVERSION:$PROJECT_VERSION`nSO:$PROJECT_SO" -ItemType file -force + - New-Item -path "build/install-x86/share/" -Name "$CI_PROJECT_NAME.env" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID`nCI_PIPELINE_ID:$CI_PIPELINE_ID`nVERSION:$PROJECT_VERSION`nSO:$PROJECT_SO" -ItemType file -force - $PREV_GIT_LABEL=(git describe --tags --abbrev=0 '@^') - git log "$PREV_GIT_LABEL..@" --oneline --pretty=format:"- %C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "build/install-x86/share/$CI_PROJECT_NAME.log" when: always diff --git a/iwyu.txt b/iwyu.txt deleted file mode 100644 index 15b7fda00..000000000 --- a/iwyu.txt +++ /dev/null @@ -1,4174 +0,0 @@ -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/CMakeLists.txt b/src/CMakeLists.txt index e0522e1ce..00870d3a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -186,7 +186,7 @@ target_link_libraries(openshot PUBLIC OpenShot::Audio) ### # Find the ImageMagick++ library -find_package(ImageMagick COMPONENTS Magick++ MagickWand MagickCore) +find_package(ImageMagick COMPONENTS Magick++ MagickCore) if(ImageMagick_FOUND) if(NOT TARGET ImageMagick::Magick++ AND NOT TARGET Magick++_TARGET) @@ -248,10 +248,12 @@ endif () if (NOT jsoncpp_FOUND AND NOT DISABLE_BUNDLED_JSONCPP) message(STATUS "Using embedded jsoncpp (not found or USE_SYSTEM_JSONCPP disabled)") if (NOT TARGET jsoncpp_lib) - add_library(jsoncpp_lib INTERFACE) - target_include_directories(jsoncpp_lib INTERFACE + add_library(jsoncpp_lib OBJECT) + set_target_properties(jsoncpp_lib PROPERTIES + POSITION_INDEPENDENT_CODE TRUE) + target_include_directories(jsoncpp_lib PUBLIC "${PROJECT_SOURCE_DIR}/thirdparty/jsoncpp") - target_sources(jsoncpp_lib INTERFACE "${PROJECT_SOURCE_DIR}/thirdparty/jsoncpp/jsoncpp.cpp") + target_sources(jsoncpp_lib PRIVATE "${PROJECT_SOURCE_DIR}/thirdparty/jsoncpp/jsoncpp.cpp") # Because this satisfies the requirement, an installed JsonCpp is optional set_package_properties(jsoncpp PROPERTIES TYPE OPTIONAL) endif () @@ -286,9 +288,14 @@ mark_as_advanced(QT_VERSION_STR) ################### FFMPEG ##################### # Find FFmpeg libraries (used for video encoding / decoding) -find_package(FFmpeg REQUIRED COMPONENTS avcodec avdevice avformat avutil swscale) +find_package(FFmpeg REQUIRED COMPONENTS avcodec avformat avutil swscale) -set(all_comps avcodec avdevice avformat avfilter avutil postproc swscale swresample avresample) +set(all_comps avcodec avformat avutil swscale) +if(TARGET FFmpeg::swresample) + list(APPEND all_comps swresample) +else() + list(APPEND all_comps avresample) +endif() set(version_comps avcodec avformat avutil) foreach(ff_comp IN LISTS all_comps) @@ -395,7 +402,14 @@ if(ENABLE_OPENCV) find_package(OpenCV 4) if(NOT OpenCV_FOUND) set(ENABLE_OPENCV FALSE CACHE BOOL - "Build with OpenCV algorithms (requires Boost, Protobuf 3)" FORCE) + "Build with OpenCV algorithms (requires Protobuf 3)" FORCE) + # If we have version 4.5.1, all hope is lost + elseif(OpenCV_VERSION VERSION_EQUAL "4.5.1") + message(WARNING [[Incompatible OpenCV version detected +OpenCV version 4.5.1 contains header errors which make it unable to be used with OpenShot. OpenCV support wil be disabled. Upgrade to OpenCV 4.5.2+ or downgrade to 4.5.0 or earlier, to enable OpenCV. +See https://github.com/opencv/opencv/issues/19260]]) + set(ENABLE_OPENCV FALSE CACHE BOOL + "Build with OpenCV algorithms (requires Protobuf 3)" FORCE) else() add_subdirectory(protobuf_messages) # Add OpenCV source files @@ -411,10 +425,20 @@ if(ENABLE_OPENCV) opencv_tracking openshot_protobuf ) - set(HAVE_OPENCV TRUE CACHE BOOL "Building with OpenCV effects" FORCE) - mark_as_advanced(HAVE_OPENCV) + set(HAVE_OPENCV TRUE CACHE BOOL "Building with OpenCV effects" FORCE) + mark_as_advanced(HAVE_OPENCV) + + # Keep track of OpenCV version, to embed in our version header + set(OPENCV_VERSION_STR "${OpenCV_VERSION}" CACHE STRING "OpenCV version linked with" FORCE) + mark_as_advanced(OPENCV_VERSION_STR) + + # We may need to use Tracker as opencv::legacy::Tracker + if(OpenCV_VERSION VERSION_GREATER "4.5.1") + target_compile_definitions(openshot PUBLIC USE_LEGACY_TRACKER=1) + endif() + endif() -endif() +endif() # ENABLE_OPENCV add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms") ############### LINK LIBRARY ################# diff --git a/src/CVObjectDetection.cpp b/src/CVObjectDetection.cpp index bab072770..398411d15 100644 --- a/src/CVObjectDetection.cpp +++ b/src/CVObjectDetection.cpp @@ -29,6 +29,10 @@ * along with OpenShot Library. If not, see . */ +#include +#include +#include + #include "CVObjectDetection.h" #include diff --git a/src/CVStabilization.cpp b/src/CVStabilization.cpp index fd50f0162..dd1c6b47c 100644 --- a/src/CVStabilization.cpp +++ b/src/CVStabilization.cpp @@ -29,6 +29,10 @@ * along with OpenShot Library. If not, see . */ +#include +#include +#include + #include "CVStabilization.h" #include @@ -277,6 +281,8 @@ std::map CVStabilization::GenNewCamPosition(std::map . */ -#include "CVTracker.h" +#include +#include +#include + #include -using namespace std; +#include "OpenCVUtilities.h" +#include "CVTracker.h" + using namespace openshot; using google::protobuf::util::TimeUtil; - // Constructor CVTracker::CVTracker(std::string processInfoJson, ProcessingController &processingController) : processingController(&processingController), json_interval(false){ @@ -46,25 +50,24 @@ CVTracker::CVTracker(std::string processInfoJson, ProcessingController &processi } // Set desirable tracker method -cv::Ptr CVTracker::selectTracker(std::string trackerType){ - cv::Ptr t; +cv::Ptr CVTracker::selectTracker(std::string trackerType){ if (trackerType == "BOOSTING") - t = cv::TrackerBoosting::create(); + return OPENCV_TRACKER_NS::TrackerBoosting::create(); if (trackerType == "MIL") - t = cv::TrackerMIL::create(); + return OPENCV_TRACKER_NS::TrackerMIL::create(); if (trackerType == "KCF") - t = cv::TrackerKCF::create(); + return OPENCV_TRACKER_NS::TrackerKCF::create(); if (trackerType == "TLD") - t = cv::TrackerTLD::create(); + return OPENCV_TRACKER_NS::TrackerTLD::create(); if (trackerType == "MEDIANFLOW") - t = cv::TrackerMedianFlow::create(); + return OPENCV_TRACKER_NS::TrackerMedianFlow::create(); if (trackerType == "MOSSE") - t = cv::TrackerMOSSE::create(); + return OPENCV_TRACKER_NS::TrackerMOSSE::create(); if (trackerType == "CSRT") - t = cv::TrackerCSRT::create(); + return OPENCV_TRACKER_NS::TrackerCSRT::create(); - return t; + return nullptr; } // Track object in the hole clip or in a given interval @@ -216,6 +219,8 @@ cv::Rect2d CVTracker::filter_box_jitter(size_t frameId){ } bool CVTracker::SaveTrackedData(){ + using std::ios; + // Create tracker message pb_tracker::Tracker trackerMessage; @@ -233,7 +238,7 @@ bool CVTracker::SaveTrackedData(){ // Write the new message to disk. std::fstream output(protobuf_data_path, ios::out | ios::trunc | ios::binary); if (!trackerMessage.SerializeToOstream(&output)) { - cerr << "Failed to write protobuf message." << endl; + std::cerr << "Failed to write protobuf message." << std::endl; return false; } } @@ -333,14 +338,16 @@ void CVTracker::SetJsonValue(const Json::Value root) { // Load protobuf data file bool CVTracker::_LoadTrackedData(){ + using std::ios; + // Create tracker message pb_tracker::Tracker trackerMessage; { // Read the existing tracker message. - fstream input(protobuf_data_path, ios::in | ios::binary); + std::fstream input(protobuf_data_path, ios::in | ios::binary); if (!trackerMessage.ParseFromIstream(&input)) { - cerr << "Failed to parse protobuf message." << endl; + std::cerr << "Failed to parse protobuf message." << std::endl; return false; } } @@ -372,4 +379,3 @@ bool CVTracker::_LoadTrackedData(){ return true; } - diff --git a/src/CVTracker.h b/src/CVTracker.h index 51df4e767..db7b728fa 100644 --- a/src/CVTracker.h +++ b/src/CVTracker.h @@ -32,19 +32,21 @@ #ifndef OPENSHOT_CVTRACKER_H #define OPENSHOT_CVTRACKER_H -#define int64 opencv_broken_int -#define uint64 opencv_broken_uint +#include "OpenCVUtilities.h" + +#define int64 int64_t +#define uint64 uint64_t #include #include #include #undef uint64 #undef int64 -#include #include "Clip.h" #include "KeyFrame.h" #include "Frame.h" #include "Json.h" + #include "ProcessingController.h" #include "protobuf_messages/trackerdata.pb.h" @@ -88,7 +90,7 @@ namespace openshot private: std::map trackedDataById; // Save tracked data std::string trackerType; // Name of the chosen tracker - cv::Ptr tracker; // Pointer of the selected tracker + cv::Ptr tracker; // Pointer of the selected tracker cv::Rect2d bbox; // Bounding box coords SortTracker sort; @@ -117,8 +119,8 @@ namespace openshot // Constructor CVTracker(std::string processInfoJson, ProcessingController &processingController); - /// Set desirable tracker method - cv::Ptr selectTracker(std::string trackerType); + // Set desirable tracker method + cv::Ptr selectTracker(std::string trackerType); /// Track object in the hole clip or in a given interval /// diff --git a/src/ClipProcessingJobs.cpp b/src/ClipProcessingJobs.cpp index 8e0b9d083..cc3007d6a 100644 --- a/src/ClipProcessingJobs.cpp +++ b/src/ClipProcessingJobs.cpp @@ -31,8 +31,10 @@ #include "ClipProcessingJobs.h" +namespace openshot { + // Constructor responsible to choose processing type and apply to clip -ClipProcessingJobs::ClipProcessingJobs(std::string processingType, std::string processInfoJson) : +ClipProcessingJobs::ClipProcessingJobs(std::string processingType, std::string processInfoJson) : processingType(processingType), processInfoJson(processInfoJson){ } @@ -51,7 +53,7 @@ void ClipProcessingJobs::processClip(Clip& clip, std::string json){ } } -// Apply object tracking to clip +// Apply object tracking to clip void ClipProcessingJobs::trackClip(Clip& clip, ProcessingController& controller){ // Create CVTracker object @@ -77,7 +79,7 @@ void ClipProcessingJobs::trackClip(Clip& clip, ProcessingController& controller) // Apply object detection to clip void ClipProcessingJobs::detectObjectsClip(Clip& clip, ProcessingController& controller){ // create CVObjectDetection object - CVObjectDetection objDetector(processInfoJson, controller); + CVObjectDetection objDetector(processInfoJson, controller); // Start object detection process objDetector.detectObjectsClip(clip); @@ -97,7 +99,7 @@ void ClipProcessingJobs::detectObjectsClip(Clip& clip, ProcessingController& con void ClipProcessingJobs::stabilizeClip(Clip& clip, ProcessingController& controller){ // create CVStabilization object - CVStabilization stabilizer(processInfoJson, controller); + CVStabilization stabilizer(processInfoJson, controller); // Start stabilization process stabilizer.stabilizeClip(clip); @@ -115,13 +117,13 @@ void ClipProcessingJobs::stabilizeClip(Clip& clip, ProcessingController& control } } -// Get processing progress while iterating on the clip +// Get processing progress while iterating on the clip int ClipProcessingJobs::GetProgress(){ return (int)processingController.GetProgress(); } -// Check if processing finished +// Check if processing finished bool ClipProcessingJobs::IsDone(){ if(processingController.GetFinished()){ @@ -143,4 +145,6 @@ bool ClipProcessingJobs::GetError(){ // get the error message std::string ClipProcessingJobs::GetErrorMessage(){ return processingController.GetErrorMessage(); -} \ No newline at end of file +} + +} // namespace openshot diff --git a/src/ClipProcessingJobs.h b/src/ClipProcessingJobs.h index ffa6b4a4d..66c55c3e9 100644 --- a/src/ClipProcessingJobs.h +++ b/src/ClipProcessingJobs.h @@ -36,7 +36,7 @@ #include #include #undef uint64 - #undef int64 + #undef int64 #include "CVStabilization.h" #include "CVTracker.h" @@ -47,7 +47,7 @@ #include "ProcessingController.h" #include "Clip.h" -using namespace openshot; +namespace openshot { // Constructor responsible to choose processing type and apply to clip class ClipProcessingJobs{ @@ -64,7 +64,7 @@ class ClipProcessingJobs{ /// Will handle a Thread safely comutication between ClipProcessingJobs and the processing effect classes ProcessingController processingController; - // Apply object tracking to clip + // Apply object tracking to clip void trackClip(Clip& clip, ProcessingController& controller); // Apply stabilization to clip void stabilizeClip(Clip& clip, ProcessingController& controller); @@ -75,7 +75,7 @@ class ClipProcessingJobs{ public: // Constructor ClipProcessingJobs(std::string processingType, std::string processInfoJson); - // Process clip accordingly to processingType + // Process clip accordingly to processingType void processClip(Clip& clip, std::string json); // Thread related variables and methods @@ -84,6 +84,6 @@ class ClipProcessingJobs{ void CancelProcessing(); bool GetError(); std::string GetErrorMessage(); +}; - -}; \ No newline at end of file +} // namespace openshot diff --git a/src/OpenCVUtilities.h b/src/OpenCVUtilities.h new file mode 100644 index 000000000..1c5793ec5 --- /dev/null +++ b/src/OpenCVUtilities.h @@ -0,0 +1,50 @@ +/** + * @file + * @brief Header file for OpenCVUtilities (set some common macros) + * @author FeRD (Frank Dana) + * @author Jonathan Thomas + * + * @ref License + */ + +/* LICENSE + * + * 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 + * world. For more information visit . + * + * OpenShot Library (libopenshot) is free software: you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * OpenShot Library (libopenshot) is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with OpenShot Library. If not, see . + */ + +#ifndef OPENSHOT_OPENCV_UTILITIES_H +#define OPENSHOT_OPENCV_UTILITIES_H + +#define int64 int64_t +#define uint64 uint64_t +#if USE_LEGACY_TRACKER + #include + #include + #define OPENCV_TRACKER_TYPE cv::legacy::Tracker + #define OPENCV_TRACKER_NS cv::legacy +#else + #include + #define OPENCV_TRACKER_TYPE cv::Tracker + #define OPENCV_TRACKER_NS cv +#endif +#undef int64 +#undef uint64 + +#endif // OPENSHOT_OPENCV_UTILITIES_H diff --git a/src/OpenShotVersion.h.in b/src/OpenShotVersion.h.in index e0829c00c..197242d39 100644 --- a/src/OpenShotVersion.h.in +++ b/src/OpenShotVersion.h.in @@ -47,6 +47,7 @@ #cmakedefine AVCODEC_VERSION_STR "@AVCODEC_VERSION_STR@" #cmakedefine AVFORMAT_VERSION_STR "@AVFORMAT_VERSION_STR@" #cmakedefine AVUTIL_VERSION_STR "@AVUTIL_VERSION_STR@" +#cmakedefine OPENCV_VERSION_STR "@OPENCV_VERSION_STR@" #cmakedefine01 HAVE_IMAGEMAGICK #cmakedefine01 HAVE_RESVG #cmakedefine01 HAVE_OPENCV diff --git a/src/effects/ObjectDetection.cpp b/src/effects/ObjectDetection.cpp index 9204a9510..12360eb02 100644 --- a/src/effects/ObjectDetection.cpp +++ b/src/effects/ObjectDetection.cpp @@ -29,6 +29,9 @@ * along with OpenShot Library. If not, see . */ +#include +#include + #include "effects/ObjectDetection.h" #include "effects/Tracker.h" #include "Exceptions.h" @@ -295,11 +298,10 @@ bool ObjectDetection::LoadObjDetectdData(std::string inputFilePath){ // Create tracker message pb_objdetect::ObjDetect objMessage; - // Read the existing tracker message. - fstream input(inputFilePath, ios::in | ios::binary); + std::fstream input(inputFilePath, std::ios::in | std::ios::binary); if (!objMessage.ParseFromIstream(&input)) { - cerr << "Failed to parse protobuf message." << endl; + std::cerr << "Failed to parse protobuf message." << std::endl; return false; } diff --git a/src/effects/Stabilizer.cpp b/src/effects/Stabilizer.cpp index 6d1666ab4..576ab8834 100644 --- a/src/effects/Stabilizer.cpp +++ b/src/effects/Stabilizer.cpp @@ -29,6 +29,10 @@ * along with OpenShot Library. If not, see . */ +#include +#include +#include + #include "effects/Stabilizer.h" #include "Exceptions.h" #include @@ -116,14 +120,14 @@ std::shared_ptr Stabilizer::GetFrame(std::shared_ptr frame, int64_ // Load protobuf data file bool Stabilizer::LoadStabilizedData(std::string inputFilePath){ - + using std::ios; // Create stabilization message pb_stabilize::Stabilization stabilizationMessage; // Read the existing tracker message. - fstream input(inputFilePath, ios::in | ios::binary); + std::fstream input(inputFilePath, ios::in | ios::binary); if (!stabilizationMessage.ParseFromIstream(&input)) { - cerr << "Failed to parse protobuf message." << endl; + std::cerr << "Failed to parse protobuf message." << std::endl; return false; } diff --git a/src/effects/Tracker.cpp b/src/effects/Tracker.cpp index d04d7e30d..1e67ef524 100644 --- a/src/effects/Tracker.cpp +++ b/src/effects/Tracker.cpp @@ -29,11 +29,17 @@ * along with OpenShot Library. If not, see . */ +#include +#include +#include +#include + #include "effects/Tracker.h" #include "Exceptions.h" -#include #include "Timeline.h" +#include + #include #include #include @@ -178,7 +184,6 @@ std::shared_ptr Tracker::GetFrame(std::shared_ptr frame, int64_t f return frame; } - void Tracker::DrawRectangleRGBA(cv::Mat &frame_image, cv::RotatedRect box, std::vector color, float alpha, int thickness, bool is_background){ // Get the bouding box vertices cv::Point2f vertices2f[4]; @@ -305,11 +310,11 @@ void Tracker::SetJsonValue(const Json::Value root) { if (!root["BaseFPS"].isNull() && root["BaseFPS"].isObject()) { - if (!root["BaseFPS"]["num"].isNull()) + if (!root["BaseFPS"]["num"].isNull()) { BaseFPS.num = (int) root["BaseFPS"]["num"].asInt(); } - if (!root["BaseFPS"]["den"].isNull()) + if (!root["BaseFPS"]["den"].isNull()) { BaseFPS.den = (int) root["BaseFPS"]["den"].asInt(); } @@ -324,7 +329,7 @@ void Tracker::SetJsonValue(const Json::Value root) { protobuf_data_path = root["protobuf_data_path"].asString(); if(!trackedData->LoadBoxData(protobuf_data_path)) { - std::cout<<"Invalid protobuf data path"; + std::clog << "Invalid protobuf data path " << protobuf_data_path << '\n'; protobuf_data_path = ""; } } diff --git a/src/effects/Tracker.h b/src/effects/Tracker.h index f7db6e2ec..645e1d52e 100644 --- a/src/effects/Tracker.h +++ b/src/effects/Tracker.h @@ -32,15 +32,15 @@ #ifndef OPENSHOT_TRACKER_EFFECT_H #define OPENSHOT_TRACKER_EFFECT_H +#include +#include +#include + #include "../EffectBase.h" -#include -#include -#include -#include -#include "../Color.h" #include "../Json.h" #include "../KeyFrame.h" + #include "protobuf_messages/trackerdata.pb.h" #include "../TrackedObjectBBox.h" #include "../Clip.h" diff --git a/tests/Point.cpp b/tests/Point.cpp index 875d27a8e..6d53f65bf 100644 --- a/tests/Point.cpp +++ b/tests/Point.cpp @@ -37,6 +37,7 @@ #include "Coordinate.h" #include "Json.h" + TEST_CASE( "default constructor", "[libopenshot][point]" ) { openshot::Point p;