Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
aadd9305
Commit
aadd9305
authored
Dec 02, 2014
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
First step in KF5 porting. Compiles but startup crash
parent
b0ab905d
Changes
187
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
187 changed files
with
1541 additions
and
1700 deletions
+1541
-1700
CMakeLists.txt
CMakeLists.txt
+46
-28
data/CMakeLists.txt
data/CMakeLists.txt
+2
-2
data/icons/CMakeLists.txt
data/icons/CMakeLists.txt
+3
-1
plugins/sampleplugin/CMakeLists.txt
plugins/sampleplugin/CMakeLists.txt
+1
-1
renderer/CMakeLists.txt
renderer/CMakeLists.txt
+3
-2
src/CMakeLists.txt
src/CMakeLists.txt
+67
-72
src/capture/managecapturesdialog.cpp
src/capture/managecapturesdialog.cpp
+7
-8
src/capture/managecapturesdialog.h
src/capture/managecapturesdialog.h
+3
-3
src/capture/mltdevicecapture.cpp
src/capture/mltdevicecapture.cpp
+0
-7
src/capture/mltdevicecapture.h
src/capture/mltdevicecapture.h
+2
-2
src/capture/v4lcapture.cpp
src/capture/v4lcapture.cpp
+0
-5
src/capture/v4lcapture.h
src/capture/v4lcapture.h
+1
-4
src/definitions.cpp
src/definitions.cpp
+2
-0
src/definitions.h
src/definitions.h
+0
-1
src/dialogs/encodingprofilesdialog.cpp
src/dialogs/encodingprofilesdialog.cpp
+5
-9
src/dialogs/encodingprofilesdialog.h
src/dialogs/encodingprofilesdialog.h
+1
-0
src/dialogs/kdenlivesettingsdialog.cpp
src/dialogs/kdenlivesettingsdialog.cpp
+23
-23
src/dialogs/profilesdialog.cpp
src/dialogs/profilesdialog.cpp
+8
-7
src/dialogs/renderwidget.cpp
src/dialogs/renderwidget.cpp
+61
-65
src/dialogs/renderwidget.h
src/dialogs/renderwidget.h
+3
-3
src/dialogs/wizard.cpp
src/dialogs/wizard.cpp
+11
-30
src/dialogs/wizard.h
src/dialogs/wizard.h
+3
-3
src/doc/docclipbase.cpp
src/doc/docclipbase.cpp
+8
-10
src/doc/docclipbase.h
src/doc/docclipbase.h
+3
-5
src/doc/documentchecker.cpp
src/doc/documentchecker.cpp
+38
-44
src/doc/documentchecker.h
src/doc/documentchecker.h
+0
-1
src/doc/documentvalidator.cpp
src/doc/documentvalidator.cpp
+4
-4
src/doc/documentvalidator.h
src/doc/documentvalidator.h
+3
-3
src/doc/kdenlivedoc.cpp
src/doc/kdenlivedoc.cpp
+58
-50
src/doc/kdenlivedoc.h
src/doc/kdenlivedoc.h
+12
-12
src/doc/kthumb.cpp
src/doc/kthumb.cpp
+7
-9
src/doc/kthumb.h
src/doc/kthumb.h
+8
-9
src/dvdwizard/dvdwizard.cpp
src/dvdwizard/dvdwizard.cpp
+44
-45
src/dvdwizard/dvdwizard.h
src/dvdwizard/dvdwizard.h
+0
-1
src/dvdwizard/dvdwizardchapters.cpp
src/dvdwizard/dvdwizardchapters.cpp
+0
-1
src/dvdwizard/dvdwizardmenu.cpp
src/dvdwizard/dvdwizardmenu.cpp
+7
-7
src/dvdwizard/dvdwizardvob.cpp
src/dvdwizard/dvdwizardvob.cpp
+17
-16
src/dvdwizard/dvdwizardvob.h
src/dvdwizard/dvdwizardvob.h
+4
-4
src/effectslist/effectslistview.cpp
src/effectslist/effectslistview.cpp
+3
-3
src/effectslist/effectslistview.h
src/effectslist/effectslistview.h
+0
-2
src/effectslist/effectslistwidget.cpp
src/effectslist/effectslistwidget.cpp
+7
-9
src/effectslist/effectslistwidget.h
src/effectslist/effectslistwidget.h
+1
-1
src/effectslist/initeffects.cpp
src/effectslist/initeffects.cpp
+9
-17
src/effectstack/collapsibleeffect.cpp
src/effectstack/collapsibleeffect.cpp
+23
-22
src/effectstack/collapsibleeffect.h
src/effectstack/collapsibleeffect.h
+1
-2
src/effectstack/collapsiblegroup.cpp
src/effectstack/collapsiblegroup.cpp
+10
-11
src/effectstack/collapsiblegroup.h
src/effectstack/collapsiblegroup.h
+0
-2
src/effectstack/complexparameter.cpp
src/effectstack/complexparameter.cpp
+5
-6
src/effectstack/complexparameter.h
src/effectstack/complexparameter.h
+0
-1
src/effectstack/dragvalue.cpp
src/effectstack/dragvalue.cpp
+3
-9
src/effectstack/dragvalue.h
src/effectstack/dragvalue.h
+0
-1
src/effectstack/effectstackedit.cpp
src/effectstack/effectstackedit.cpp
+0
-3
src/effectstack/effectstackedit.h
src/effectstack/effectstackedit.h
+0
-2
src/effectstack/effectstackview2.cpp
src/effectstack/effectstackview2.cpp
+6
-12
src/effectstack/effectstackview2.h
src/effectstack/effectstackview2.h
+1
-1
src/effectstack/geometryval.cpp
src/effectstack/geometryval.cpp
+12
-13
src/effectstack/keyframeedit.cpp
src/effectstack/keyframeedit.cpp
+5
-5
src/effectstack/parametercontainer.cpp
src/effectstack/parametercontainer.cpp
+3
-4
src/effectstack/widgets/bezier/beziersplineeditor.cpp
src/effectstack/widgets/bezier/beziersplineeditor.cpp
+2
-0
src/effectstack/widgets/bezier/beziersplineeditor.h
src/effectstack/widgets/bezier/beziersplineeditor.h
+0
-1
src/effectstack/widgets/bezier/beziersplinewidget.cpp
src/effectstack/widgets/bezier/beziersplinewidget.cpp
+8
-7
src/effectstack/widgets/choosecolorwidget.cpp
src/effectstack/widgets/choosecolorwidget.cpp
+0
-1
src/effectstack/widgets/colorpickerwidget.cpp
src/effectstack/widgets/colorpickerwidget.cpp
+5
-7
src/effectstack/widgets/colorpickerwidget.h
src/effectstack/widgets/colorpickerwidget.h
+0
-1
src/effectstack/widgets/cornerswidget.cpp
src/effectstack/widgets/cornerswidget.cpp
+3
-5
src/effectstack/widgets/doubleparameterwidget.cpp
src/effectstack/widgets/doubleparameterwidget.cpp
+0
-5
src/effectstack/widgets/geometrywidget.cpp
src/effectstack/widgets/geometrywidget.cpp
+18
-19
src/effectstack/widgets/kis_curve_widget.cpp
src/effectstack/widgets/kis_curve_widget.cpp
+0
-2
src/effectstack/widgets/kis_curve_widget.h
src/effectstack/widgets/kis_curve_widget.h
+0
-3
src/hidetitlebars.cpp
src/hidetitlebars.cpp
+1
-1
src/interfaces.h
src/interfaces.h
+1
-3
src/layoutmanagement.cpp
src/layoutmanagement.cpp
+3
-2
src/layoutmanagement.h
src/layoutmanagement.h
+1
-1
src/lib/audio/audioEnvelope.cpp
src/lib/audio/audioEnvelope.cpp
+1
-1
src/lib/audio/fftCorrelation.h
src/lib/audio/fftCorrelation.h
+0
-1
src/main.cpp
src/main.cpp
+5
-5
src/mainwindow.cpp
src/mainwindow.cpp
+138
-147
src/mainwindow.h
src/mainwindow.h
+29
-35
src/mltconnection.cpp
src/mltconnection.cpp
+4
-5
src/monitor/abstractmonitor.cpp
src/monitor/abstractmonitor.cpp
+1
-2
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+27
-31
src/monitor/monitor.h
src/monitor/monitor.h
+3
-3
src/monitor/monitoreditwidget.cpp
src/monitor/monitoreditwidget.cpp
+5
-6
src/monitor/monitormanager.cpp
src/monitor/monitormanager.cpp
+19
-19
src/monitor/monitorscene.h
src/monitor/monitorscene.h
+1
-1
src/monitor/recmonitor.cpp
src/monitor/recmonitor.cpp
+27
-28
src/monitor/recmonitor.h
src/monitor/recmonitor.h
+10
-14
src/monitor/smallruler.cpp
src/monitor/smallruler.cpp
+1
-1
src/monitor/videoglwidget.cpp
src/monitor/videoglwidget.cpp
+4
-2
src/onmonitoritems/rotoscoping/splineitem.cpp
src/onmonitoritems/rotoscoping/splineitem.cpp
+1
-1
src/project/clipmanager.cpp
src/project/clipmanager.cpp
+19
-18
src/project/clipmanager.h
src/project/clipmanager.h
+6
-8
src/project/clipproperties.cpp
src/project/clipproperties.cpp
+25
-23
src/project/clippropertiesmanager.cpp
src/project/clippropertiesmanager.cpp
+7
-8
src/project/clipstabilize.cpp
src/project/clipstabilize.cpp
+10
-14
src/project/clipstabilize.h
src/project/clipstabilize.h
+2
-3
src/project/cliptranscode.cpp
src/project/cliptranscode.cpp
+10
-10
src/project/cliptranscode.h
src/project/cliptranscode.h
+5
-5
src/project/dialogs/archivewidget.cpp
src/project/dialogs/archivewidget.cpp
+62
-64
src/project/dialogs/archivewidget.h
src/project/dialogs/archivewidget.h
+5
-5
src/project/dialogs/backupwidget.cpp
src/project/dialogs/backupwidget.cpp
+1
-1
src/project/dialogs/backupwidget.h
src/project/dialogs/backupwidget.h
+1
-1
src/project/dialogs/projectsettings.cpp
src/project/dialogs/projectsettings.cpp
+26
-25
src/project/dialogs/projectsettings.h
src/project/dialogs/projectsettings.h
+2
-2
src/project/dialogs/slideshowclip.cpp
src/project/dialogs/slideshowclip.cpp
+16
-14
src/project/dialogs/slideshowclip.h
src/project/dialogs/slideshowclip.h
+2
-2
src/project/folderprojectitem.cpp
src/project/folderprojectitem.cpp
+4
-4
src/project/invaliddialog.cpp
src/project/invaliddialog.cpp
+0
-1
src/project/jobs/abstractclipjob.cpp
src/project/jobs/abstractclipjob.cpp
+0
-1
src/project/jobs/cutclipjob.h
src/project/jobs/cutclipjob.h
+0
-1
src/project/jobs/meltjob.cpp
src/project/jobs/meltjob.cpp
+2
-2
src/project/jobs/meltjob.h
src/project/jobs/meltjob.h
+2
-3
src/project/jobs/proxyclipjob.h
src/project/jobs/proxyclipjob.h
+0
-1
src/project/projectitem.cpp
src/project/projectitem.cpp
+8
-8
src/project/projectitem.h
src/project/projectitem.h
+2
-3
src/project/projectlist.cpp
src/project/projectlist.cpp
+62
-70
src/project/projectlist.h
src/project/projectlist.h
+1
-9
src/project/projectlistview.cpp
src/project/projectlistview.cpp
+2
-0
src/project/projectmanager.cpp
src/project/projectmanager.cpp
+34
-32
src/project/projectmanager.h
src/project/projectmanager.h
+11
-11
src/project/subprojectitem.cpp
src/project/subprojectitem.cpp
+0
-2
src/project/subprojectitem.h
src/project/subprojectitem.h
+0
-1
src/project/transitionsettings.cpp
src/project/transitionsettings.cpp
+2
-2
src/renderer.cpp
src/renderer.cpp
+9
-12
src/renderer.h
src/renderer.h
+5
-5
src/scopes/abstractscopewidget.cpp
src/scopes/abstractscopewidget.cpp
+1
-1
src/scopes/abstractscopewidget.h
src/scopes/abstractscopewidget.h
+1
-1
src/scopes/audioscopes/audiosignal.cpp
src/scopes/audioscopes/audiosignal.cpp
+0
-1
src/scopes/audioscopes/audiospectrum.cpp
src/scopes/audioscopes/audiospectrum.cpp
+3
-1
src/scopes/audioscopes/spectrogram.cpp
src/scopes/audioscopes/spectrogram.cpp
+3
-1
src/scopes/colorscopes/colorplaneexport.cpp
src/scopes/colorscopes/colorplaneexport.cpp
+2
-2
src/scopes/colorscopes/histogram.cpp
src/scopes/colorscopes/histogram.cpp
+4
-1
src/scopes/colorscopes/rgbparade.cpp
src/scopes/colorscopes/rgbparade.cpp
+3
-1
src/scopes/colorscopes/vectorscope.cpp
src/scopes/colorscopes/vectorscope.cpp
+2
-2
src/scopes/colorscopes/waveform.cpp
src/scopes/colorscopes/waveform.cpp
+1
-2
src/simplekeyframes/simplekeyframewidget.cpp
src/simplekeyframes/simplekeyframewidget.cpp
+6
-6
src/simplekeyframes/simplekeyframewidget.h
src/simplekeyframes/simplekeyframewidget.h
+0
-1
src/simplekeyframes/simpletimelinewidget.h
src/simplekeyframes/simpletimelinewidget.h
+0
-1
src/statusbarmessagelabel.cpp
src/statusbarmessagelabel.cpp
+1
-3
src/stopmotion/capturehandler.cpp
src/stopmotion/capturehandler.cpp
+0
-1
src/stopmotion/capturehandler.h
src/stopmotion/capturehandler.h
+0
-1
src/stopmotion/stopmotion.cpp
src/stopmotion/stopmotion.cpp
+10
-12
src/stopmotion/stopmotion.h
src/stopmotion/stopmotion.h
+3
-4
src/timecodedisplay.cpp
src/timecodedisplay.cpp
+1
-2
src/timeline/abstractclipitem.cpp
src/timeline/abstractclipitem.cpp
+1
-1
src/timeline/abstractclipitem.h
src/timeline/abstractclipitem.h
+0
-1
src/timeline/abstractgroupitem.cpp
src/timeline/abstractgroupitem.cpp
+1
-1
src/timeline/clipdurationdialog.cpp
src/timeline/clipdurationdialog.cpp
+0
-1
src/timeline/clipitem.cpp
src/timeline/clipitem.cpp
+3
-3
src/timeline/clipitem.h
src/timeline/clipitem.h
+0
-1
src/timeline/customruler.cpp
src/timeline/customruler.cpp
+9
-8
src/timeline/customtrackscene.cpp
src/timeline/customtrackscene.cpp
+0
-1
src/timeline/customtrackscene.h
src/timeline/customtrackscene.h
+0
-1
src/timeline/customtrackview.cpp
src/timeline/customtrackview.cpp
+17
-20
src/timeline/headertrack.cpp
src/timeline/headertrack.cpp
+15
-16
src/timeline/headertrack.h
src/timeline/headertrack.h
+0
-2
src/timeline/markerdialog.cpp
src/timeline/markerdialog.cpp
+1
-1
src/timeline/spacerdialog.cpp
src/timeline/spacerdialog.cpp
+1
-1
src/timeline/timelinesearch.cpp
src/timeline/timelinesearch.cpp
+2
-2
src/timeline/timelinesearch.h
src/timeline/timelinesearch.h
+3
-3
src/timeline/trackdialog.cpp
src/timeline/trackdialog.cpp
+3
-3
src/timeline/tracksconfigdialog.cpp
src/timeline/tracksconfigdialog.cpp
+6
-6
src/timeline/trackview.cpp
src/timeline/trackview.cpp
+3
-4
src/timeline/trackview.h
src/timeline/trackview.h
+0
-3
src/timeline/transition.cpp
src/timeline/transition.cpp
+1
-1
src/timeline/transition.h
src/timeline/transition.h
+0
-1
src/titler/CMakeLists.txt
src/titler/CMakeLists.txt
+1
-1
src/titler/KoSliderCombo.cpp
src/titler/KoSliderCombo.cpp
+5
-7
src/titler/KoSliderCombo.h
src/titler/KoSliderCombo.h
+2
-2
src/titler/titledocument.cpp
src/titler/titledocument.cpp
+1
-1
src/titler/titledocument.h
src/titler/titledocument.h
+2
-2
src/titler/titlewidget.cpp
src/titler/titlewidget.cpp
+49
-50
src/titler/titlewidget.h
src/titler/titlewidget.h
+3
-3
src/titler/unicodedialog.cpp
src/titler/unicodedialog.cpp
+1
-0
src/ui/titlewidget_ui.ui
src/ui/titlewidget_ui.ui
+134
-122
src/utils/archiveorg.cpp
src/utils/archiveorg.cpp
+4
-5
src/utils/archiveorg.h
src/utils/archiveorg.h
+1
-1
src/utils/freesound.cpp
src/utils/freesound.cpp
+2
-4
src/utils/freesound.h
src/utils/freesound.h
+1
-1
src/utils/openclipart.cpp
src/utils/openclipart.cpp
+1
-1
src/utils/openclipart.h
src/utils/openclipart.h
+0
-1
src/utils/resourcewidget.cpp
src/utils/resourcewidget.cpp
+10
-11
src/utils/resourcewidget.h
src/utils/resourcewidget.h
+1
-2
testingArea/audioOffset.cpp
testingArea/audioOffset.cpp
+0
-3
thumbnailer/CMakeLists.txt
thumbnailer/CMakeLists.txt
+1
-1
thumbnailer/westleypreview.cpp
thumbnailer/westleypreview.cpp
+0
-2
thumbnailer/westleypreview.h
thumbnailer/westleypreview.h
+0
-1
No files found.
CMakeLists.txt
View file @
aadd9305
...
...
@@ -2,18 +2,29 @@ project(Kdenlive)
# An odd patch version number means development version, while an even one means
# stable release. An additional number can be used for bugfix-only releases.
set
(
KDENLIVE_VERSION 0.9.
10
)
set
(
KDENLIVE_VERSION 0.9.
99
)
cmake_minimum_required
(
VERSION 2.8.12
)
# Minimum versions of main dependencies.
set
(
MLT_MIN_MAJOR_VERSION 0
)
set
(
MLT_MIN_MINOR_VERSION 8
)
set
(
MLT_MIN_PATCH_VERSION 8
)
set
(
MLT_MIN_VERSION
${
MLT_MIN_MAJOR_VERSION
}
.
${
MLT_MIN_MINOR_VERSION
}
.
${
MLT_MIN_PATCH_VERSION
}
)
set
(
QT_MIN_VERSION 4.5.0
)
set
(
KDE_MIN_VERSION 4.3.0
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/cmake/modules
)
set
(
QT_MIN_VERSION 5.2.0
)
#set(KDE_MIN_VERSION 4.3.0)
find_package
(
ECM 1.2.0 REQUIRED CONFIG
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
${
CMAKE_SOURCE_DIR
}
/cmake/modules
)
include
(
FeatureSummary
)
include
(
ECMInstallIcons
)
include
(
GenerateExportHeader
)
include
(
KDEInstallDirs
)
include
(
KDECMakeSettings
)
include
(
KDECompilerSettings
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
ECM_MODULE_PATH
}
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
Qt5Widgets_EXECUTABLE_COMPILE_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS
"-fPIC"
)
# To be switched on when releasing.
option
(
RELEASE_BUILD
"Remove Git revision from program version (use for stable releases)"
ON
)
...
...
@@ -49,40 +60,47 @@ check_include_files(malloc.h HAVE_MALLOC_H)
check_include_files
(
pthread.h HAVE_PTHREAD_H
)
# Search KDE and dependent packages.
find_package
(
KDE4
${
KDE_MIN_VERSION
}
REQUIRED
)
include
(
KDE4Defaults
)
include
(
MacroLibrary
)
macro_log_feature
(
KDE4_FOUND
"KDELibs"
"KDE core libraries"
"http://www.kde.org"
TRUE
${
KDE_MIN_VERSION
}
)
#
find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
#
include(KDE4Defaults)
#
include(MacroLibrary)
#
macro_log_feature(KDE4_FOUND
#
"KDELibs"
#
"KDE core libraries"
#
"http://www.kde.org"
#
TRUE
#
${KDE_MIN_VERSION}
#
)
# Find Qt core modules (QtCore and QtGui).
find_package
(
Qt4
${
QT_MIN_VERSION
}
REQUIRED
)
#find_package(Qt4 ${QT_MIN_VERSION} REQUIRED)
find_package
(
Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg OpenGL
)
find_package
(
KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets
DBusAddons KIO KDELibs4Support WidgetsAddons Plotting NotifyConfig NewStuff XmlGui
)
#Service)
# Search MLT package.
find_package
(
MLT
${
MLT_MIN_VERSION
}
REQUIRED
)
macro_log_feature
(
MLT_FOUND
"MLT"
"Multimedia framework and video playout server for TV broadcasting"
"http://mltframework.org"
TRUE
${
MLT_MIN_VERSION
}
)
set_package_properties
(
MLT PROPERTIES
DESCRIPTION
"Multimedia framework and video playout server for TV broadcasting"
URL
"http://mltframework.org"
TYPE RUNTIME
PURPOSE
"Required to do video processing"
)
set
(
MLT_PREFIX
${
MLT_ROOT_DIR
}
)
add_subdirectory
(
data
)
macro_optional_add_subdirectory
(
doc
)
add_subdirectory
(
plugins
)
macro_optional_add_subdirectory
(
po
)
#TODO: re-enable
#macro_optional_add_subdirectory(doc)
#add_subdirectory(plugins)
#macro_optional_add_subdirectory(po)
add_subdirectory
(
renderer
)
add_subdirectory
(
src
)
add_subdirectory
(
thumbnailer
)
#
add_subdirectory(thumbnailer)
#add_subdirectory(testingArea)
macro_display_feature_log
()
configure_file
(
config-kdenlive.h.cmake config-kdenlive.h @ONLY
)
data/CMakeLists.txt
View file @
aadd9305
...
...
@@ -32,7 +32,7 @@ install(FILES kdenlive.xpm DESTINATION share/pixmaps)
install
(
FILES kdenlive.menu DESTINATION share/menu RENAME kdenlive
)
install
(
FILES kdenlive.desktop DESTINATION
${
XDG_APPS_INSTALL_DIR
}
)
find_package
(
SharedMimeInfo REQUIRED
)
#
find_package(SharedMimeInfo REQUIRED)
install
(
FILES kdenlive.xml westley.xml DESTINATION
${
XDG_MIME_INSTALL_DIR
}
)
update_xdg_mimetypes
(
${
XDG_MIME_INSTALL_DIR
}
)
#
update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
data/icons/CMakeLists.txt
View file @
aadd9305
...
...
@@ -3,6 +3,8 @@ install(FILES
novisible.png
DESTINATION
${
DATA_INSTALL_DIR
}
/kdenlive/pics
)
kde4_install_icons
(
${
ICON_INSTALL_DIR
}
)
#TODO: add icon names
#ecm_install_icons( ${ICON_INSTALL_DIR} )
plugins/sampleplugin/CMakeLists.txt
View file @
aadd9305
set
(
sampleplugin_SRCS sampleplugin.cpp
)
kde4_add_ui_files
(
sampleplugin_UIS countdown_ui.ui
)
qt5_wrap_ui
(
sampleplugin_UIS countdown_ui.ui
)
kde4_add_plugin
(
kdenlive_sampleplugin WITH_PREFIX
${
sampleplugin_SRCS
}
...
...
renderer/CMakeLists.txt
View file @
aadd9305
...
...
@@ -6,16 +6,17 @@ set(kdenlive_render_SRCS
renderjob.cpp
)
kde4_
add_executable
(
kdenlive_render
${
kdenlive_render_SRCS
}
)
add_executable
(
kdenlive_render
${
kdenlive_render_SRCS
}
)
include_directories
(
${
QT_INCLUDES
}
)
include
(
${
QT_USE_FILE
}
)
#
include(${QT_USE_FILE})
target_link_libraries
(
kdenlive_render
${
QT_LIBRARIES
}
KF5::KDELibs4Support
)
install
(
TARGETS kdenlive_render DESTINATION
${
BIN_INSTALL_DIR
}
)
src/CMakeLists.txt
View file @
aadd9305
...
...
@@ -8,22 +8,18 @@ find_package(OpenGL REQUIRED)
if
(
APPLE
)
find_package
(
SDL REQUIRED
)
endif
(
APPLE
)
macro_optional_find_package
(
Nepomuk
)
macro_optional_find_package
(
QJSON
)
find_package
(
QJSON
)
option
(
WITH_JogShuttle
"Build Jog/Shuttle support"
ON
)
set
(
FFMPEG_SUFFIX
""
CACHE STRING
"FFmpeg custom suffix"
)
macro_optional_find_package
(
LibV4L2
)
macro_log_feature
(
LIBV4L2_FOUND
"libv4l"
"Collection of video4linux support libraries"
"http://freecode.com/projects/libv4l"
FALSE
""
"Required for better webcam support"
)
find_package
(
LibV4L2
)
set_package_properties
(
LibV4L2 PROPERTIES
DESCRIPTION
"Collection of video4linux support libraries"
URL
"http://freecode.com/projects/libv4l"
TYPE RUNTIME
PURPOSE
"Required for better webcam support"
)
if
(
WITH_JogShuttle
)
check_include_files
(
linux/input.h HAVE_LINUX_INPUT_H
)
...
...
@@ -32,57 +28,42 @@ if(WITH_JogShuttle)
endif
(
HAVE_LINUX_INPUT_H
)
endif
(
WITH_JogShuttle
)
macro_log_feature
(
QT_QTOPENGL_FOUND
"QtOpenGL"
"Qt bindings for the OpenGL library"
"http://qt.nokia.com/products/qt"
TRUE
${
QT_MIN_VERSION
}
"QtOpenGL library and headers (most likely called libqt4-opengl and libqt4-opengl-dev)"
)
macro_log_feature
(
QT_QTSCRIPT_FOUND
"QtScript"
"Qt module providing core scripting facilities"
"http://qt.nokia.com/products/qt"
TRUE
${
QT_MIN_VERSION
}
"QtScript library (most likely called libqt4-script)"
)
set_package_properties
(
LibV4L2 PROPERTIES
DESCRIPTION
"Collection of video4linux support libraries"
URL
"http://freecode.com/projects/libv4l"
TYPE RUNTIME
PURPOSE
"Required for better webcam support"
)
set_package_properties
(
OpenGL PROPERTIES
DESCRIPTION
"the OpenGL library"
URL
""
TYPE RUNTIME
PURPOSE
""
)
set_package_properties
(
QtScript PROPERTIES
DESCRIPTION
"Qt module providing core scripting facilities"
URL
"http://qt.nokia.com/products/qt"
TYPE RUNTIME
PURPOSE
""
)
#if(APPLE)
# macro_log_feature(SDL_FOUND
# "SDL"
# "Cross-platform multimedia library"
# "http://www.libsdl.org"
# TRUE
# )
#endif(APPLE)
set_package_properties
(
QJson PROPERTIES
DESCRIPTION
"Qt module providing core scripting facilities"
URL
"http://qjson.sourceforge.net"
TYPE RUNTIME
PURPOSE
"Required to build the rotoscoping filter and for Freesound.org queries"
)
if
(
APPLE
)
macro_log_feature
(
SDL_FOUND
"SDL"
"Cross-platform multimedia library"
"http://www.libsdl.org"
TRUE
)
endif
(
APPLE
)
macro_log_feature
(
Nepomuk_FOUND
"Nepomuk"
"Support for the Nepomuk semantic desktop system"
"http://nepomuk.semanticdesktop.org"
)
macro_optional_find_package
(
NepomukCore
)
macro_log_feature
(
NepomukCore_FOUND
"NepomukCore"
"Support for the Nepomuk semantic desktop system"
"http://www.kde.org"
)
macro_log_feature
(
QJSON_FOUND
"QJson"
"Qt-based library that maps JSON data to QVariant objects"
"http://qjson.sourceforge.net"
FALSE
""
"Required to build the rotoscoping filter and for Freesound.org queries"
)
install
(
FILES kdenlivesettings.kcfg DESTINATION
${
KCFG_INSTALL_DIR
}
)
k
de4
_add_kcfg_files
(
kdenlive_SRCS kdenlivesettings.kcfgc
)
k
config
_add_kcfg_files
(
kdenlive_SRCS kdenlivesettings.kcfgc
)
add_subdirectory
(
doc
)
add_subdirectory
(
project
)
...
...
@@ -219,7 +200,7 @@ qt4_add_dbus_adaptor(kdenlive_SRCS
MainWindow
)
qt4_add_resources
(
kdenlive_SRCS ui/resources.qrc
)
kde4_
add_executable
(
kdenlive
add_executable
(
kdenlive
${
kdenlive_SRCS
}
${
kdenlive_UIS
}
)
...
...
@@ -244,21 +225,33 @@ include_directories(
# Adds Qt definitions and include directories, and sets QT_LIBRARIES according
# to the components requested in find_package().
include
(
${
QT_USE_FILE
}
)
#include(${QT_USE_FILE})
if
(
${
KDE_VERSION
}
VERSION_LESS 4.3.80
)
set
(
KDE4_KNEWSTUFF_LIBS
${
KDE4_KNEWSTUFF2_LIBS
}
)
else
(
${
KDE_VERSION
}
VERSION_LESS 4.3.80
)
set
(
KDE4_KNEWSTUFF_LIBS
${
KDE4_KNEWSTUFF3_LIBS
}
)
endif
(
${
KDE_VERSION
}
VERSION_LESS 4.3.80
)
target_link_libraries
(
kdenlive
${
KDE4_KDEUI_LIBS
}
${
KDE4_KIO_LIBS
}
${
KDE4_KNEWSTUFF_LIBS
}
${
KDE4_KNOTIFYCONFIG_LIBRARY
}
${
KDE4_KROSSUI_LIBS
}
${
KDE4_SOLID_LIBS
}
KF5::KDELibs4Support
KF5::WidgetsAddons
KF5::Plotting
KF5::Archive
KF5::CoreAddons
KF5::KIOCore
KF5::KIOFileWidgets
KF5::KIOWidgets
KF5::NotifyConfig
KF5::NewStuff
KF5::XmlGui
#KF5::Service
#KF5::KIONTLM
#${KDE4_KDEUI_LIBS}
#${KDE4_KIO_LIBS}
#${KDE4_KNEWSTUFF_LIBS}
#${KDE4_KNOTIFYCONFIG_LIBRARY}
#${KDE4_KROSSUI_LIBS}
#${KDE4_SOLID_LIBS}
${
Qt5_LIBRARIES
}
Qt5::Svg
#Qt5:OpenGL
${
QT_LIBRARIES
}
${
MLT_LIBRARIES
}
${
MLTPP_LIBRARIES
}
...
...
@@ -267,6 +260,8 @@ target_link_libraries(kdenlive
kiss_fft
)
qt5_use_modules
(
kdenlive Script Widgets Concurrent OpenGL
)
if
(
Q_WS_X11
)
include_directories
(
${
X11_Xlib_INCLUDE_PATH
}
)
target_link_libraries
(
kdenlive
${
X11_LIBRARIES
}
)
...
...
src/capture/managecapturesdialog.cpp
View file @
aadd9305
...
...
@@ -28,13 +28,12 @@
#include <QTreeWidgetItem>
#include <QFile>
#include <QHeaderView>
#include <QIcon>
#include <QPixmap>
#include <QTimer>
ManageCapturesDialog
::
ManageCapturesDialog
(
const
KUrl
::
List
&
files
,
QWidget
*
parent
)
ManageCapturesDialog
::
ManageCapturesDialog
(
const
QList
<
QUrl
>
&
files
,
QWidget
*
parent
)
:
QDialog
(
parent
)
{
setFont
(
KGlobalSettings
::
toolBarFont
());
...
...
@@ -42,7 +41,7 @@ ManageCapturesDialog::ManageCapturesDialog(const KUrl::List &files, QWidget * pa
m_importButton
=
m_view
.
buttonBox
->
button
(
QDialogButtonBox
::
Ok
);
m_importButton
->
setText
(
i18n
(
"import"
));
m_view
.
treeWidget
->
setIconSize
(
QSize
(
70
,
50
));
foreach
(
const
K
Url
&
url
,
files
)
{
foreach
(
const
Q
Url
&
url
,
files
)
{
QStringList
text
;
text
<<
url
.
fileName
();
KFileItem
file
(
KFileItem
::
Unknown
,
KFileItem
::
Unknown
,
url
,
true
);
...
...
@@ -77,7 +76,7 @@ void ManageCapturesDialog::slotCheckItemIcon()
QTreeWidgetItem
*
item
=
m_view
.
treeWidget
->
topLevelItem
(
ct
);
//QTreeWidgetItem *item = m_view.treeWidget->currentItem();
if
(
item
->
icon
(
0
).
isNull
())
{
QPixmap
p
=
KThumb
::
getImage
(
K
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()),
0
,
70
,
50
);
QPixmap
p
=
KThumb
::
getImage
(
Q
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()),
0
,
70
,
50
);
item
->
setIcon
(
0
,
QIcon
(
p
));
m_view
.
treeWidget
->
resizeColumnToContents
(
0
);
repaint
();
...
...
@@ -109,7 +108,7 @@ void ManageCapturesDialog::slotDeleteCurrent()
const
int
i
=
m_view
.
treeWidget
->
indexOfTopLevelItem
(
item
);
m_view
.
treeWidget
->
takeTopLevelItem
(
i
);
kDebug
()
<<
"DELETING FILE: "
<<
item
->
text
(
0
);
//KIO::NetAccess::del(
K
Url(item->text(0)), this);
//KIO::NetAccess::del(
Q
Url(item->text(0)), this);
QFile
f
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
());
f
.
remove
();
delete
item
;
...
...
@@ -130,15 +129,15 @@ void ManageCapturesDialog::slotToggle()
}
}
KUrl
::
List
ManageCapturesDialog
::
importFiles
()
QList
<
QUrl
>
ManageCapturesDialog
::
importFiles
()
{
KUrl
::
List
result
;
QList
<
QUrl
>
result
;
const
int
count
=
m_view
.
treeWidget
->
topLevelItemCount
();
for
(
int
i
=
0
;
i
<
count
;
++
i
)
{
QTreeWidgetItem
*
item
=
m_view
.
treeWidget
->
topLevelItem
(
i
);
if
(
item
&&
item
->
checkState
(
0
)
==
Qt
::
Checked
)
result
.
append
(
K
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()));
result
.
append
(
Q
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()));
}
return
result
;
}
...
...
src/capture/managecapturesdialog.h
View file @
aadd9305
...
...
@@ -23,7 +23,7 @@
#include <QPushButton>
#include <
K
Url>
#include <
Q
Url>
#include "ui_managecaptures_ui.h"
...
...
@@ -32,9 +32,9 @@ class ManageCapturesDialog : public QDialog
Q_OBJECT
public:
explicit
ManageCapturesDialog
(
const
KUrl
::
List
&
files
,
QWidget
*
parent
=
0
);
explicit
ManageCapturesDialog
(
const
QList
<
QUrl
>
&
files
,
QWidget
*
parent
=
0
);
~
ManageCapturesDialog
();
KUrl
::
List
importFiles
();
QList
<
QUrl
>
importFiles
();
private
slots
:
void
slotRefreshButtons
();
...
...
src/capture/mltdevicecapture.cpp
View file @
aadd9305
...
...
@@ -25,21 +25,14 @@
#include <mlt++/Mlt.h>
#include <KDebug>
#include <KStandardDirs>
#include <KMessageBox>
#include <KLocalizedString>
#include <KTemporaryFile>
#include <QTimer>
#include <QDir>
#include <QString>
#include <QApplication>
#include <QThread>
#include <cstdlib>
#include <cstdarg>
#include <QDebug>
...
...
src/capture/mltdevicecapture.h
View file @
aadd9305
...
...
@@ -29,9 +29,9 @@
#include <mlt/framework/mlt_types.h>
#include <QtConcurrentRun>
#include <QTimer>
#include <QMutex>
namespace
Mlt
{
class
Consumer
;
...
...
src/capture/v4lcapture.cpp
View file @
aadd9305
...
...
@@ -27,13 +27,8 @@
#include <unistd.h>
#include <fcntl.h>
#include <QDebug>
#include <QImage>
#include <QTimer>
#include <QPainter>
#include <KDebug>
#include <KLocalizedString>
#include <linux/videodev2.h>
#include <sys/ioctl.h>
...
...
src/capture/v4lcapture.h
View file @
aadd9305
...
...
@@ -21,10 +21,7 @@
#define __V4LCAPTUREHANDLER_H__
//#include "src.h"
#include <QWidget>
#include <QObject>
#include <QLayout>
#include <QLabel>
#include <QStringList>
class
V4lCaptureHandler
...
...
src/definitions.cpp
View file @
aadd9305
...
...
@@ -19,6 +19,8 @@
#include "definitions.h"
#include <KLocale>
QDebug
operator
<<
(
QDebug
qd
,
const
ItemInfo
&
info
)
{
qd
<<
"ItemInfo "
<<
&
info
;
...
...
src/definitions.h
View file @
aadd9305
...
...
@@ -24,7 +24,6 @@
#include "gentime.h"
#include "effectslist/effectslist.h"
#include <KLocalizedString>
#include <QDebug>
#include <QTreeWidgetItem>
...
...
src/dialogs/encodingprofilesdialog.cpp
View file @
aadd9305
...
...
@@ -21,13 +21,9 @@
#include "kdenlivesettings.h"
#include <KStandardDirs>
#include <KDebug>
#include <KMessageBox>
#include <KIO/NetAccess>
#include <QDir>
#include <QCloseEvent>
#include <QVBoxLayout>
#include <KLineEdit>
#include <QPlainTextEdit>
...
...
@@ -43,12 +39,12 @@ EncodingProfilesDialog::EncodingProfilesDialog(int profileType, QWidget * parent
profile_type
->
addItem
(
i18n
(
"Screen capture"
),
2
);
profile_type
->
addItem
(
i18n
(
"Decklink capture"
),
3
);
button_add
->
setIcon
(
KIcon
(
"list-add"
));
button_edit
->
setIcon
(
KIcon
(
"document-edit"
));
button_delete
->
setIcon
(
KIcon
(
"list-remove"
));
button_download
->
setIcon
(
KIcon
(
"download"
));
button_add
->
setIcon
(
QIcon
::
fromTheme
(
"list-add"
));
button_edit
->
setIcon
(
QIcon
::
fromTheme
(
"document-edit"
));
button_delete
->
setIcon
(
QIcon
::
fromTheme
(
"list-remove"
));
button_download
->
setIcon
(
QIcon
::
fromTheme
(
"download"
));
m_configFile
=
new
KConfig
(
"encodingprofiles.rc"
,
KConfig
::
CascadeConfig
,
"appdata"
);
m_configFile
=
new
KConfig
(
"encodingprofiles.rc"
,
KConfig
::
CascadeConfig
,
QStandardPaths
::
DataLocation
);
profile_type
->
setCurrentIndex
(
profileType
);
connect
(
profile_type
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
slotLoadProfiles
()));
connect
(
profile_list
,
SIGNAL
(
currentRowChanged
(
int
)),
this
,
SLOT
(
slotShowParams
()));
...
...
src/dialogs/encodingprofilesdialog.h
View file @
aadd9305
...
...
@@ -21,6 +21,7 @@
#ifndef ENCODINGPROFILESDIALOG_H
#define ENCODINGPROFILESDIALOG_H
#include <KConfigGroup>
#include "definitions.h"
#include "ui_manageencodingprofile_ui.h"
...
...
src/dialogs/kdenlivesettingsdialog.cpp
View file @
aadd9305
...
...
@@ -23,14 +23,15 @@
#include "kdenlivesettings.h"
#include "renderer.h"
#ifdef USE_V4L
#include "capture/v4lcapture.h"
#endif
#include <KStandardDirs>
//#include <KService>
#include <KDebug>
#include <kopenwithdialog.h>
#include <KConfigDialogManager>
//#include <KOpenWithDialog>
#include <kde_file.h>
#include <KIO/NetAccess>