From 634e5785b160bbd16d73a7f9b149236b2fd24fed Mon Sep 17 00:00:00 2001 From: Alberto Villa Date: Tue, 8 Nov 2011 15:03:13 +0100 Subject: [PATCH] Reorganize and cleanup build structure src/CMakeLists.txt gets splitted in several files; #include's are now relative to src/ (or, when in one of its direct sub directories, on it). --- src/CMakeLists.txt | 94 +++++-------------- src/abstractscopewidget.cpp | 3 +- src/audioscopes/CMakeLists.txt | 8 ++ src/audioscopes/abstractaudioscopewidget.cpp | 3 +- src/audioscopes/audiospectrum.cpp | 2 +- src/audioscopes/audiospectrum.h | 2 +- src/audioscopes/ffttools.h | 2 +- src/audiosignal.cpp | 2 +- src/beziercurve/CMakeLists.txt | 9 +- src/blackmagic/CMakeLists.txt | 6 ++ src/colorcorrection/CMakeLists.txt | 8 ++ src/colorscopes/CMakeLists.txt | 9 ++ src/colorscopes/abstractgfxscopewidget.cpp | 3 +- src/colorscopes/histogram.cpp | 2 +- src/colorscopes/rgbparade.cpp | 2 +- src/colorscopes/vectorscope.cpp | 2 +- src/colorscopes/waveform.cpp | 2 +- src/commands/addclipcommand.cpp | 2 +- src/commands/addclipcutcommand.cpp | 2 +- src/commands/addeffectcommand.cpp | 2 +- src/commands/addfoldercommand.cpp | 2 +- src/commands/addmarkercommand.cpp | 2 +- src/commands/addtimelineclipcommand.cpp | 2 +- src/commands/addtrackcommand.cpp | 2 +- src/commands/addtransitioncommand.cpp | 2 +- src/commands/changecliptypecommand.cpp | 2 +- src/commands/changespeedcommand.cpp | 2 +- src/commands/configtrackscommand.cpp | 2 +- src/commands/editclipcommand.cpp | 2 +- src/commands/editclipcutcommand.cpp | 2 +- src/commands/editeffectcommand.cpp | 2 +- src/commands/editfoldercommand.cpp | 2 +- src/commands/editguidecommand.cpp | 2 +- src/commands/editkeyframecommand.cpp | 2 +- src/commands/edittransitioncommand.cpp | 2 +- src/commands/groupclipscommand.cpp | 2 +- src/commands/insertspacecommand.cpp | 2 +- src/commands/locktrackcommand.cpp | 2 +- src/commands/moveclipcommand.cpp | 2 +- src/commands/moveeffectcommand.cpp | 2 +- src/commands/movegroupcommand.cpp | 2 +- src/commands/movetransitioncommand.cpp | 2 +- src/commands/razorclipcommand.cpp | 2 +- src/commands/razorgroupcommand.cpp | 2 +- src/commands/rebuildgroupcommand.cpp | 2 +- src/commands/resizeclipcommand.cpp | 2 +- src/commands/splitaudiocommand.cpp | 2 +- src/kiss_fft/CMakeLists.txt | 8 +- src/kiss_fft/tools/CMakeLists.txt | 0 src/kiss_fft/tools/fftutil.c | 2 +- src/kiss_fft/tools/kfc.h | 2 +- src/kiss_fft/tools/kiss_fastfir.c | 2 +- src/kiss_fft/tools/kiss_fftnd.c | 2 +- src/kiss_fft/tools/kiss_fftnd.h | 2 +- src/kiss_fft/tools/kiss_fftndr.c | 2 +- src/kiss_fft/tools/kiss_fftndr.h | 2 +- src/kiss_fft/tools/kiss_fftr.c | 2 +- src/kiss_fft/tools/kiss_fftr.h | 2 +- src/kiss_fft/tools/psdpng.c | 2 +- src/mainwindow.cpp | 4 +- src/mltdevicecapture.h | 3 +- src/onmonitoritems/CMakeLists.txt | 7 +- src/onmonitoritems/rotoscoping/CMakeLists.txt | 7 ++ src/onmonitoritems/rotoscoping/bpointitem.h | 2 +- src/renderer.h | 3 +- src/rotoscoping/CMakeLists.txt | 6 +- src/rotoscoping/rotowidget.h | 2 +- src/simplekeyframes/CMakeLists.txt | 7 +- src/simplekeyframes/simplekeyframewidget.cpp | 2 +- src/stopmotion/CMakeLists.txt | 5 + src/stopmotion/stopmotion.cpp | 15 ++- src/v4l/CMakeLists.txt | 6 ++ src/widgets/CMakeLists.txt | 0 73 files changed, 173 insertions(+), 143 deletions(-) create mode 100644 src/blackmagic/CMakeLists.txt create mode 100644 src/colorscopes/CMakeLists.txt delete mode 100644 src/kiss_fft/tools/CMakeLists.txt create mode 100644 src/stopmotion/CMakeLists.txt create mode 100644 src/v4l/CMakeLists.txt delete mode 100644 src/widgets/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d7b2b3d..200cc422 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,15 +1,32 @@ +macro_optional_find_package(Nepomuk) +macro_optional_find_package(QJSON) + +add_subdirectory(audioscopes) add_subdirectory(beziercurve) +add_subdirectory(blackmagic) add_subdirectory(colorcorrection) +add_subdirectory(colorscopes) +add_subdirectory(commands) +add_subdirectory(databackup) add_subdirectory(kiss_fft) add_subdirectory(mimetypes) add_subdirectory(onmonitoritems) -add_subdirectory(rotoscoping) -add_subdirectory(widgets) -add_subdirectory(databackup) -add_subdirectory(commands) +add_subdirectory(simplekeyframes) +add_subdirectory(stopmotion) -macro_optional_find_package(Nepomuk) -macro_optional_find_package(QJSON) +if(QJSON_FOUND) + add_subdirectory(rotoscoping) + add_subdirectory(onmonitoritems/rotoscoping) + include_directories(QJSON_INCLUDE_DIR) + set(optional_libs ${optional_libs} ${QJSON_LIBRARIES}) + add_definitions(-DQJSON) +else(QJSON_FOUND) + message(STATUS "Install QJson to use the rotoscoping filter") +endif(QJSON_FOUND) + +if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") + add_subdirectory(v4l) +endif(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") include_directories( ${KDE4_INCLUDE_DIR} @@ -18,32 +35,16 @@ include_directories( ${LIBMLT_INCLUDE_DIR} ${LIBMLTPLUS_INCLUDE_DIR} ${QDBUS_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/audioscopes - ${CMAKE_SOURCE_DIR}/src/beziercurve - ${CMAKE_SOURCE_DIR}/src/colorcorrection - ${CMAKE_SOURCE_DIR}/src/kiss_fft - ${CMAKE_SOURCE_DIR}/src/onmonitoritems - ${CMAKE_SOURCE_DIR}/src/onmonitoritems/rotoscoping - ${CMAKE_SOURCE_DIR}/src/widgets ) - if(Nepomuk_FOUND) include_directories(NEPOMUK_INCLUDES) - set(optional_libs ${NEPOMUK_LIBRARIES}) + set(optional_libs ${optional_libs} ${NEPOMUK_LIBRARIES}) add_definitions(-DNEPOMUK) endif(Nepomuk_FOUND) -if(QJSON_FOUND) - include_directories(QJSON_INCLUDE_DIR) - set(optional_libs ${optional_libs} ${QJSON_LIBRARIES}) - add_definitions(-DQJSON) -else(QJSON_FOUND) - message(STATUS "Install QJson to use the rotoscoping filter") -endif(QJSON_FOUND) - if(Q_WS_X11) include_directories(${X11_Xlib_INCLUDE_PATH}) endif(Q_WS_X11) @@ -203,44 +204,17 @@ set(kdenlive_SRCS timecodedisplay.cpp tracksconfigdialog.cpp abstractscopewidget.cpp - audioscopes/abstractaudioscopewidget.cpp - audioscopes/audiospectrum.cpp - audioscopes/spectrogram.cpp - audioscopes/ffttools.cpp - colorscopes/abstractgfxscopewidget.cpp - colorscopes/histogram.cpp - colorscopes/rgbparade.cpp - colorscopes/vectorscope.cpp - colorscopes/waveform.cpp colorplaneexport.cpp colortools.cpp - colorcorrection/histogramgenerator.cpp - colorcorrection/rgbparadegenerator.cpp - colorcorrection/vectorscopegenerator.cpp - colorcorrection/waveformgenerator.cpp colorpickerwidget.cpp choosecolorwidget.cpp monitorscene.cpp geometrywidget.cpp doubleparameterwidget.cpp audiosignal.cpp - blackmagic/include/DeckLinkAPIDispatch.cpp - stopmotion/stopmotion.cpp - blackmagic/devices.cpp - onmonitoritems/onmonitorrectitem.cpp - onmonitoritems/onmonitorcornersitem.cpp cornerswidget.cpp - kiss_fft/_kiss_fft_guts.h - kiss_fft/kiss_fft.c - kiss_fft/tools/kiss_fftr.c - beziercurve/beziersplineeditor.cpp - beziercurve/beziersplinewidget.cpp - beziercurve/bpoint.cpp - beziercurve/cubicbezierspline.cpp dragvalue.cpp monitoreditwidget.cpp - simplekeyframes/simpletimelinewidget.cpp - simplekeyframes/simplekeyframewidget.cpp noteswidget.cpp archivewidget.cpp mltdevicecapture.cpp @@ -265,24 +239,6 @@ if(APPLE OR OPENGL_FOUND) set(kdenlive_SRCS videoglwidget.cpp ${kdenlive_SRCS}) endif(APPLE OR OPENGL_FOUND) -if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") - set(kdenlive_SRCS - ${kdenlive_SRCS} - v4l/v4lcapture.cpp - v4l/src.c - ) -endif(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") - -if(QJSON_FOUND) - set(kdenlive_SRCS - ${kdenlive_SRCS} - onmonitoritems/rotoscoping/bpointitem.cpp - onmonitoritems/rotoscoping/nearestpoint.cpp - onmonitoritems/rotoscoping/splineitem.cpp - rotoscoping/rotowidget.cpp - ) -endif(QJSON_FOUND) - # Add libdl find_library(DL_LIB NAMES ${CMAKE_DL_LIBS}) message(STATUS "using dl library: ${DL_LIB}") diff --git a/src/abstractscopewidget.cpp b/src/abstractscopewidget.cpp index 022063d3..0622bd97 100644 --- a/src/abstractscopewidget.cpp +++ b/src/abstractscopewidget.cpp @@ -8,12 +8,11 @@ * (at your option) any later version. * ***************************************************************************/ -#include "qtconcurrentrun.h" - #include "abstractscopewidget.h" #include "renderer.h" #include "monitor.h" +#include #include #include #include diff --git a/src/audioscopes/CMakeLists.txt b/src/audioscopes/CMakeLists.txt index e69de29b..7b8ef2bd 100644 --- a/src/audioscopes/CMakeLists.txt +++ b/src/audioscopes/CMakeLists.txt @@ -0,0 +1,8 @@ +set(kdenlive_SRCS + ${kdenlive_SRCS} + audioscopes/abstractaudioscopewidget.cpp + audioscopes/audiospectrum.cpp + audioscopes/ffttools.cpp + audioscopes/spectrogram.cpp + PARENT_SCOPE +) diff --git a/src/audioscopes/abstractaudioscopewidget.cpp b/src/audioscopes/abstractaudioscopewidget.cpp index 099a8e6e..16b50681 100644 --- a/src/audioscopes/abstractaudioscopewidget.cpp +++ b/src/audioscopes/abstractaudioscopewidget.cpp @@ -8,12 +8,11 @@ * (at your option) any later version. * ***************************************************************************/ -#include "qtconcurrentrun.h" - #include "abstractaudioscopewidget.h" #include "renderer.h" #include "monitor.h" +#include #include #include #include diff --git a/src/audioscopes/audiospectrum.cpp b/src/audioscopes/audiospectrum.cpp index eeb6a53a..be40af7a 100644 --- a/src/audioscopes/audiospectrum.cpp +++ b/src/audioscopes/audiospectrum.cpp @@ -12,7 +12,7 @@ #include "audiospectrum.h" #include "ffttools.h" -#include "tools/kiss_fftr.h" +#include "kiss_fft/tools/kiss_fftr.h" #include #include diff --git a/src/audioscopes/audiospectrum.h b/src/audioscopes/audiospectrum.h index 3f486c24..77308afa 100644 --- a/src/audioscopes/audiospectrum.h +++ b/src/audioscopes/audiospectrum.h @@ -29,7 +29,7 @@ #include "abstractaudioscopewidget.h" #include "ui_audiospectrum_ui.h" -#include "tools/kiss_fftr.h" +#include "kiss_fft/tools/kiss_fftr.h" #include "ffttools.h" class AudioSpectrum_UI; diff --git a/src/audioscopes/ffttools.h b/src/audioscopes/ffttools.h index f71d04aa..26cee848 100644 --- a/src/audioscopes/ffttools.h +++ b/src/audioscopes/ffttools.h @@ -13,7 +13,7 @@ #include #include -#include +#include "kiss_fft/tools/kiss_fftr.h" class FFTTools { diff --git a/src/audiosignal.cpp b/src/audiosignal.cpp index 30471e0b..6ccd2dd5 100644 --- a/src/audiosignal.cpp +++ b/src/audiosignal.cpp @@ -18,7 +18,6 @@ ***************************************************************************/ #include "audiosignal.h" -#include "math.h" #include @@ -29,6 +28,7 @@ #include #include +#include AudioSignal::AudioSignal(QWidget *parent): QWidget(parent) { diff --git a/src/beziercurve/CMakeLists.txt b/src/beziercurve/CMakeLists.txt index 8b137891..625b4044 100644 --- a/src/beziercurve/CMakeLists.txt +++ b/src/beziercurve/CMakeLists.txt @@ -1 +1,8 @@ - +set(kdenlive_SRCS + ${kdenlive_SRCS} + beziercurve/beziersplineeditor.cpp + beziercurve/beziersplinewidget.cpp + beziercurve/bpoint.cpp + beziercurve/cubicbezierspline.cpp + PARENT_SCOPE +) diff --git a/src/blackmagic/CMakeLists.txt b/src/blackmagic/CMakeLists.txt new file mode 100644 index 00000000..5bb17a9d --- /dev/null +++ b/src/blackmagic/CMakeLists.txt @@ -0,0 +1,6 @@ +set(kdenlive_SRCS + ${kdenlive_SRCS} + blackmagic/devices.cpp + blackmagic/include/DeckLinkAPIDispatch.cpp + PARENT_SCOPE +) diff --git a/src/colorcorrection/CMakeLists.txt b/src/colorcorrection/CMakeLists.txt index e69de29b..78d0fd10 100644 --- a/src/colorcorrection/CMakeLists.txt +++ b/src/colorcorrection/CMakeLists.txt @@ -0,0 +1,8 @@ +set(kdenlive_SRCS + ${kdenlive_SRCS} + colorcorrection/histogramgenerator.cpp + colorcorrection/rgbparadegenerator.cpp + colorcorrection/vectorscopegenerator.cpp + colorcorrection/waveformgenerator.cpp + PARENT_SCOPE +) diff --git a/src/colorscopes/CMakeLists.txt b/src/colorscopes/CMakeLists.txt new file mode 100644 index 00000000..d2df8d08 --- /dev/null +++ b/src/colorscopes/CMakeLists.txt @@ -0,0 +1,9 @@ +set(kdenlive_SRCS + ${kdenlive_SRCS} + colorscopes/abstractgfxscopewidget.cpp + colorscopes/histogram.cpp + colorscopes/rgbparade.cpp + colorscopes/vectorscope.cpp + colorscopes/waveform.cpp + PARENT_SCOPE +) diff --git a/src/colorscopes/abstractgfxscopewidget.cpp b/src/colorscopes/abstractgfxscopewidget.cpp index 370fcb0d..94f90400 100644 --- a/src/colorscopes/abstractgfxscopewidget.cpp +++ b/src/colorscopes/abstractgfxscopewidget.cpp @@ -8,12 +8,11 @@ * (at your option) any later version. * ***************************************************************************/ -#include "qtconcurrentrun.h" - #include "abstractgfxscopewidget.h" #include "renderer.h" #include "monitormanager.h" +#include #include #include #include diff --git a/src/colorscopes/histogram.cpp b/src/colorscopes/histogram.cpp index 9fd9ee8e..9b5915a5 100644 --- a/src/colorscopes/histogram.cpp +++ b/src/colorscopes/histogram.cpp @@ -10,7 +10,7 @@ #include #include -#include "histogramgenerator.h" +#include "colorcorrection/histogramgenerator.h" #include "histogram.h" #include "renderer.h" diff --git a/src/colorscopes/rgbparade.cpp b/src/colorscopes/rgbparade.cpp index 396697fc..18be787a 100644 --- a/src/colorscopes/rgbparade.cpp +++ b/src/colorscopes/rgbparade.cpp @@ -14,7 +14,7 @@ #include #include "renderer.h" #include "rgbparade.h" -#include "rgbparadegenerator.h" +#include "colorcorrection/rgbparadegenerator.h" RGBParade::RGBParade(MonitorManager *manager, QWidget *parent) : AbstractGfxScopeWidget(manager, true, parent) diff --git a/src/colorscopes/vectorscope.cpp b/src/colorscopes/vectorscope.cpp index fc98f1c7..76a6e722 100644 --- a/src/colorscopes/vectorscope.cpp +++ b/src/colorscopes/vectorscope.cpp @@ -22,7 +22,7 @@ #include "colortools.h" #include "renderer.h" #include "vectorscope.h" -#include "vectorscopegenerator.h" +#include "colorcorrection/vectorscopegenerator.h" const float P75 = .75; const unsigned char DEFAULT_Y = 255; diff --git a/src/colorscopes/waveform.cpp b/src/colorscopes/waveform.cpp index bf09234b..f8fec8b1 100644 --- a/src/colorscopes/waveform.cpp +++ b/src/colorscopes/waveform.cpp @@ -19,7 +19,7 @@ #include "renderer.h" #include "waveform.h" -#include "waveformgenerator.h" +#include "colorcorrection/waveformgenerator.h" const QSize Waveform::m_textWidth(35,0); diff --git a/src/commands/addclipcommand.cpp b/src/commands/addclipcommand.cpp index 5e15f6c3..44df4d5b 100644 --- a/src/commands/addclipcommand.cpp +++ b/src/commands/addclipcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/addclipcommand.h" +#include "addclipcommand.h" #include "kdenlivedoc.h" #include diff --git a/src/commands/addclipcutcommand.cpp b/src/commands/addclipcutcommand.cpp index 3dbca234..d5bf0829 100644 --- a/src/commands/addclipcutcommand.cpp +++ b/src/commands/addclipcutcommand.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "commands/addclipcutcommand.h" +#include "addclipcutcommand.h" #include "projectlist.h" #include diff --git a/src/commands/addeffectcommand.cpp b/src/commands/addeffectcommand.cpp index c7c92c69..5e09957c 100644 --- a/src/commands/addeffectcommand.cpp +++ b/src/commands/addeffectcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/addeffectcommand.h" +#include "addeffectcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/addfoldercommand.cpp b/src/commands/addfoldercommand.cpp index b481ec0a..b5146d96 100644 --- a/src/commands/addfoldercommand.cpp +++ b/src/commands/addfoldercommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/addfoldercommand.h" +#include "addfoldercommand.h" #include "projectlist.h" #include diff --git a/src/commands/addmarkercommand.cpp b/src/commands/addmarkercommand.cpp index 3d671e59..bc6d7320 100644 --- a/src/commands/addmarkercommand.cpp +++ b/src/commands/addmarkercommand.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ -#include "commands/addmarkercommand.h" +#include "addmarkercommand.h" #include "customtrackview.h" #include diff --git a/src/commands/addtimelineclipcommand.cpp b/src/commands/addtimelineclipcommand.cpp index 3a790462..3a13ad54 100644 --- a/src/commands/addtimelineclipcommand.cpp +++ b/src/commands/addtimelineclipcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/addtimelineclipcommand.h" +#include "addtimelineclipcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/addtrackcommand.cpp b/src/commands/addtrackcommand.cpp index 962f018b..fa8b5692 100644 --- a/src/commands/addtrackcommand.cpp +++ b/src/commands/addtrackcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/addtrackcommand.h" +#include "addtrackcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/addtransitioncommand.cpp b/src/commands/addtransitioncommand.cpp index 2e44de91..c8acc6dc 100644 --- a/src/commands/addtransitioncommand.cpp +++ b/src/commands/addtransitioncommand.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ -#include "commands/addtransitioncommand.h" +#include "addtransitioncommand.h" #include "customtrackview.h" #include diff --git a/src/commands/changecliptypecommand.cpp b/src/commands/changecliptypecommand.cpp index ea539f07..5df821af 100644 --- a/src/commands/changecliptypecommand.cpp +++ b/src/commands/changecliptypecommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/changecliptypecommand.h" +#include "changecliptypecommand.h" #include "customtrackview.h" #include diff --git a/src/commands/changespeedcommand.cpp b/src/commands/changespeedcommand.cpp index d671a874..f775c681 100644 --- a/src/commands/changespeedcommand.cpp +++ b/src/commands/changespeedcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/changespeedcommand.h" +#include "changespeedcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/configtrackscommand.cpp b/src/commands/configtrackscommand.cpp index 18e5c123..f034edde 100644 --- a/src/commands/configtrackscommand.cpp +++ b/src/commands/configtrackscommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/configtrackscommand.h" +#include "configtrackscommand.h" #include "customtrackview.h" diff --git a/src/commands/editclipcommand.cpp b/src/commands/editclipcommand.cpp index ecbc3f6b..d65acfc5 100644 --- a/src/commands/editclipcommand.cpp +++ b/src/commands/editclipcommand.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "commands/editclipcommand.h" +#include "editclipcommand.h" #include "projectlist.h" #include diff --git a/src/commands/editclipcutcommand.cpp b/src/commands/editclipcutcommand.cpp index ecc07d49..b6708f81 100644 --- a/src/commands/editclipcutcommand.cpp +++ b/src/commands/editclipcutcommand.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "commands/editclipcutcommand.h" +#include "editclipcutcommand.h" #include "projectlist.h" #include diff --git a/src/commands/editeffectcommand.cpp b/src/commands/editeffectcommand.cpp index 5c2e9ae8..b6a98145 100644 --- a/src/commands/editeffectcommand.cpp +++ b/src/commands/editeffectcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/editeffectcommand.h" +#include "editeffectcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/editfoldercommand.cpp b/src/commands/editfoldercommand.cpp index 6e15c8c5..6dbcd7fc 100644 --- a/src/commands/editfoldercommand.cpp +++ b/src/commands/editfoldercommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/editfoldercommand.h" +#include "editfoldercommand.h" #include "projectlist.h" #include diff --git a/src/commands/editguidecommand.cpp b/src/commands/editguidecommand.cpp index b5f837fe..20933a3c 100644 --- a/src/commands/editguidecommand.cpp +++ b/src/commands/editguidecommand.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ -#include "commands/editguidecommand.h" +#include "editguidecommand.h" #include "customtrackview.h" #include diff --git a/src/commands/editkeyframecommand.cpp b/src/commands/editkeyframecommand.cpp index 19e9753c..29c341ca 100644 --- a/src/commands/editkeyframecommand.cpp +++ b/src/commands/editkeyframecommand.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ -#include "commands/editkeyframecommand.h" +#include "editkeyframecommand.h" #include "customtrackview.h" #include diff --git a/src/commands/edittransitioncommand.cpp b/src/commands/edittransitioncommand.cpp index 6ba38a1d..dd3afe7d 100644 --- a/src/commands/edittransitioncommand.cpp +++ b/src/commands/edittransitioncommand.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "commands/edittransitioncommand.h" +#include "edittransitioncommand.h" #include "customtrackview.h" #include diff --git a/src/commands/groupclipscommand.cpp b/src/commands/groupclipscommand.cpp index c7a5d7d2..77010c16 100644 --- a/src/commands/groupclipscommand.cpp +++ b/src/commands/groupclipscommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/groupclipscommand.h" +#include "groupclipscommand.h" #include "customtrackview.h" #include diff --git a/src/commands/insertspacecommand.cpp b/src/commands/insertspacecommand.cpp index 7a485fd3..7802a82b 100644 --- a/src/commands/insertspacecommand.cpp +++ b/src/commands/insertspacecommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/insertspacecommand.h" +#include "insertspacecommand.h" #include "customtrackview.h" #include diff --git a/src/commands/locktrackcommand.cpp b/src/commands/locktrackcommand.cpp index be5c31fb..8b35773b 100644 --- a/src/commands/locktrackcommand.cpp +++ b/src/commands/locktrackcommand.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "commands/locktrackcommand.h" +#include "locktrackcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/moveclipcommand.cpp b/src/commands/moveclipcommand.cpp index aa145751..659c09fa 100644 --- a/src/commands/moveclipcommand.cpp +++ b/src/commands/moveclipcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/moveclipcommand.h" +#include "moveclipcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/moveeffectcommand.cpp b/src/commands/moveeffectcommand.cpp index 5c756ed9..ba87dc3d 100644 --- a/src/commands/moveeffectcommand.cpp +++ b/src/commands/moveeffectcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/moveeffectcommand.h" +#include "moveeffectcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/movegroupcommand.cpp b/src/commands/movegroupcommand.cpp index f4b467c6..f22bdc95 100644 --- a/src/commands/movegroupcommand.cpp +++ b/src/commands/movegroupcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/movegroupcommand.h" +#include "movegroupcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/movetransitioncommand.cpp b/src/commands/movetransitioncommand.cpp index 9363a0e0..f825ed77 100644 --- a/src/commands/movetransitioncommand.cpp +++ b/src/commands/movetransitioncommand.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "commands/movetransitioncommand.h" +#include "movetransitioncommand.h" #include "customtrackview.h" #include diff --git a/src/commands/razorclipcommand.cpp b/src/commands/razorclipcommand.cpp index d3b8a5cd..023f39f8 100644 --- a/src/commands/razorclipcommand.cpp +++ b/src/commands/razorclipcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/razorclipcommand.h" +#include "razorclipcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/razorgroupcommand.cpp b/src/commands/razorgroupcommand.cpp index c918df72..e419761b 100644 --- a/src/commands/razorgroupcommand.cpp +++ b/src/commands/razorgroupcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/razorgroupcommand.h" +#include "razorgroupcommand.h" #include "customtrackview.h" RazorGroupCommand::RazorGroupCommand(CustomTrackView *view, QList clips1, QList transitions1, QList clipsCut, QList transitionsCut, QList clips2, QList transitions2, GenTime cutPos, QUndoCommand * parent) : diff --git a/src/commands/rebuildgroupcommand.cpp b/src/commands/rebuildgroupcommand.cpp index 892b614d..69a276cb 100644 --- a/src/commands/rebuildgroupcommand.cpp +++ b/src/commands/rebuildgroupcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/rebuildgroupcommand.h" +#include "rebuildgroupcommand.h" #include "customtrackview.h" RebuildGroupCommand::RebuildGroupCommand(CustomTrackView* view, int childTrack, GenTime childPos, QUndoCommand* parent) : diff --git a/src/commands/resizeclipcommand.cpp b/src/commands/resizeclipcommand.cpp index ca0689de..9cde2c4b 100644 --- a/src/commands/resizeclipcommand.cpp +++ b/src/commands/resizeclipcommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/resizeclipcommand.h" +#include "resizeclipcommand.h" #include "customtrackview.h" #include diff --git a/src/commands/splitaudiocommand.cpp b/src/commands/splitaudiocommand.cpp index cb955989..cfe3aef0 100644 --- a/src/commands/splitaudiocommand.cpp +++ b/src/commands/splitaudiocommand.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ -#include "commands/splitaudiocommand.h" +#include "splitaudiocommand.h" #include "customtrackview.h" #include diff --git a/src/kiss_fft/CMakeLists.txt b/src/kiss_fft/CMakeLists.txt index f7c6b56e..51288bf5 100644 --- a/src/kiss_fft/CMakeLists.txt +++ b/src/kiss_fft/CMakeLists.txt @@ -1 +1,7 @@ -add_subdirectory(tools) +set(kdenlive_SRCS + ${kdenlive_SRCS} + kiss_fft/_kiss_fft_guts.h + kiss_fft/kiss_fft.c + kiss_fft/tools/kiss_fftr.c + PARENT_SCOPE +) diff --git a/src/kiss_fft/tools/CMakeLists.txt b/src/kiss_fft/tools/CMakeLists.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/src/kiss_fft/tools/fftutil.c b/src/kiss_fft/tools/fftutil.c index db5a8151..04592279 100644 --- a/src/kiss_fft/tools/fftutil.c +++ b/src/kiss_fft/tools/fftutil.c @@ -18,7 +18,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include #include -#include "kiss_fft.h" +#include "../kiss_fft.h" #include "kiss_fftndr.h" static diff --git a/src/kiss_fft/tools/kfc.h b/src/kiss_fft/tools/kfc.h index 9b5fd677..321a88a8 100644 --- a/src/kiss_fft/tools/kfc.h +++ b/src/kiss_fft/tools/kfc.h @@ -1,6 +1,6 @@ #ifndef KFC_H #define KFC_H -#include "kiss_fft.h" +#include "../kiss_fft.h" #ifdef __cplusplus extern "C" { diff --git a/src/kiss_fft/tools/kiss_fastfir.c b/src/kiss_fft/tools/kiss_fastfir.c index 1c96216d..dfd7c8c0 100644 --- a/src/kiss_fft/tools/kiss_fastfir.c +++ b/src/kiss_fft/tools/kiss_fastfir.c @@ -12,7 +12,7 @@ Redistribution and use in source and binary forms, with or without modification, THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "_kiss_fft_guts.h" +#include "../_kiss_fft_guts.h" /* diff --git a/src/kiss_fft/tools/kiss_fftnd.c b/src/kiss_fft/tools/kiss_fftnd.c index d6c91243..a1189781 100644 --- a/src/kiss_fft/tools/kiss_fftnd.c +++ b/src/kiss_fft/tools/kiss_fftnd.c @@ -15,7 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND */ #include "kiss_fftnd.h" -#include "_kiss_fft_guts.h" +#include "../_kiss_fft_guts.h" struct kiss_fftnd_state{ int dimprod; /* dimsum would be mighty tasty right now */ diff --git a/src/kiss_fft/tools/kiss_fftnd.h b/src/kiss_fft/tools/kiss_fftnd.h index 42e7df5b..ed7a0696 100644 --- a/src/kiss_fft/tools/kiss_fftnd.h +++ b/src/kiss_fft/tools/kiss_fftnd.h @@ -1,7 +1,7 @@ #ifndef KISS_FFTND_H #define KISS_FFTND_H -#include "kiss_fft.h" +#include "../kiss_fft.h" #ifdef __cplusplus extern "C" { diff --git a/src/kiss_fft/tools/kiss_fftndr.c b/src/kiss_fft/tools/kiss_fftndr.c index ba550dd1..b593183a 100644 --- a/src/kiss_fft/tools/kiss_fftndr.c +++ b/src/kiss_fft/tools/kiss_fftndr.c @@ -13,7 +13,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND */ #include "kiss_fftndr.h" -#include "_kiss_fft_guts.h" +#include "../_kiss_fft_guts.h" #define MAX(x,y) ( ( (x)<(y) )?(y):(x) ) struct kiss_fftndr_state diff --git a/src/kiss_fft/tools/kiss_fftndr.h b/src/kiss_fft/tools/kiss_fftndr.h index 38ec3ab0..15df6508 100644 --- a/src/kiss_fft/tools/kiss_fftndr.h +++ b/src/kiss_fft/tools/kiss_fftndr.h @@ -1,7 +1,7 @@ #ifndef KISS_NDR_H #define KISS_NDR_H -#include "kiss_fft.h" +#include "../kiss_fft.h" #include "kiss_fftr.h" #include "kiss_fftnd.h" diff --git a/src/kiss_fft/tools/kiss_fftr.c b/src/kiss_fft/tools/kiss_fftr.c index f389770b..a9855534 100644 --- a/src/kiss_fft/tools/kiss_fftr.c +++ b/src/kiss_fft/tools/kiss_fftr.c @@ -13,7 +13,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND */ #include "kiss_fftr.h" -#include "_kiss_fft_guts.h" +#include "../_kiss_fft_guts.h" struct kiss_fftr_state{ kiss_fft_cfg substate; diff --git a/src/kiss_fft/tools/kiss_fftr.h b/src/kiss_fft/tools/kiss_fftr.h index 72e5a577..81d8a8ec 100644 --- a/src/kiss_fft/tools/kiss_fftr.h +++ b/src/kiss_fft/tools/kiss_fftr.h @@ -1,7 +1,7 @@ #ifndef KISS_FTR_H #define KISS_FTR_H -#include "kiss_fft.h" +#include "../kiss_fft.h" #ifdef __cplusplus extern "C" { #endif diff --git a/src/kiss_fft/tools/psdpng.c b/src/kiss_fft/tools/psdpng.c index d11a54fd..ef9ff5bc 100644 --- a/src/kiss_fft/tools/psdpng.c +++ b/src/kiss_fft/tools/psdpng.c @@ -19,7 +19,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include #include -#include "kiss_fft.h" +#include "../kiss_fft.h" #include "kiss_fftr.h" int nfft=1024; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5a76ffb3..e2bb83a0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -59,8 +59,8 @@ #include "colorscopes/waveform.h" #include "colorscopes/rgbparade.h" #include "colorscopes/histogram.h" -#include "audiospectrum.h" -#include "spectrogram.h" +#include "audioscopes/audiospectrum.h" +#include "audioscopes/spectrogram.h" #include "archivewidget.h" #include "databackup/backupwidget.h" diff --git a/src/mltdevicecapture.h b/src/mltdevicecapture.h index 7ba44c2c..ba757335 100644 --- a/src/mltdevicecapture.h +++ b/src/mltdevicecapture.h @@ -26,7 +26,8 @@ #include "gentime.h" #include "definitions.h" #include "abstractmonitor.h" -#include "mlt/framework/mlt_types.h" + +#include #include diff --git a/src/onmonitoritems/CMakeLists.txt b/src/onmonitoritems/CMakeLists.txt index 1afa18c3..58ece7c0 100644 --- a/src/onmonitoritems/CMakeLists.txt +++ b/src/onmonitoritems/CMakeLists.txt @@ -1 +1,6 @@ -add_subdirectory(rotoscoping) +set(kdenlive_SRCS + ${kdenlive_SRCS} + onmonitoritems/onmonitorcornersitem.cpp + onmonitoritems/onmonitorrectitem.cpp + PARENT_SCOPE +) diff --git a/src/onmonitoritems/rotoscoping/CMakeLists.txt b/src/onmonitoritems/rotoscoping/CMakeLists.txt index e69de29b..51776fa2 100644 --- a/src/onmonitoritems/rotoscoping/CMakeLists.txt +++ b/src/onmonitoritems/rotoscoping/CMakeLists.txt @@ -0,0 +1,7 @@ +set(kdenlive_SRCS + ${kdenlive_SRCS} + onmonitoritems/rotoscoping/bpointitem.cpp + onmonitoritems/rotoscoping/nearestpoint.cpp + onmonitoritems/rotoscoping/splineitem.cpp + PARENT_SCOPE +) diff --git a/src/onmonitoritems/rotoscoping/bpointitem.h b/src/onmonitoritems/rotoscoping/bpointitem.h index 1a767c57..536182bf 100644 --- a/src/onmonitoritems/rotoscoping/bpointitem.h +++ b/src/onmonitoritems/rotoscoping/bpointitem.h @@ -19,7 +19,7 @@ #ifndef BPOINTITEM_H #define BPOINTITEM_H -#include "bpoint.h" +#include "beziercurve/bpoint.h" #include #include diff --git a/src/renderer.h b/src/renderer.h index eb9f4b03..45e140a1 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -32,7 +32,8 @@ #include "gentime.h" #include "definitions.h" #include "abstractmonitor.h" -#include "mlt/framework/mlt_types.h" + +#include #include diff --git a/src/rotoscoping/CMakeLists.txt b/src/rotoscoping/CMakeLists.txt index 8b137891..f38757a1 100644 --- a/src/rotoscoping/CMakeLists.txt +++ b/src/rotoscoping/CMakeLists.txt @@ -1 +1,5 @@ - +set(kdenlive_SRCS + ${kdenlive_SRCS} + rotoscoping/rotowidget.cpp + PARENT_SCOPE +) diff --git a/src/rotoscoping/rotowidget.h b/src/rotoscoping/rotowidget.h index 7a0d2d9f..235bf62b 100644 --- a/src/rotoscoping/rotowidget.h +++ b/src/rotoscoping/rotowidget.h @@ -20,7 +20,7 @@ #define ROTOWIDGET_H #include "definitions.h" -#include "bpoint.h" +#include "beziercurve/bpoint.h" #include "timecode.h" #include diff --git a/src/simplekeyframes/CMakeLists.txt b/src/simplekeyframes/CMakeLists.txt index 8b137891..7aa2ba54 100644 --- a/src/simplekeyframes/CMakeLists.txt +++ b/src/simplekeyframes/CMakeLists.txt @@ -1 +1,6 @@ - +set(kdenlive_SRCS + ${kdenlive_SRCS} + simplekeyframes/simpletimelinewidget.cpp + simplekeyframes/simplekeyframewidget.cpp + PARENT_SCOPE +) diff --git a/src/simplekeyframes/simplekeyframewidget.cpp b/src/simplekeyframes/simplekeyframewidget.cpp index d7774193..20ede65f 100644 --- a/src/simplekeyframes/simplekeyframewidget.cpp +++ b/src/simplekeyframes/simplekeyframewidget.cpp @@ -16,7 +16,7 @@ * along with Kdenlive. If not, see . * ***************************************************************************/ -#include "simplekeyframes/simplekeyframewidget.h" +#include "simplekeyframewidget.h" #include "simpletimelinewidget.h" #include "timecodedisplay.h" diff --git a/src/stopmotion/CMakeLists.txt b/src/stopmotion/CMakeLists.txt new file mode 100644 index 00000000..8cf02617 --- /dev/null +++ b/src/stopmotion/CMakeLists.txt @@ -0,0 +1,5 @@ +set(kdenlive_SRCS + ${kdenlive_SRCS} + stopmotion/stopmotion.cpp + PARENT_SCOPE +) diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp index f76f9c29..395c52f5 100644 --- a/src/stopmotion/stopmotion.cpp +++ b/src/stopmotion/stopmotion.cpp @@ -16,19 +16,18 @@ ***************************************************************************/ #include "stopmotion.h" -#include "../blackmagic/devices.h" +#include "blackmagic/devices.h" #if !defined(Q_OS_FREEBSD) && !defined(Q_OS_KFREEBSD) -#include "../v4l/v4lcapture.h" +#include "v4l/v4lcapture.h" #endif -#include "../slideshowclip.h" -#include "../profilesdialog.h" -#include "../mltdevicecapture.h" -#include "../recmonitor.h" -#include "../monitormanager.h" +#include "slideshowclip.h" +#include "profilesdialog.h" +#include "mltdevicecapture.h" +#include "recmonitor.h" +#include "monitormanager.h" #include "ui_smconfig_ui.h" #include "kdenlivesettings.h" - #include #include #include diff --git a/src/v4l/CMakeLists.txt b/src/v4l/CMakeLists.txt new file mode 100644 index 00000000..562763d0 --- /dev/null +++ b/src/v4l/CMakeLists.txt @@ -0,0 +1,6 @@ +set(kdenlive_SRCS + ${kdenlive_SRCS} + v4l/v4lcapture.cpp + v4l/src.c + PARENT_SCOPE +) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt deleted file mode 100644 index e69de29b..00000000 -- 2.39.2