From 600a481faff73086e5275ccbbc3d37e8f2ffc1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rcio=20Martins?= Date: Mon, 6 May 2019 01:48:26 -0300 Subject: [PATCH 1/7] Update the CMake script for the new code changes --- CMakeLists.txt | 214 +++++++++++++++++++++++++++++++------------------ 1 file changed, 134 insertions(+), 80 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc9568e82..738f024e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,15 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") if(UNIX AND NOT APPLE AND NOT DEFINED OpenGL_GL_PREFERENCE) set(OpenGL_GL_PREFERENCE LEGACY) endif() + +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder") +endif() + find_package(OpenGL REQUIRED) +find_package(OpenColorIO REQUIRED) + find_package(Qt5 5.7 REQUIRED COMPONENTS Core @@ -42,18 +49,6 @@ find_package(FFMPEG 3.4 REQUIRED swresample ) -find_package(frei0r) -if(NOT FREI0R_FOUND) - list(APPEND OLIVE_DEFINITIONS -DNOFREI0R) -endif() - -if(WIN32) - find_package(OpenColorIO) - if(OPENCOLORIO_FOUND) - list(APPEND OLIVE_DEFINITIONS -DOLIVE_OCIO) - endif() -endif() - if(EXISTS "${CMAKE_SOURCE_DIR}/.git") find_package(Git) if(GIT_FOUND) @@ -82,6 +77,10 @@ endif() find_package(Doxygen) set(OLIVE_SOURCES + decoders/decoder.cpp + decoders/decoder.h + decoders/ffmpegdecoder.cpp + decoders/ffmpegdecoder.h dialogs/aboutdialog.cpp dialogs/aboutdialog.h dialogs/actionsearch.cpp @@ -114,6 +113,15 @@ set(OLIVE_SOURCES dialogs/speeddialog.h dialogs/texteditdialog.cpp dialogs/texteditdialog.h + effects/effectfield.cpp + effects/effectfield.h + effects/effectfields.h + effects/effectgizmo.cpp + effects/effectgizmo.h + effects/effectloaders.cpp + effects/effectloaders.h + effects/effectrow.cpp + effects/effectrow.h effects/fields/boolfield.cpp effects/fields/boolfield.h effects/fields/buttonfield.cpp @@ -134,33 +142,23 @@ set(OLIVE_SOURCES effects/fields/stringfield.h effects/internal/audionoiseeffect.cpp effects/internal/audionoiseeffect.h - effects/internal/blending.frag - effects/internal/common.vert - effects/internal/cornerpin.frag - effects/internal/cornerpin.vert effects/internal/cornerpineffect.cpp effects/internal/cornerpineffect.h effects/internal/crossdissolvetransition.cpp effects/internal/crossdissolvetransition.h effects/internal/cubetransition.h - effects/internal/dropshadow.frag effects/internal/dropshadoweffect.cpp effects/internal/dropshadoweffect.h effects/internal/exponentialfadetransition.cpp effects/internal/exponentialfadetransition.h effects/internal/fillleftrighteffect.cpp effects/internal/fillleftrighteffect.h - effects/internal/frei0reffect.cpp - effects/internal/frei0reffect.h - effects/internal/internalshaders.qrc effects/internal/linearfadetransition.cpp effects/internal/linearfadetransition.h effects/internal/logarithmicfadetransition.cpp effects/internal/logarithmicfadetransition.h - effects/internal/ocio.frag effects/internal/paneffect.cpp effects/internal/paneffect.h - effects/internal/premultiply.frag effects/internal/richtexteffect.cpp effects/internal/richtexteffect.h effects/internal/shakeeffect.cpp @@ -181,21 +179,12 @@ set(OLIVE_SOURCES effects/internal/volumeeffect.h effects/internal/vsthost.cpp effects/internal/vsthost.h - effects/effect.cpp - effects/effect.h - effects/effectfield.cpp - effects/effectfield.h - effects/effectfields.h - effects/effectgizmo.cpp - effects/effectgizmo.h - effects/effectloaders.cpp - effects/effectloaders.h - effects/effectrow.cpp - effects/effectrow.h effects/keyframe.cpp effects/keyframe.h effects/transition.cpp effects/transition.h + global/clipboard.cpp + global/clipboard.h global/config.cpp global/config.h global/debug.cpp @@ -206,11 +195,50 @@ set(OLIVE_SOURCES global/math.h global/path.cpp global/path.h - include/vestige.h + global/timing.cpp + global/timing.h + nodes/inputs/boolinput.cpp + nodes/inputs/boolinput.h + nodes/inputs/colorinput.cpp + nodes/inputs/colorinput.h + nodes/inputs/comboinput.cpp + nodes/inputs/comboinput.h + nodes/inputs/fileinput.cpp + nodes/inputs/fileinput.h + nodes/inputs/fontinput.cpp + nodes/inputs/fontinput.h + nodes/inputs.h + nodes/inputs/stringinput.cpp + nodes/inputs/stringinput.h + nodes/inputs/vecinput.cpp + nodes/inputs/vecinput.h + nodes/node.cpp + nodes/nodedatatypes.cpp + nodes/nodedatatypes.h + nodes/nodeedge.cpp + nodes/nodeedge.h + nodes/nodegraph.cpp + nodes/nodegraph.h + nodes/node.h + nodes/nodes.h + nodes/nodes/nodeimageoutput.cpp + nodes/nodes/nodeimageoutput.h + nodes/nodes/nodemedia.cpp + nodes/nodes/nodemedia.h + nodes/nodes/nodeshader.cpp + nodes/nodes/nodeshader.h + nodes/widgets/buttonwidget.cpp + nodes/widgets/buttonwidget.h + nodes/widgets/labelwidget.cpp + nodes/widgets/labelwidget.h panels/effectcontrols.cpp panels/effectcontrols.h + panels/effectspanel.cpp + panels/effectspanel.h panels/grapheditor.cpp panels/grapheditor.h + panels/nodeeditor.cpp + panels/nodeeditor.h panels/panels.cpp panels/panels.h panels/project.cpp @@ -219,8 +247,6 @@ set(OLIVE_SOURCES panels/timeline.h panels/viewer.cpp panels/viewer.h - project/clipboard.cpp - project/clipboard.h project/footage.cpp project/footage.h project/loadthread.cpp @@ -232,10 +258,14 @@ set(OLIVE_SOURCES project/projectelements.h project/projectfilter.cpp project/projectfilter.h + project/projectfunctions.cpp + project/projectfunctions.h project/projectmodel.cpp project/projectmodel.h project/proxygenerator.cpp project/proxygenerator.h + project/savethread.cpp + project/savethread.h project/sourcescommon.cpp project/sourcescommon.h rendering/audio.cpp @@ -248,19 +278,38 @@ set(OLIVE_SOURCES rendering/exportthread.h rendering/framebufferobject.cpp rendering/framebufferobject.h + rendering/pixelformats.cpp + rendering/pixelformats.h + rendering/qopenglshaderprogramptr.h rendering/renderfunctions.cpp rendering/renderfunctions.h rendering/renderthread.cpp rendering/renderthread.h + rendering/shadergenerators.cpp + rendering/shadergenerators.h timeline/clip.cpp timeline/clip.h + timeline/ghost.cpp + timeline/ghost.h timeline/marker.cpp timeline/marker.h timeline/mediaimportdata.cpp timeline/mediaimportdata.h + timeline/selection.cpp timeline/selection.h timeline/sequence.cpp timeline/sequence.h + timeline/timelinefunctions.cpp + timeline/timelinefunctions.h + timeline/timelineshared.cpp + timeline/timelineshared.h + timeline/timelinetools.cpp + timeline/timelinetools.h + timeline/track.cpp + timeline/track.h + timeline/tracklist.cpp + timeline/tracklist.h + timeline/tracktypes.h ui/audiomonitor.cpp ui/audiomonitor.h ui/blur.cpp @@ -269,10 +318,10 @@ set(OLIVE_SOURCES ui/clickablelabel.h ui/collapsiblewidget.cpp ui/collapsiblewidget.h - ui/columnedgridlayout.cpp - ui/columnedgridlayout.h ui/colorbutton.cpp ui/colorbutton.h + ui/columnedgridlayout.cpp + ui/columnedgridlayout.h ui/comboboxex.cpp ui/comboboxex.h ui/cursors.cpp @@ -285,8 +334,6 @@ set(OLIVE_SOURCES ui/flowlayout.h ui/focusfilter.cpp ui/focusfilter.h - ui/fontcombobox.cpp - ui/fontcombobox.h ui/graphview.cpp ui/graphview.h ui/icons.cpp @@ -307,16 +354,18 @@ set(OLIVE_SOURCES ui/menu.h ui/menuhelper.cpp ui/menuhelper.h + ui/nodeedgeui.cpp + ui/nodeedgeui.h + ui/nodeui.cpp + ui/nodeui.h + ui/nodeview.cpp + ui/nodeview.h ui/panel.cpp ui/panel.h - ui/playbutton.cpp - ui/playbutton.h ui/rectangleselect.cpp ui/rectangleselect.h ui/resizablescrollbar.cpp ui/resizablescrollbar.h - ui/scrollarea.cpp - ui/scrollarea.h ui/sourceiconview.cpp ui/sourceiconview.h ui/sourcetable.cpp @@ -325,11 +374,14 @@ set(OLIVE_SOURCES ui/styling.h ui/texteditex.cpp ui/texteditex.h + ui/timelinearea.cpp + ui/timelinearea.h ui/timelineheader.cpp ui/timelineheader.h - ui/timelinetools.h - ui/timelinewidget.cpp - ui/timelinewidget.h + ui/timelinelabel.cpp + ui/timelinelabel.h + ui/timelineview.cpp + ui/timelineview.h ui/updatenotification.cpp ui/updatenotification.h ui/viewercontainer.cpp @@ -338,6 +390,8 @@ set(OLIVE_SOURCES ui/viewerwidget.h ui/viewerwindow.cpp ui/viewerwindow.h + ui/waveform.cpp + ui/waveform.h undo/comboaction.cpp undo/comboaction.h undo/undo.cpp @@ -354,49 +408,56 @@ set(OLIVE_RESOURCES ) set(OLIVE_EFFECTS + effects/internal/cornerpin.frag + effects/internal/dropshadow.frag + effects/internal/ocio.frag + effects/internal/premultiply.frag effects/shaders/boxblur.frag effects/shaders/boxblur.xml effects/shaders/bulge.frag effects/shaders/bulge.xml - effects/shaders/chromakey.frag - effects/shaders/chromakey.xml effects/shaders/chromaticaberration.frag effects/shaders/chromaticaberration.xml - effects/shaders/colorcorrection.frag - effects/shaders/colorcorrection.xml - effects/shaders/colorsel.frag - effects/shaders/colorsel.xml - effects/shaders/common.frag - effects/shaders/common.vert effects/shaders/crop.frag effects/shaders/crop.xml - effects/shaders/crossstitch.frag - effects/shaders/crossstitch.xml + effects/shaders/despill.frag + effects/shaders/despill.xml effects/shaders/directionalblur.frag effects/shaders/directionalblur.xml - effects/shaders/dropshadow.xml.disabled - effects/shaders/emboss.frag - effects/shaders/emboss.xml - effects/shaders/findedges.frag - effects/shaders/findedges.xml.disabled - effects/shaders/fisheye.frag - effects/shaders/fisheye.xml effects/shaders/flip.frag effects/shaders/flip.xml effects/shaders/gaussianblur.frag effects/shaders/gaussianblur.xml - effects/shaders/huesatbri.frag - effects/shaders/huesatbri.xml - effects/shaders/invert.frag - effects/shaders/invert.xml - effects/shaders/lumakey.frag - effects/shaders/lumakey.xml + effects/shaders/need\ checking/chromakey.frag + effects/shaders/need\ checking/chromakey.xml + effects/shaders/need\ checking/colorcorrection.frag + effects/shaders/need\ checking/colorcorrection.xml + effects/shaders/need\ checking/colorsel.frag + effects/shaders/need\ checking/colorsel.xml + effects/shaders/need\ checking/common.frag + effects/shaders/need\ checking/crossstitch.frag + effects/shaders/need\ checking/crossstitch.xml + effects/shaders/need\ checking/emboss.frag + effects/shaders/need\ checking/emboss.xml + effects/shaders/need\ checking/findedges.frag + effects/shaders/need\ checking/fisheye.frag + effects/shaders/need\ checking/fisheye.xml + effects/shaders/need\ checking/huesatbri.frag + effects/shaders/need\ checking/huesatbri.xml + effects/shaders/need\ checking/invert.frag + effects/shaders/need\ checking/invert.xml + effects/shaders/need\ checking/lumakey.frag + effects/shaders/need\ checking/lumakey.xml + effects/shaders/need\ checking/posterize.frag + effects/shaders/need\ checking/posterize.xml + effects/shaders/need\ checking/toonify.frag + effects/shaders/need\ checking/toonify.xml + effects/shaders/need\ checking/volumetriclight.frag + effects/shaders/need\ checking/volumetriclight.xml effects/shaders/noise.frag effects/shaders/noise.xml effects/shaders/pixelate.frag effects/shaders/pixelate.xml - effects/shaders/posterize.frag - effects/shaders/posterize.xml effects/shaders/radialblur.frag effects/shaders/radialblur.xml effects/shaders/ripple.frag @@ -407,12 +468,8 @@ set(OLIVE_EFFECTS effects/shaders/swirl.xml effects/shaders/tile.frag effects/shaders/tile.xml - effects/shaders/toonify.frag - effects/shaders/toonify.xml effects/shaders/vignette.frag effects/shaders/vignette.xml - effects/shaders/volumetriclight.frag - effects/shaders/volumetriclight.xml effects/shaders/wave.frag effects/shaders/wave.xml ) @@ -461,12 +518,9 @@ target_link_libraries(${OLIVE_TARGET} FFMPEG::avfilter FFMPEG::swscale FFMPEG::swresample + OpenColorIO ) -if(WIN32 AND OPENCOLORIO_FOUND) - target_link_libraries(${OLIVE_TARGET} PRIVATE OpenColorIO) -endif() - if(DOXYGEN_FOUND AND BUILD_DOXYGEN) set(DOXYGEN_PROJECT_NAME "Olive") set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/docs") From 4f54fb1e465925c26599d3d3ad9b79bf2b0a474d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rcio=20Martins?= Date: Tue, 7 May 2019 03:24:07 -0300 Subject: [PATCH 2/7] Remove file cmake/Findfrei0r.cmake --- cmake/Findfrei0r.cmake | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 cmake/Findfrei0r.cmake diff --git a/cmake/Findfrei0r.cmake b/cmake/Findfrei0r.cmake deleted file mode 100644 index eb346ad8d..000000000 --- a/cmake/Findfrei0r.cmake +++ /dev/null @@ -1,42 +0,0 @@ - -# CMake module to search for frei0r -# Author: Rohit Yadav -# -# If it's found it sets FREI0R_FOUND to TRUE -# and following variables are set: -# FREI0R_INCLUDE_DIR - -# Put here path to custom location -# example: /home/username/frei0r/include etc.. -find_path(FREI0R_INCLUDE_DIR NAMES frei0r.h - PATHS - "$ENV{LIB_DIR}/include" - "/usr/include" - "/usr/include/frei0r" - "/usr/local/include" - "/usr/local/include/frei0r" - # Mac OS - "${CMAKE_CURRENT_SOURCE_DIR}/contribs/include" - # MingW - c:/msys/local/include -) - -find_path(FREI0R_INCLUDE_DIR PATHS "${CMAKE_INCLUDE_PATH}" NAMES frei0r.h) - -# TODO: If required, add code to link to some library - -if(FREI0R_INCLUDE_DIR) - set(FREI0R_FOUND TRUE) -endif() - -if(FREI0R_FOUND) - if(NOT FREI0R_FIND_QUIETLY) - message(STATUS "Found frei0r include-dir path: ${FREI0R_INCLUDE_DIR}") - endif() -else() - if(FREI0R_FIND_REQUIRED) - message(FATAL_ERROR "Could not find frei0r") - elseif(NOT FREI0R_FIND_QUIETLY) - message(STATUS "Could not find frei0r") - endif() -endif() From 7d0a666523f0ca155cf82aac9c1ce6c41680cef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rcio=20Martins?= Date: Wed, 8 May 2019 01:12:47 -0300 Subject: [PATCH 3/7] CMake: Including the command "target_compile_options" in the project file. --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 738f024e6..880df016d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,10 +20,6 @@ if(UNIX AND NOT APPLE AND NOT DEFINED OpenGL_GL_PREFERENCE) set(OpenGL_GL_PREFERENCE LEGACY) endif() -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder") -endif() - find_package(OpenGL REQUIRED) find_package(OpenColorIO REQUIRED) @@ -501,6 +497,8 @@ add_executable(${OLIVE_TARGET} target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS}) +target_compile_options(${OLIVE_TARGET} PRIVATE $<$:-Wno-reorder>) + set(CMAKE_INCLUDE_CURRENT_DIR ON) target_link_libraries(${OLIVE_TARGET} From 57e32ecc361561f17b6735f617abd575a5e7d7ad Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 9 May 2019 02:08:05 +1000 Subject: [PATCH 4/7] updated cmakelists --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 880df016d..1e1e62309 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ find_package(OpenGL REQUIRED) find_package(OpenColorIO REQUIRED) -find_package(Qt5 5.7 REQUIRED +find_package(Qt5 5.6 REQUIRED COMPONENTS Core Gui @@ -116,8 +116,6 @@ set(OLIVE_SOURCES effects/effectgizmo.h effects/effectloaders.cpp effects/effectloaders.h - effects/effectrow.cpp - effects/effectrow.h effects/fields/boolfield.cpp effects/fields/boolfield.h effects/fields/buttonfield.cpp @@ -215,8 +213,12 @@ set(OLIVE_SOURCES nodes/nodeedge.h nodes/nodegraph.cpp nodes/nodegraph.h + nodes/nodeio.cpp + nodes/nodeio.h nodes/node.h nodes/nodes.h + nodes/oldeffectnode.h + nodes/oldeffectnode.cpp nodes/nodes/nodeimageoutput.cpp nodes/nodes/nodeimageoutput.h nodes/nodes/nodemedia.cpp @@ -303,8 +305,6 @@ set(OLIVE_SOURCES timeline/timelinetools.h timeline/track.cpp timeline/track.h - timeline/tracklist.cpp - timeline/tracklist.h timeline/tracktypes.h ui/audiomonitor.cpp ui/audiomonitor.h From 75f3d7f6cb0417aa213a3fc2cf0cffcff8122ba5 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 9 May 2019 02:12:37 +1000 Subject: [PATCH 5/7] removed qmake system --- olive.pro | 470 ------------------------------------------------------ 1 file changed, 470 deletions(-) delete mode 100644 olive.pro diff --git a/olive.pro b/olive.pro deleted file mode 100644 index fe87cd8f7..000000000 --- a/olive.pro +++ /dev/null @@ -1,470 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2018-05-11T10:31:59 -# -#------------------------------------------------- - -QT += core gui multimedia opengl svg - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -mac { - TARGET = Olive -} -!mac { - TARGET = olive-editor -} -TEMPLATE = app - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which has been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -# Tries to get the current Git short hash -system("which git") { - GITPATH = $$PWD - - win32 { - GITPATH = $$system(cygpath $$PWD) - } - - GITHASHVAR = $$system(git --git-dir=\"$$GITPATH/.git\" --work-tree=\"$$GITPATH\" log -1 --format=%h) - - # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo) - # (see https://answers.launchpad.net/launchpad/+question/678556) - isEmpty(GITHASHVAR) { - GITHASHVAR = $$system(sh $$PWD/debian/gitfromlog.sh $$PWD/debian/changelog) - } - - DEFINES += GITHASH=\\"\"$$GITHASHVAR\\"\" -} - -CONFIG += c++11 - -gcc:QMAKE_CXXFLAGS += -Wno-reorder - -SOURCES += \ - main.cpp \ - nodes/node.cpp \ - nodes/nodeio.cpp \ - nodes/nodes/nodeclip.cpp \ - nodes/oldeffectnode.cpp \ - ui/mainwindow.cpp \ - panels/project.cpp \ - panels/effectcontrols.cpp \ - panels/viewer.cpp \ - panels/timeline.cpp \ - ui/sourcetable.cpp \ - dialogs/aboutdialog.cpp \ - project/media.cpp \ - project/footage.cpp \ - timeline/sequence.cpp \ - timeline/clip.cpp \ - global/config.cpp \ - dialogs/newsequencedialog.cpp \ - ui/viewerwidget.cpp \ - ui/viewercontainer.cpp \ - dialogs/exportdialog.cpp \ - ui/collapsiblewidget.cpp \ - panels/panels.cpp \ - rendering/exportthread.cpp \ - ui/timelineheader.cpp \ - project/previewgenerator.cpp \ - ui/labelslider.cpp \ - dialogs/preferencesdialog.cpp \ - ui/audiomonitor.cpp \ - undo/undo.cpp \ - ui/comboboxex.cpp \ - ui/colorbutton.cpp \ - dialogs/replaceclipmediadialog.cpp \ - ui/keyframeview.cpp \ - ui/texteditex.cpp \ - dialogs/demonotice.cpp \ - timeline/marker.cpp \ - dialogs/speeddialog.cpp \ - dialogs/mediapropertiesdialog.cpp \ - project/projectmodel.cpp \ - project/loadthread.cpp \ - dialogs/loaddialog.cpp \ - global/debug.cpp \ - global/path.cpp \ - effects/internal/linearfadetransition.cpp \ - effects/internal/transformeffect.cpp \ - effects/internal/solideffect.cpp \ - effects/internal/texteffect.cpp \ - effects/internal/timecodeeffect.cpp \ - effects/internal/audionoiseeffect.cpp \ - effects/internal/paneffect.cpp \ - effects/internal/toneeffect.cpp \ - effects/internal/volumeeffect.cpp \ - effects/internal/crossdissolvetransition.cpp \ - effects/internal/shakeeffect.cpp \ - effects/internal/exponentialfadetransition.cpp \ - effects/internal/logarithmicfadetransition.cpp \ - effects/internal/cornerpineffect.cpp \ - global/math.cpp \ - effects/effectgizmo.cpp \ - ui/resizablescrollbar.cpp \ - ui/sourceiconview.cpp \ - project/sourcescommon.cpp \ - ui/keyframenavigator.cpp \ - panels/grapheditor.cpp \ - ui/graphview.cpp \ - ui/keyframedrawing.cpp \ - ui/clickablelabel.cpp \ - effects/keyframe.cpp \ - ui/rectangleselect.cpp \ - dialogs/actionsearch.cpp \ - ui/embeddedfilechooser.cpp \ - effects/internal/fillleftrighteffect.cpp \ - effects/internal/voideffect.cpp \ - dialogs/texteditdialog.cpp \ - dialogs/debugdialog.cpp \ - ui/viewerwindow.cpp \ - project/projectfilter.cpp \ - effects/effectloaders.cpp \ - effects/internal/vsthost.cpp \ - ui/flowlayout.cpp \ - dialogs/proxydialog.cpp \ - project/proxygenerator.cpp \ - dialogs/advancedvideodialog.cpp \ - ui/cursors.cpp \ - ui/menuhelper.cpp \ - global/global.cpp \ - ui/focusfilter.cpp \ - undo/comboaction.cpp \ - ui/mediaiconservice.cpp \ - ui/panel.cpp \ - effects/internal/dropshadoweffect.cpp \ - rendering/renderfunctions.cpp \ - rendering/renderthread.cpp \ - rendering/cacher.cpp \ - rendering/clipqueue.cpp \ - rendering/audio.cpp \ - dialogs/clippropertiesdialog.cpp \ - rendering/framebufferobject.cpp \ - ui/updatenotification.cpp \ - ui/icons.cpp \ - effects/fields/doublefield.cpp \ - effects/fields/fontfield.cpp \ - effects/effectfield.cpp \ - effects/fields/colorfield.cpp \ - effects/fields/stringfield.cpp \ - effects/fields/boolfield.cpp \ - effects/fields/combofield.cpp \ - effects/fields/filefield.cpp \ - effects/fields/labelfield.cpp \ - effects/fields/buttonfield.cpp \ - ui/effectui.cpp \ - effects/transition.cpp \ - ui/styling.cpp \ - undo/undostack.cpp \ - effects/internal/richtexteffect.cpp \ - ui/blur.cpp \ - ui/menu.cpp \ - timeline/mediaimportdata.cpp \ - dialogs/autocutsilencedialog.cpp \ - ui/columnedgridlayout.cpp \ - rendering/shadergenerators.cpp \ - global/timing.cpp \ - rendering/pixelformats.cpp \ - timeline/timelinefunctions.cpp \ - timeline/track.cpp \ - project/savethread.cpp \ - project/projectfunctions.cpp \ - ui/timelinearea.cpp \ - timeline/timelineshared.cpp \ - ui/timelineview.cpp \ - ui/timelinelabel.cpp \ - timeline/selection.cpp \ - global/clipboard.cpp \ - timeline/timelinetools.cpp \ - timeline/ghost.cpp \ - ui/waveform.cpp \ - panels/nodeeditor.cpp \ - ui/nodeview.cpp \ - ui/nodeui.cpp \ - panels/effectspanel.cpp \ - nodes/nodedatatypes.cpp \ - nodes/inputs/boolinput.cpp \ - nodes/inputs/comboinput.cpp \ - nodes/inputs/colorinput.cpp \ - nodes/inputs/stringinput.cpp \ - nodes/inputs/fontinput.cpp \ - nodes/inputs/vecinput.cpp \ - nodes/widgets/labelwidget.cpp \ - nodes/inputs/fileinput.cpp \ - nodes/widgets/buttonwidget.cpp \ - nodes/nodegraph.cpp \ - nodes/nodes/nodeimageoutput.cpp \ - nodes/nodes/nodemedia.cpp \ - nodes/nodes/nodeshader.cpp \ - decoders/ffmpegdecoder.cpp \ - decoders/decoder.cpp \ - nodes/nodeedge.cpp \ - ui/nodeedgeui.cpp - -HEADERS += \ - nodes/node.h \ - nodes/nodeio.h \ - nodes/nodes/nodeclip.h \ - nodes/oldeffectnode.h \ - ui/mainwindow.h \ - panels/project.h \ - panels/effectcontrols.h \ - panels/viewer.h \ - panels/timeline.h \ - ui/sourcetable.h \ - dialogs/aboutdialog.h \ - project/media.h \ - project/footage.h \ - timeline/sequence.h \ - timeline/clip.h \ - global/config.h \ - dialogs/newsequencedialog.h \ - ui/viewerwidget.h \ - ui/viewercontainer.h \ - dialogs/exportdialog.h \ - ui/collapsiblewidget.h \ - panels/panels.h \ - rendering/exportthread.h \ - ui/timelineheader.h \ - project/previewgenerator.h \ - ui/labelslider.h \ - dialogs/preferencesdialog.h \ - ui/audiomonitor.h \ - undo/undo.h \ - ui/comboboxex.h \ - ui/colorbutton.h \ - dialogs/replaceclipmediadialog.h \ - ui/keyframeview.h \ - ui/texteditex.h \ - dialogs/demonotice.h \ - timeline/marker.h \ - timeline/selection.h \ - dialogs/speeddialog.h \ - dialogs/mediapropertiesdialog.h \ - project/projectmodel.h \ - project/loadthread.h \ - dialogs/loaddialog.h \ - global/debug.h \ - global/path.h \ - effects/internal/transformeffect.h \ - effects/internal/solideffect.h \ - effects/internal/texteffect.h \ - effects/internal/timecodeeffect.h \ - effects/internal/audionoiseeffect.h \ - effects/internal/paneffect.h \ - effects/internal/toneeffect.h \ - effects/internal/volumeeffect.h \ - effects/internal/shakeeffect.h \ - effects/internal/linearfadetransition.h \ - effects/internal/crossdissolvetransition.h \ - effects/internal/exponentialfadetransition.h \ - effects/internal/logarithmicfadetransition.h \ - effects/internal/cornerpineffect.h \ - global/math.h \ - effects/internal/cubetransition.h \ - effects/effectgizmo.h \ - ui/resizablescrollbar.h \ - ui/sourceiconview.h \ - project/sourcescommon.h \ - ui/keyframenavigator.h \ - panels/grapheditor.h \ - ui/graphview.h \ - ui/keyframedrawing.h \ - ui/clickablelabel.h \ - effects/keyframe.h \ - ui/rectangleselect.h \ - dialogs/actionsearch.h \ - ui/embeddedfilechooser.h \ - effects/internal/fillleftrighteffect.h \ - effects/internal/voideffect.h \ - dialogs/texteditdialog.h \ - dialogs/debugdialog.h \ - ui/viewerwindow.h \ - project/projectfilter.h \ - effects/effectloaders.h \ - effects/internal/vsthost.h \ - ui/flowlayout.h \ - dialogs/proxydialog.h \ - project/proxygenerator.h \ - dialogs/advancedvideodialog.h \ - ui/cursors.h \ - ui/menuhelper.h \ - global/global.h \ - project/projectelements.h \ - ui/focusfilter.h \ - undo/comboaction.h \ - ui/mediaiconservice.h \ - ui/panel.h \ - effects/internal/dropshadoweffect.h \ - rendering/renderfunctions.h \ - rendering/renderthread.h \ - rendering/clipqueue.h \ - rendering/cacher.h \ - rendering/audio.h \ - dialogs/clippropertiesdialog.h \ - rendering/framebufferobject.h \ - ui/updatenotification.h \ - ui/icons.h \ - effects/fields/doublefield.h \ - effects/fields/fontfield.h \ - effects/effectfield.h \ - effects/effectfields.h \ - effects/fields/stringfield.h \ - effects/fields/filefield.h \ - effects/fields/labelfield.h \ - ui/effectui.h \ - effects/fields/boolfield.h \ - effects/fields/buttonfield.h \ - effects/fields/colorfield.h \ - effects/fields/combofield.h \ - effects/transition.h \ - ui/styling.h \ - undo/undostack.h \ - effects/internal/richtexteffect.h \ - ui/blur.h \ - ui/menu.h \ - rendering/qopenglshaderprogramptr.h \ - timeline/mediaimportdata.h \ - dialogs/autocutsilencedialog.h \ - ui/columnedgridlayout.h \ - rendering/shadergenerators.h \ - global/timing.h \ - rendering/pixelformats.h \ - timeline/ghost.h \ - timeline/timelinefunctions.h \ - timeline/track.h \ - project/savethread.h \ - project/projectfunctions.h \ - ui/timelinearea.h \ - timeline/timelineshared.h \ - ui/timelineview.h \ - ui/timelinelabel.h \ - global/clipboard.h \ - timeline/timelinetools.h \ - ui/waveform.h \ - panels/nodeeditor.h \ - ui/nodeview.h \ - ui/nodeui.h \ - panels/effectspanel.h \ - nodes/nodedatatypes.h \ - nodes/inputs.h \ - nodes/inputs/boolinput.h \ - nodes/inputs/comboinput.h \ - nodes/inputs/colorinput.h \ - nodes/inputs/stringinput.h \ - nodes/inputs/fontinput.h \ - nodes/inputs/vecinput.h \ - nodes/widgets/labelwidget.h \ - nodes/inputs/fileinput.h \ - nodes/widgets/buttonwidget.h \ - nodes/nodegraph.h \ - nodes/nodes/nodemedia.h \ - nodes/nodes/nodeimageoutput.h \ - nodes/nodes/nodeshader.h \ - nodes/nodes.h \ - decoders/ffmpegdecoder.h \ - decoders/decoder.h \ - timeline/tracktypes.h \ - nodes/nodeedge.h \ - ui/nodeedgeui.h - -FORMS += - -TRANSLATIONS += \ - ts/olive_de.ts \ - ts/olive_es.ts \ - ts/olive_fr.ts \ - ts/olive_it.ts \ - ts/olive_cs.ts \ - ts/olive_ar.ts \ - ts/olive_ru.ts \ - ts/olive_uk.ts \ - ts/olive_bs.ts \ - ts/olive_sr.ts \ - ts/olive_id.ts - -win32 { - CONFIG(debug, debug|release) { - CONFIG += console - } - - RC_FILE = packaging/windows/resources.rc - LIBS += -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample -lOpenColorIO -lopengl32 -luser32 -} - -mac { - LIBS += -L/usr/local/lib -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample -lOpenColorIO -framework CoreFoundation - ICON = packaging/macos/olive.icns - INCLUDEPATH = /usr/local/include -} - -unix:!mac { - CONFIG += link_pkgconfig - PKGCONFIG += libavutil libavformat libavcodec libavfilter libswscale libswresample OpenColorIO -} - -RESOURCES += \ - icons/icons.qrc \ - effects/internal/internalshaders.qrc \ - cursors/cursors.qrc - -unix:!mac:isEmpty(PREFIX) { - PREFIX = /usr/local -} - -unix:!mac:target.path = $$PREFIX/bin - -effects.files = $$PWD/effects/shaders/* -unix:!mac:effects.path = $$PREFIX/share/olive-editor/effects - -translations.files = $$PWD/ts/*.qm -unix:!mac:translations.path = $$PREFIX/share/olive-editor/ts - -unix:!mac { - metainfo.files = $$PWD/packaging/linux/org.olivevideoeditor.Olive.appdata.xml - metainfo.path = $$PREFIX/share/metainfo - desktop.files = $$PWD/packaging/linux/org.olivevideoeditor.Olive.desktop - desktop.path = $$PREFIX/share/applications - mime.files = $$PWD/packaging/linux/org.olivevideoeditor.Olive.xml - mime.path = $$PREFIX/share/mime/packages - icon16.files = $$PWD/packaging/linux/icons/16x16/org.olivevideoeditor.Olive.png - icon16.path = $$PREFIX/share/icons/hicolor/16x16/apps - icon32.files = $$PWD/packaging/linux/icons/32x32/org.olivevideoeditor.Olive.png - icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps - icon48.files = $$PWD/packaging/linux/icons/48x48/org.olivevideoeditor.Olive.png - icon48.path = $$PREFIX/share/icons/hicolor/48x48/apps - icon64.files = $$PWD/packaging/linux/icons/64x64/org.olivevideoeditor.Olive.png - icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps - icon128.files = $$PWD/packaging/linux/icons/128x128/org.olivevideoeditor.Olive.png - icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps - icon256.files = $$PWD/packaging/linux/icons/256x256/org.olivevideoeditor.Olive.png - icon256.path = $$PREFIX/share/icons/hicolor/256x256/apps - icon512.files = $$PWD/packaging/linux/icons/512x512/org.olivevideoeditor.Olive.png - icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps - mime16.files = $$PWD/packaging/linux/icons/16x16/application-vnd.olive-project.png - mime16.path = $$PREFIX/share/icons/hicolor/16x16/mimetypes - mime32.files = $$PWD/packaging/linux/icons/32x32/application-vnd.olive-project.png - mime32.path = $$PREFIX/share/icons/hicolor/32x32/mimetypes - mime48.files = $$PWD/packaging/linux/icons/48x48/application-vnd.olive-project.png - mime48.path = $$PREFIX/share/icons/hicolor/48x48/mimetypes - mime64.files = $$PWD/packaging/linux/icons/64x64/application-vnd.olive-project.png - mime64.path = $$PREFIX/share/icons/hicolor/64x64/mimetypes - mime128.files = $$PWD/packaging/linux/icons/128x128/application-vnd.olive-project.png - mime128.path = $$PREFIX/share/icons/hicolor/128x128/mimetypes - mime256.files = $$PWD/packaging/linux/icons/256x256/application-vnd.olive-project.png - mime256.path = $$PREFIX/share/icons/hicolor/256x256/mimetypes - mime512.files = $$PWD/packaging/linux/icons/512x512/application-vnd.olive-project.png - mime512.path = $$PREFIX/share/icons/hicolor/512x512/mimetypes - INSTALLS += target effects translations metainfo desktop mime icon16 icon32 icon48 icon64 icon128 icon256 icon512 mime16 mime32 mime48 mime64 mime128 mime256 mime512 - INSTALLS += target effects translations metainfo desktop mime icon16 icon32 icon48 icon64 icon128 icon256 icon512 -} From 8343849b10212a302af4a974d2d77ce531335c8c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 9 May 2019 02:56:25 +1000 Subject: [PATCH 6/7] default name for viewer panel --- panels/viewer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/panels/viewer.cpp b/panels/viewer.cpp index c77702bfa..3b6b76d40 100644 --- a/panels/viewer.cpp +++ b/panels/viewer.cpp @@ -68,6 +68,7 @@ Viewer::Viewer(QWidget *parent) : media(nullptr), seq(nullptr), created_sequence(false), + panel_name(tr("Viewer: %1")), minimum_zoom(1.0), cue_recording_internal(false), playback_speed(0), From 816dc2824cee234621e4a3dca5f874368030d841 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 9 May 2019 03:50:28 +1000 Subject: [PATCH 7/7] fixed #922 --- ui/effectui.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/effectui.cpp b/ui/effectui.cpp index 3d0a03d68..eb0b1182b 100644 --- a/ui/effectui.cpp +++ b/ui/effectui.cpp @@ -249,7 +249,8 @@ void EffectUI::UpdateFromEffect() EffectField* previous_field = i > 0 ? additional_effects_.at(i-1)->row(j)->Field(k) : field; EffectField* additional_field = additional_effects_.at(i)->row(j)->Field(k); - if (additional_field->GetValueAt(additional_effects_.at(i)->Now()) != previous_field->GetValueAt(additional_effects_.at(i-1)->Now())) { + if (additional_field->GetValueAt(additional_effects_.at(i)->Now()) + != previous_field->GetValueAt(additional_effects_.at(i)->Now())) { same_value = false; break; }