Commit b4fed78d authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Continue merging of scopemanager from Granjow

parent 430873d4
......@@ -78,10 +78,8 @@ macro_log_feature(QJSON_FOUND
)
add_subdirectory(audioscopes)
add_subdirectory(beziercurve)
add_subdirectory(colorcorrection)
add_subdirectory(colorscopes)
add_subdirectory(commands)
add_subdirectory(projecttree)
add_subdirectory(utils)
......@@ -89,6 +87,7 @@ add_subdirectory(databackup)
add_subdirectory(kiss_fft)
add_subdirectory(mimetypes)
add_subdirectory(onmonitoritems)
add_subdirectory(scopes)
add_subdirectory(simplekeyframes)
add_subdirectory(stopmotion)
......@@ -113,9 +112,7 @@ list(APPEND kdenlive_SRCS
abstractclipitem.cpp
abstractgroupitem.cpp
abstractmonitor.cpp
abstractscopewidget.cpp
archivewidget.cpp
audiosignal.cpp
choosecolorwidget.cpp
clipdurationdialog.cpp
clipitem.cpp
......
set(kdenlive_SRCS
${kdenlive_SRCS}
audioscopes/abstractaudioscopewidget.cpp
audioscopes/audiospectrum.cpp
audioscopes/ffttools.cpp
audioscopes/spectrogram.cpp
scopes/audioscopes/abstractaudioscopewidget.cpp
scopes/audioscopes/audiosignal.cpp
scopes/audioscopes/audiospectrum.cpp
scopes/audioscopes/ffttools.cpp
scopes/audioscopes/spectrogram.cpp
PARENT_SCOPE
)
set(kdenlive_SRCS
${kdenlive_SRCS}
colorscopes/abstractgfxscopewidget.cpp
colorscopes/histogram.cpp
colorscopes/rgbparade.cpp
colorscopes/vectorscope.cpp
colorscopes/waveform.cpp
scopes/colorscopes/abstractgfxscopewidget.cpp
scopes/colorscopes/histogram.cpp
scopes/colorscopes/rgbparade.cpp
scopes/colorscopes/vectorscope.cpp
scopes/colorscopes/waveform.cpp
PARENT_SCOPE
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment