fix webcam capture sometimes not working

Signed-off-by: Jean-Baptiste Mardelle <jb@kdenlive.org>

.gitignore

@@ -1,3 +1,4 @@
 *~
-build
-CMakeLists.txt.user
+build*
+CMakeLists.txt.user*
+po

.tarignore

@@ -0,0 +1,8 @@
+*~
+build
+CMakeLists.txt.user*
+.kdev*
+*.kdev*
+.git*
+.tarignore
+*.sh

AUTHORS

@@ -1,26 +1,35 @@
 Active Kdenlive authors
 
+    Vincent Pinon <vpinon@april.org>
+        Bugs fixing, release
+        2012-present
     Jean-Baptiste Mardelle <jb@kdenlive.org>
-        MLT and KDE SC 4 porting, main developer and maintainer
+        MLT and KDE SC 4 porting, main developer
         2005-present
-    Marco Gittler <g.marco@freenet.de>
-        MLT transitions and effects, timeline, audio thumbs
-        2009-present
-    Dan Dennedy <dan@dennedy.org>
-        Bug fixing, etc.
-        2009-present
-    Simon A. Eugster (Granjow) <simon.eu@gmail.com>
-        Colour and audio scopes, titler, manual, bug fixing, etc.
-        2009-present
+    Laurent Montel <montel@kde.org>
+        Bugs fixing, code clean up, review
+        2013-present
     Till Theato <root@ttill.de>
         Bug fixing, etc.
         2010-present
-    Alberto Villa <avilla@FreeBSD.org>
-        Bug fixing, logo, etc.
-        2009-present
+    Steve Guilford <s.guilford@dbplugins.com>
+        Bug fixing
+        2014
 
 Former Kdenlive authors
 
+    Simon A. Eugster (Granjow) <simon.eu@gmail.com>
+        Colour and audio scopes, titler, manual, bug fixing, etc.
+        2009-2012
+    Marco Gittler <g.marco@freenet.de>
+        MLT transitions and effects, timeline, audio thumbs
+        2009-2012
+    Dan Dennedy <dan@dennedy.org>
+        Bug fixing
+        2009-2011
+    Alberto Villa <avilla@FreeBSD.org>
+        Bug fixing, logo, etc.
+        2009-2013
     Jean-Michel Poure <jm@poure.com>
         Rendering profiles customization
         2004-2009

CMakeLists.txt

@@ -1,95 +1,91 @@
-project(kdenlive)
+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.4)
-
+set(KDENLIVE_VERSION 0.9.99)
+cmake_minimum_required(VERSION 2.8.12)
 # Minimum versions of main dependencies.
-set(LIBMLT_MIN_VERSION 0.8.6)
-set(QT_MIN_VERSION 4.5.0)
-set(KDE_MIN_VERSION 4.3.0)
+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(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+set(QT_MIN_VERSION 5.2.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)
+
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
+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)
+option(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" OFF)
 
 # Get current version.
-set(VERSION "\"${KDENLIVE_VERSION}\"")
-if(NOT RELEASE_BUILD)
-  if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
-    # Probably a Git workspace: determine the revision.
-    find_package(Git)
-    if(GIT_FOUND)
+set(KDENLIVE_VERSION_STRING "${KDENLIVE_VERSION}")
+if(NOT RELEASE_BUILD AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+  # Probably a Git workspace; determine the revision.
+  find_package(Git QUIET)
+  if(GIT_FOUND)
+    exec_program(${GIT_EXECUTABLE}
+      ${CMAKE_SOURCE_DIR}
+      ARGS "describe --tags"
+      OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
+      RETURN_VALUE TAG_RESULT
+    )
+    # git describe --tags failed; maybe the repository was checked with depth=1.
+    if(NOT ${TAG_RESULT} EQUAL 0)
       exec_program(${GIT_EXECUTABLE}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ARGS "describe --tags"
+        ${CMAKE_SOURCE_DIR}
+        ARGS "describe --always"
         OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
-        RETURN_VALUE TAG_RESULT
       )
-      # git describe --tags failed, for example it fails if repo was checked with depth=1
-      if(NOT ${TAG_RESULT} EQUAL 0)
-        exec_program(${GIT_EXECUTABLE}
-          ${CMAKE_CURRENT_SOURCE_DIR}
-          ARGS "describe --always"
-          OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
-        )
-      endif(NOT ${TAG_RESULT} EQUAL 0)
-      message("Current Kdenlive Git revision is ${KDENLIVE_GIT_REVISION}")
-      set(VERSION "\"${KDENLIVE_VERSION} (rev. ${KDENLIVE_GIT_REVISION})\"")
-    else(GIT_FOUND)
-      message("Could not determine the Git revision")
-    endif(GIT_FOUND)
-  endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
-endif(NOT RELEASE_BUILD)
+    endif()
+    message(STATUS "Kdenlive Git revision: ${KDENLIVE_GIT_REVISION}")
+    set(KDENLIVE_VERSION_STRING "${KDENLIVE_VERSION} (rev. ${KDENLIVE_GIT_REVISION})")
+  else()
+    message(STATUS "Kdenlive Git revision could not be determined")
+  endif()
+endif()
 
 include(CheckIncludeFiles)
 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(Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg OpenGL)
+
+find_package(KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets 
+                            DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools)
 
-# Find Qt core modules (QtCore and QtGui).
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED)
 
 # Search MLT package.
-find_package(LIBMLT ${LIBMLT_MIN_VERSION} REQUIRED)
-if(LIBMLT_VERSION VERSION_LESS ${LIBMLT_MIN_VERSION})
-  set(LIBMLT_FOUND FALSE)
-endif(LIBMLT_VERSION VERSION_LESS ${LIBMLT_MIN_VERSION})
-macro_log_feature(LIBMLT_FOUND
-  "MLT"
-  "Multimedia framework and video playout server for TV broadcasting"
-  "http://mltframework.org"
-  TRUE
-  ${LIBMLT_MIN_VERSION}
-)
+find_package(MLT ${MLT_MIN_VERSION} REQUIRED)
+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(effects)
-add_subdirectory(export)
-add_subdirectory(icons)
-add_subdirectory(lumas)
-add_subdirectory(man)
-add_subdirectory(plugins)
-macro_optional_add_subdirectory(po)
+add_subdirectory(doc)
+#add_subdirectory(plugins)
+#ecm_optional_add_subdirectory(po)
 add_subdirectory(renderer)
 add_subdirectory(src)
 add_subdirectory(thumbnailer)
-add_subdirectory(titles)
-add_subdirectory(testingArea)
+#add_subdirectory(testingArea)
+
 
-macro_display_feature_log()
 
 configure_file(config-kdenlive.h.cmake config-kdenlive.h @ONLY)
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

ChangeLog

@@ -1,3 +1,138 @@
+0.9.10
+    Changes:
+    * handle VBR encoding profiles, and use it!
+    * video stabilizer: added new "vid.stab", removed older ones
+    * environment variable MLT_PREFIX overrides profiles & melt path
+    * several fixes for high dpi screens
+    * change proxy profile, obsolete with libav
+    * add SVG to image formats for slideshows	
+    * restore project render bitrate (#3326)
+    * show proxy name in clipproperties
+    * add link to MLT doc in render edit dialog (#3355)
+
+    Bug fix:
+    * update maximum track height (#3241)
+    * resize render path box (#3300)
+    * change transition settings layout (#3336)
+    * heat colormap in spectrogram (#3142)
+    * fix clip monitor switch on proxy creation end (#3308)
+    * fix clip jobs (stabilize) operating on proxies (#3337)
+    * fix timeline corruption by clip resize end + zoom change
+    * fix title clip duration not taken into account (#3309)
+    * fix timeline thumbs flicker when fully zoomed (#3247)
+    * fix thumbnailer aspect ratio
+    * fix fades for split audio (#3323)
+    * fix transcoding (#3334)
+    * fix 'Clip in Timeline' when project monitor is inactive (#3261)
+    * fix audio analysis (use dynamic memory instead of stack)
+    * fix render end notification
+    * fix render timecode overlay (#3260)	
+    * set tooltip for monitor pause button (#3256)
+    * fix slideshow clips adding 1 frame (#3289)
+    * fix archive project icon (#3325)
+    * fix compilation on armhf (#3345)
+    * don't allow creating keyframes for "fixed" filters (#2956)	
+    * re-enable compilation on KDE < 4.5 (squeeze) (#3319)
+    * re-enable Clip menu (fix bug #3347)
+    * fix screen recording failure (#3358)
+    * fix crash detected with undo/redo (bug #3240)
+    * fix crash cutting group on a clip edge (#3312, #3350)
+    * fix crash on image sequence (#3331)
+    * fix crash in tracks config editor (#3367)
+    * fix crash on audiofiles
+    * fix crash on opening project file with images
+    * fix warnings from static analyzers (cppcheck, krazy)
+    * sort source files, easier to understand (for new developpers)
+
+0.9.8
+    Changes:
+    * Clean encoding profiles using MLT presets & profiles
+    * Fades ui: video instead of audio on AV clips
+    * Support a custom suffix for FFmpeg binaries (mostly for packagers)
+    * Make audio align work asynchronously
+    * Remove the MLT processing threads option that never really worked
+    * Copy proxies with 'move project'
+    * Add support for JogShuttle on newer systems, make shuttle device selection more straightforward, add ProV2 keys
+
+    Bug fix:
+    * Code cleanup (use const ref, fix includes, mem leaks, optimize...)
+    * Fix warnings from gcc, cppcheck, clang, scan-build: fixes many crashs & leaks
+    * Fix keyframing messed up for some effects
+    * Fix timeline corruption when trying to move clip before 0
+    * Fix crash when closing title widget
+    * Fix thumbnails for image clips in timeline
+    * Fix crash on quick undo/redo (#3240)
+    * Fix multithreading (#3186)
+    * Fix some problems with transitions keyframes
+    * Fix scopes (#3052)
+
+0.9.6
+
+    Changes:
+    * New Median filter from Marko Cebokli
+    * Show project duration in status bar
+    * Add reverse clip to clip actions (#2933)
+    * Make audio / video bitrate easily configurable in custom render profiles (#3012)
+    * Implement deinterlacer and rescale options for MLT consumer
+    * Automatic recovery of corrupted files produced by Kdenlive 0.9.4
+    * Make monitor ruler slightly bigger so it's easier to click for seeking
+    * Show clip size & fps in project tree tooltip
+    * Allow retrieval of metadata created by Magic Lantern for canon cams
+
+    Bug fix:
+    * Fix font GUI issue (#3049)
+    * Fixes timeline corruption by spacer tool
+    * Correctly handle unsupported filters
+    * Remove space from filename start / end in render dialog (#3018)
+    * Fix possible crash when changing speed effect
+    * Fix vstab angle parameter (#2955)
+    * Fix playlist corruption & crash when moving clip (#3046)
+    * Fix moving transition sometimes losing properties (#3025)
+    * Fix crash in title widget (#3032)
+    * Fix crash when doing clip resize and clicking item quickly
+    * Fix wrong group moving when groups overlap
+    * Set document as modified when changing project metadata (#2996)
+    * Don't corrupt project when adding a title clip and a transition already is in place
+    * Fix monitor displaying corrupt image on startup (#2992)
+    * Fix clip monitor not activated on open (#2992)
+    * Fix cutting of geometry keyframes (like pan & zoom) (#2991)
+    * Optimize jogshuttle code
+    * Fix metadata not properly set for project (#2996)
+    * Fix "Clip in project tree" in groups (#2781)
+    * Fix keyframes when undoing a clip / group cut
+    * Fix double click in a timeline clip to add keyframe
+    * Warn before overwriting stabilized clip
+    * Fix monitor focus on ruler wheel event
+    * Fix proxy of playlist aspect ratio broken on some locales
+    * Fix Coverity warnings from v0.9.4
+    * Fix crash when opening invalid file from command line (#2984)
+    * Fix DVD chapters broken when using an intro movie, show chapters in monitor ruler
+    * Fix small UI bugs in title widget (#1257)
+    * Fix timeline seek sometimes not refreshing on last frame of the seek, small update for monitor ruler colors
+    * Small cleanup in render widget, fix error message (no matching profile) sometimes appearing when it should not
+    * Fix monitor timecode not visible with some window decorations (#2979)
+    * Fix moving guide bug
+    * Fix some clips metadata corrupting project file (#2976)
+    * Fix possible crash on track deletion (#2967)
+    * Fix compilation on OSX (moc issue)
+    * Fix keyframe line not painted over clips in timeline
+
+0.9.4
+    * Fix color parameter in some effects not working correctly (#2644)
+    * Fix V4l licensing issue (#2632)
+    * Fix keyframes lost / broken when pasting an effect
+
+0.9.2
+    * Fix firewire capture (preview not showing)
+    * Fix freeze when reloading previously missing clip
+    * Fade effects lost when moving / resizing clip
+    * Undoing change in clip crop start breaking clip
+    * Make disabling of track effects possible
+    * Fix slideshow clips not working
+    * Fix crash on composite transition
+    * Fix crash when opening stop motion widget
+    * Fix rendering of projects created in another locale
+
 0.9
     * Fix monitor effect scene sometimes forcing monitor minimum size
     * Improve detection of locale issues (default to POSIX when there is a locale conflict on the system)
@@ -9,16 +144,16 @@
     * Introduce grouping of effects; groups can also be saved
     * Allow dragging an effect to another clip/track
     * Allow record monitor to go fullscreen
-    * Image sequences can now start at an arbitrary frame (http://kdenlive.org/mantis/view.php?id=2508)
+    * Image sequences can now start at an arbitrary frame (#2508)
     * Add automatic clip alignment based on audio (experimental, has to be manually enabled)s
     * Allow archiving for offline use (only archive proxies)
-    * Offline editing: Allow working on project with only proxies available (http://kdenlive.org/mantis/view.php?id=2509)
+    * Offline editing: Allow working on project with only proxies available (#2509)
     * Allow rendering to another framerate
     * Check for missing locale and ask to install instead of opening corrupted project
     * Allow to open project files manually extracted from archived project
-    * Support dropping a folder in the project tree (http://kdenlive.org/mantis/view.php?id=1288)
-    * Add "select all clips in track" and "select all clips in timeline" features (http://kdenlive.org/mantis/view.php?id=1950)
-    * Put audio effects in subcategories to avoid uberlong menus (http://kdenlive.org/mantis/view.php?id=2436)
+    * Support dropping a folder in the project tree (#1288)
+    * Add "select all clips in track" and "select all clips in timeline" features (#1950)
+    * Put audio effects in subcategories to avoid uberlong menus (#2436)
     * Support for project metadata (can be embedded in rendered file)
     * Add Online Resource Widget allowing easy search and download of online services (freesound, openclipart, archive.org)
     * Introduce MLT clip analysis to get auto normalize data in sox gain effect
@@ -34,25 +169,25 @@
     * Add date column to project tree
 
     * Fix clip move sometimes giving error when it should work 
-    * Fix custom effects not considering capital letters in name (http://kdenlive.org/mantis/view.php?id=2580)
+    * Fix custom effects not considering capital letters in name (#2580)
     * Fix script rendering when script name contains whitespace
-    * Ensure clip in project tree is visible after rename (scroll if necessary) (http://kdenlive.org/mantis/view.php?id=2563)
+    * Ensure clip in project tree is visible after rename (scroll if necessary) (#2563)
     * Fix monitor scene never resetting scrollbars
-    * Fix issues with transitions when inserting track (http://kdenlive.org/mantis/view.php?id=2477)
+    * Fix issues with transitions when inserting track (#2477)
     * Fix some GUI elements not responding to color theme change
-    * Do not hide render profile list when there is only one item to avoid confusion (http://kdenlive.org/mantis/view.php?id=2543)
-    * Fix consecutive error messages overwriting each other (http://www.kdenlive.org/mantis/view.php?id=2519)
+    * Do not hide render profile list when there is only one item to avoid confusion (#2543)
+    * Fix consecutive error messages overwriting each other (#2519)
     * Fix crash when editing properties of several missing clips
-    * Fix vectorscope for 24b RGB images (http://kdenlive.org/mantis/view.php?id=2478)
-    * Fix archiving sometimes not saving playlist clips and subclips (http://kdenlive.org/mantis/view.php?id=2475)
-    * Fix archiving feature not saving playlist clips and slowmotion clips inside them (http://kdenlive.org/mantis/view.php?id=2475)
-    * Fix crash recovery feature issues with long or non UTF-8 filenames (http://kdenlive.org/mantis/view.php?id=2441, http://kdenlive.org/mantis/view.php?id=2450)
+    * Fix vectorscope for 24b RGB images (#2478)
+    * Fix archiving sometimes not saving playlist clips and subclips (#2475)
+    * Fix archiving feature not saving playlist clips and slowmotion clips inside them (#2475)
+    * Fix crash recovery feature issues with long or non UTF-8 filenames (#2441), (#2450)
     * Fix rendering jobs sometimes not starting
-    * Fix crash on proxy creation (concurrency issue) (http://kdenlive.org/mantis/view.php?id=2471)
-    * Fix zone playing (http://kdenlive.org/mantis/view.php?id=2468)
+    * Fix crash on proxy creation (concurrency issue) (#2471)
+    * Fix zone playing (#2468)
     * Fix click on monitor sometimes not triggering play
-    * Fix crash when moving a folder and a clip in project tree (http://kdenlive.org/mantis/view.php?id=2458)
-    * Fix color change not working in title widget (http://kdenlive.org/mantis/view.php?id=2459)
+    * Fix crash when moving a folder and a clip in project tree (#2458)
+    * Fix color change not working in title widget (#2459)
     * Fix slideshow clips created with invalid frame duration
     * Fix profile warning with clips that have 1088 pixels height
     * Fix unnecessary proxy reload on document load
@@ -84,16 +219,16 @@
     * Improve way of picking an average color of an area.
     * Make audio bitrate in render dialog selectable.
     * Add support for handling different versions of filters and add rules to convert between them.
-    * Move all cached data in one operation, so that user does not get one dialog box for each file in case of duplicates. (http://kdenlive.org/mantis/view.php?id=2297)
+    * Move all cached data in one operation, so that user does not get one dialog box for each file in case of duplicates. (#2297)
     * Show filter version in filter info box.
-    * When multiple clips are selected do not allow resizing, but moving only. (http://kdenlive.org/mantis/view.php?id=2257)
+    * When multiple clips are selected do not allow resizing, but moving only. (#2257)
     * Add remux with MKV transcode preset.
     * Make audio only render profiles faster by telling ffmpeg to skip video.
     * Open documents using a locale different to the system as read only.
     * Replace locale-dependent comma with slash in geometry value.
     * Add Kdenlive manual converted from UserBase QuickStart page.
-    * Improve handling of missing luma files. (http://kdenlive.org/mantis/view.php?id=2216)
-    * Remove the "avformat-novalidate" trick for faster loading, caused crash. (http://kdenlive.org/mantis/view.php?id=2205)
+    * Improve handling of missing luma files. (#2216)
+    * Remove the "avformat-novalidate" trick for faster loading, caused crash. (#2205)
     * Allow to assign a shortcut to usage of proxies in project.
     * Use separate thread for generation of timeline thumbnails when zoom is at frame level to keep UI responsive.
     * Allow to use JScript in render profile parameter values. Values that need evalutation need to be indicated by '%'.
@@ -113,56 +248,56 @@
     * Fix encoding of dvd vob menu file.
     * Fix possible crash when doing fast start/stop.
     * Fix multiple concurrency crashes related to thumbnail and proxy creation.
-    * Fix name of dvgrab captured file. (http://kdenlive.org/mantis/view.php?id=2344)
-    * Fix issues with simultaneous 2-pass rendering (x264). (http://kdenlive.org/mantis/view.php?id=2338)
-    * Fix rendering progress not shown if multiple copies of Kdenlive are open. (http://kdenlive.org/mantis/view.php?id=1265)
-    * Fix DVD chapters discarded when opening from render dialog. (http://kdenlive.org/mantis/view.php?id=2335)
+    * Fix name of dvgrab captured file. (#2344)
+    * Fix issues with simultaneous 2-pass rendering (x264). (#2338)
+    * Fix rendering progress not shown if multiple copies of Kdenlive are open. (#1265)
+    * Fix DVD chapters discarded when opening from render dialog. (#2335)
     * Fix possible corruption caused by vertical offset of transitions in timeline.
     * Fix aspect ratio of thumbnails to correctly use the project's arpect ratio.
-    * Fix bitrate broken when editing render profile or making it a favorite. (http://kdenlive.org/mantis/view.php?id=2321)
-    * Fix audio issues in rendered file when using a recent ffmpeg version by replacing 'b' with 'vb' (ffmpeg bitrate parameter). (http://kdenlive.org/mantis/view.php?id=2318)
-    * Fix rendering to Flash could be broken by setting the number of encoder threads. (http://kdenlive.org/mantis/view.php?id=2312)
+    * Fix bitrate broken when editing render profile or making it a favorite. (#2321)
+    * Fix audio issues in rendered file when using a recent ffmpeg version by replacing 'b' with 'vb' (ffmpeg bitrate parameter). (#2318)
+    * Fix rendering to Flash could be broken by setting the number of encoder threads. (#2312)
     * Fix DVD wizard losing chapters data when switching to menu page.
     * Fix previewing of affine transitions with transparent png.
     * Fix timeline corruption when using 'Remove space' tool (transitions could overlap).
     * Fix 'adjust to original size' and 'fit to width/height' for title and color clips in geometry widget (pan and zoom, composite, affine).
     * Fix vorbis rendering by setting the audio quality (aq).
     * Rotoscoping: do not allow to add keyframes until initial spline is created to avoid corruptions.
-    * Fix possible crash in DVD wizard chapters. (http://kdenlive.org/mantis/view.php?id=2264)
+    * Fix possible crash in DVD wizard chapters. (#2264)
     * Do not duplicate effect stack after split audio but move audio effects only.
     * Fix issues related to the usage of comma as numeric separator in some locales.
     * Fix build on GNU/kFreeBSD.
-    * Fix cursor not visible in title widget. (http://kdenlive.org/mantis/view.php?id=2231)
-    * Fix aspect ratio in title widget background image. (http://kdenlive.org/mantis/view.php?id=2225)
-    * Fix layout in save profile dialog. (http://kdenlive.org/mantis/view.php?id=2224)
+    * Fix cursor not visible in title widget. (#2231)
+    * Fix aspect ratio in title widget background image. (#2225)
+    * Fix layout in save profile dialog. (#2224)
     * Fix timeline corruption because resizing a clip end could overlap another clip in some cases.
     * Fix last keyframe for composite transition (and other geometry effects) inserted one frame after the end of the transition.
-    * Prevent crash when deleting a clip while playing. (http://kdenlive.org/mantis/view.php?id=2200)
+    * Prevent crash when deleting a clip while playing. (#2200)
     * Disable save action if we are in the same state as last save.
-    * Fix pan and zoom keyframes lost after clip resize. (http://kdenlive.org/mantis/view.php?id=2210)
+    * Fix pan and zoom keyframes lost after clip resize. (#2210)
     * Fix mouse wheel in slider section of (effect) parameters with a large range (> 1000).
     * Fix GUI setup issues with some list parameters (for effects).
     * Fix timecode widget not communicating changes upon focus leave.
     * Fix list of effects in effect stack taking up to much space by default.
-    * Fix transition track not correctly saved. (http://kdenlive.org/mantis/view.php?id=2187)
-    * Fix "save zone" saving proxy instead of real clip. (http://kdenlive.org/mantis/view.php?id=2184)
-    * Fix freeze when saving while timeline is at maximum zoom. (http://kdenlive.org/mantis/view.php?id=2174)
-    * Fix crash when deleting a track and having an audio clip on last track. (http://kdenlive.org/mantis/view.php?id=2168)
-    * Do not allow to create overlapping transitions that could corrupt timeline. (http://kdenlive.org/mantis/view.php?id=1901)
-    * Fix sometimes effects were missing. (http://kdenlive.org/mantis/view.php?id=2152)
+    * Fix transition track not correctly saved. (#2187)
+    * Fix "save zone" saving proxy instead of real clip. (#2184)
+    * Fix freeze when saving while timeline is at maximum zoom. (#2174)
+    * Fix crash when deleting a track and having an audio clip on last track. (#2168)
+    * Do not allow to create overlapping transitions that could corrupt timeline. (#1901)
+    * Fix sometimes effects were missing. (#2152)
     * Fix crash in histogram scope.
-    * Fix multiple possible timeline corruptions. (http://kdenlive.org/mantis/view.php?id=2157)
-    * Do not allow rendering to a frame rate different than current project's profile. (http://kdenlive.org/mantis/view.php?id=2138)
+    * Fix multiple possible timeline corruptions. (#2157)
+    * Do not allow rendering to a frame rate different than current project's profile. (#2138)
     * Fix DVD menu entries hidden under some circumstances.
-    * Fix channels in audio thumbnails being displaced by one frame. (http://kdenlive.org/mantis/view.php?id=1976)
-    * Fix possible crash caused by audio thumbnails. (http://kdenlive.org/mantis/view.php?id=2147)
-    * Fix possible freeze and error on project opening. (http://kdenlive.org/mantis/view.php?id=2144)
+    * Fix channels in audio thumbnails being displaced by one frame. (#1976)
+    * Fix possible crash caused by audio thumbnails. (#2147)
+    * Fix possible freeze and error on project opening. (#2144)
     * Fix progress bar running twice on 2pass render.
     * Fix proxy file path issue on system installation.
     * Use luma as default channel for levels effect.
     * Fix handling of proxies when duration != duration of original clip.
-    * Fix filename encoding problem in renderer. (http://kdenlive.org/mantis/view.php?id=2110)
-    * Fix user specified CFLAGS ignored. (http://kdenlive.org/mantis/view.php?id=2108)
+    * Fix filename encoding problem in renderer. (#2110)
+    * Fix user specified CFLAGS ignored. (#2108)
 
 0.8
     See http://kdenlive.org/discover/0.8

HACKING

@@ -1,110 +0,0 @@
-This is the coding guideline for Kdenlive.
-
-Committing
-    Auto-indent
-        Please don't use for existing files. It is very likely to break manual tweaks like:
-            const int componentFlags =   (ui->cbY->isChecked() ? 1 : 0) * HistogramGenerator::ComponentY
-                                       | (ui->cbS->isChecked() ? 1 : 0) * HistogramGenerator::ComponentSum
-                                       | (ui->cbR->isChecked() ? 1 : 0) * HistogramGenerator::ComponentR
-                                       | (ui->cbG->isChecked() ? 1 : 0) * HistogramGenerator::ComponentG
-                                       | (ui->cbB->isChecked() ? 1 : 0) * HistogramGenerator::ComponentB;
-        which are intended to improve readability.
-
-    Changelog
-        When adding a new feature, add it to the CHANGELOG file. Features often are not mentioned
-        in the bug tracker; adding it to the changelog helps keeping track of them.
-
-    Bug fixes
-        Bugs often are in mantis. When fixing a bug, add a link to the bug tracker entry in the commit log
-        and close the bug there.
-        If the bug is not in mantis, it should be (a) added (and marked as fixed) if it is an important bug,
-        or (b) not added otherwise.
-
-
-Source code comments
-    Classes
-        Each class should be shortly described in its header file.
-
-    Functions
-        Public functions should be documented as well in the header file. Especially regarding side effects!
-        (What does a programmer neeed to know in order to use this function without reading the whole source code?)
-
-    Inline comments
-        are very helpful for commands (function calls, calculations) that are not obvious. For example, what
-        does this function call do?
-
-            davinci.drawLine(0, y, scopeRect().size().width()-RGBParadeGenerator::distRight, y);
-
-        A short comment makes it obvious (also helps locating bugs when something needs to be fixed):
-
-            // Draw a horizontal line through the current mouse position
-            davinci.drawLine(0, y, scopeRect().size().width()-RGBParadeGenerator::distRight, y);
-
-
-API documentation
-    The docs can be generated by using doxygen (doxygen DoxyConfig in the main directory).
-    See [1] for an overview of doxygen commands.
-    Often used: \brief, \param, \return
-
-
-Coding style
-    This part is based on Krita's HACKING file[2].
-
-    Indentation, Braces etc.
-        4 Spaces for indentation. Always braces.
-        This is, according to the Qt4 coding style, which is documented here:
-        http://techbase.kde.org/Policies/Kdelibs_Coding_Style
-
-    Includes
-        Avoid as much as possible #includes in header files; use forward declarations
-        of classes.
-
-    Initializers
-        Avoid as much as possible initializers in the body of the constructor. Use
-        initializer lists instead.
-
-    Scope prefixes
-        Use only m_ for class-level variables. No other scope prefixes; no g_, l_,
-        no 'p' for pointer variables.
-
-    Shared pointers
-        Use shared pointers wherever possible.
-
-    Getter/setter
-        Getter/setters are named x() for getters and setX(int x) for setters. If you
-        come across violations of this rule, change the code.
-
-    Function naming
-        Functions should be named in camelBackedFashion, to conform to Qt's standards.
-        If you encounter functions in c_style_like_this, feel free to rename. Also:
-        verbNoun -- i.e., rotateLayer, not layer_rotate. The latter is a true c-ism,
-        introduced by a language that needs to prefix the 'class' name to every function
-        in order to have something that not quite OO.
-
-    Variable/Parameter names
-        Variable/parameter names start with an undercast letter. A name composed of different
-        words is done in camelBackedStyle.
-
-    Files and classes
-        It's preferred (and strongly preferred) to have only one class per .h/.cpp file.
-        (Which is logical, because otherwise you won't be able to keep to the naming scheme.)
-
-    Spaces
-        Keep the source airy and open. In particular, there should be empty lines between function
-        declarations and definitions.
-
-    Slots and signals
-        Prefix slots with slot and signals with signal: slotUpdateSelection, signalSelectionUpdated.
-
-    Boolean operators
-        Use the standard !, !=, ==, && etc style, not the "not", "and" etc. style. Keep kdenlive code
-        using one, easily recognizable, C++ style.
-
-
-    Exceptions
-        These rules are merely guidelines for making the code consistent and more readable. In some cases
-        it makes sense to not follow some of the points mentioned above.
-
-
-[1] http://www.stack.nl/~dimitri/doxygen/commands.html
-[2] http://quickgit.kde.org/?p=calligra.git&a=blob_plain&h=3e8fcab9dd3588c0228498af2795d3b714b73d42&f=krita/HACKING

INSTALL

@@ -1,22 +0,0 @@
-Kdenlive installation instrucions
-=================================
-
-To compile and install, go in the source directory and type:
-
-mkdir build;cd build
-cmake ..
-(If you want to install in a different path, use instead:
-cmake .. -DCMAKE_INSTALL_PREFIX=/install/path)
-make
-
-To install, become root:
-
-sudo make install
-(enter root password at prompt)
-
-Once installed, you can start Kdenlive by typing "kdenlive".
-
-Note that you should also install MLT to do anything useful with Kdenlive. See
-the README file for details.
-
-Have Fun!

Messages.sh

@@ -1,8 +1,8 @@
 #!bin/sh
 
-kdenlive_subdirs="plugins renderer src src/widgets"
+kdenlive_subdirs="plugins renderer src src/ui"
 
-$EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp
+$EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay data/effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp
 $EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -o -name \*.ui` >> rc.cpp
 
 $XGETTEXT `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` *.cpp -o $podir/kdenlive.pot

README

@@ -1,28 +1,52 @@
-Kdenlive 0.9.4
-by Jean-Baptiste Mardelle <jb@kdenlive.org> and the Kdenlive team
+About Kdenlive
+==============
 
-Kdenlive is a video editing application based on KDE Platform 4.
+Kdenlive is a video editing application,
+based on MLT Framework and KDE Platform 4.
 
-Please check the project page for more information, and to report new bugs.
+Please check the project page for more information:
+https://kdenlive.org
 
-http://kdenlive.org
+Building from source
+====================
 
-To use Kdenlive, you will need to download and install MLT, available from
-the following web page:
+You will first need to install development headers dependencies
+from your system (mainly KDE and MLT).
 
-http://www.mltframework.org
+Then in the directory where you extracted the source archive
+(with custom /install/path):
 
-It is recommended to use the latest MLT version. It may work with older
-versions, but this is not guaranteed, or (at this stage of development) likely.
+mkdir build
+cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=/install/path
+make -j4
+sudo make install
 
-We welcome all bug reports, feedback, and offers for help!
-So please visit our bug tracker and forums:
+and then run
+/install/path/bin/kdenlive
 
-Forum:
-http://kdenlive.org/forum
+Alternately, to get kdenlive with an up-to-date multimedia stack
+(isolated from your system), you can use the build-kdenlive.sh from:
+https://github.com/mltframework/mlt-scripts/
 
-Bug Tracker:
-http://kdenlive.org/mantis
+Contributing
+============
 
-Cheers,
-Jean-Baptiste
+We welcome all feedback and offers for help!
+
+* Talk about us!
+* Report bugs you encounter (if not already done) on:
+  https://bugs.kde.org
+* Help other users on forum and bug tracker:
+  http://forum.kde.org/viewforum.php?f=262
+* Help to fill the manual at:
+  http://userbase.kde.org/Kdenlive
+* Complete and check application and documentation translation:
+  http://l10n.kde.org
+* Prepare video tutorials (intro, special tricks...) in your language
+  and send us a link to add in homepage or doc
+* Detail improvement suggestions
+  we don't test every (any?) other video editor, so give precise explanations
+* Code! Help fixing bugs, improving usability, optimizing, porting...
+  register on KDE infrastructure, study its guidelines, and pick from roadmap:
+  http://community.kde.org/Kdenlive/Roadmap

README.translators

@@ -1,20 +0,0 @@
-This file is intended to contain tips and Q/A for translating.
-
-* What is String Freeze?
-  Some weeks (usually 2) before a new release, string freeze is declared. From
-  then it is guaranteed that no strings in the source code will be changed
-  anymore so that translators can work without constantly having to update again
-  and again.
-
-* There is a duplicate string (like «Clip:» and «Clip: » or «Audio device» and
-  «Audio Device»). What to do?
-  File a bug report on Mantis so that they can be corrected for the next
-  release.
-
-* There is some other weird thing (singular form has to be translated both
-  separately and together with its plural form, etc.).
-  As above: bug report.
-
-* There is HTML and some CDATA tags in a string to translate.
-  Yes. This is not a mistake but intended, for formatting. Please keep these
-  tags. :)

RELEASE

@@ -1,39 +0,0 @@
-This file contains a to-do-list for releases. In braces the responsible person; none given means everybody.
-
-All time
-    Community
-        Blog about new features that have been added.
-        Also: Facebook      http://www.facebook.com/pages/Kdenlive/168566469873278
-              Twitter
-              identi.ca
-
-Before the release
-    Discover page
-        Add blog entries to the discover page (http://kdenlive.org/discover/0.8 but with updated version number).
-        Add the changelog as well.
-
-    The dot (jb?)
-        Prepare an article for http://dot.kde.org/ (may take some days until it is accepted) (they say)
-
-    Notifications (jb?)
-        * Notify devs, testers, and translators of the String/Feature Freeze
-        * Notify packagers about the new release when it's done
-
-    Freeze
-        About two weeks before a new release feature and string freeze will be introduced. This allows:
-        * Translators to translate Kdenlive everything on time. (Strings must not be changed anymore
-          in the source code, otherwise the translators would have to fix it again and so on.)
-        * Testers on finding remaining bugs
-        * Developers to focus on bug fixing (and not introducing new bugs with new features)
-
-    Testers
-        Ideally mobilize as many testers as possible to find remaining bugs before the version is released!
-
-    Manual (Granjow)
-        Update the manual (push to git) from the Userbase
-        http://userbase.kde.org/Kdenlive
-        http://userbase.kde.org/How_To_Convert_a_UserBase_Manual_to_Docbook
-
-After the release
-    Mantis
-        Close all entries that have been resolved in this release.

TODO

@@ -1,70 +0,0 @@
-Some ideas for a big refactoring of code.
-
-
-Input
-=========
-        handle MLT connection ((re-)move from renderer.cpp (hacks, special cases))
-        handle project document entry
-        draw layer on clip instances in timeline (thumbnails)
-        settings management (available through project tree items)
-        proxy creation
-        input method (register mimetype in file dialog, custom widget)
-        effect support (a, v, av, special effects (freeze, speed))
-	support for multi-channel sound (5.1, ...)
-
-        => modules for avformat, qimage/gtk_image(?), generators (slideshow, color, f0r)
-
-
-Timeline
-=========
-        provides basic operations (resize, move, add, remove) (GUI + XML + MLT) to be applied on any item
-
-        => modules for input modes (drag & drop, 3/4-point editing, cut, resize by dragging end), spacer, ripple edit, push/pull edit, ...)
-
-Clip instances
--------
-        connection to input module
-        manage project document entry
-        information about support for timeline operations
-        owns an effect device
-        per instance settings (functionality provided by input module)
-        graphical timeline item (modules can register layers they want to draw (thumbnails, effect names, keyframes))
-
-Clip groups
-------
-        manage project document entry
-        pass on operations to items
-
-
-Effect system
-=========
-Keyframe manager
-------
-        pipe information from/to timeline effect device, effect stack, effect parameter
-
-Effect parameter
-------
-        custom widget
-        function to handle keyframes -> connect to keyframe manager
-        written in QScript/QML ?
-
-Effect device
-------
-        manages list of effects attached to clip, track, timeline, group, the world
-        passes info from/to timeline items and effect stack
-        manage project document entry
-
-
-Project
-=========
-        read/write
-        project settings management
-        provide functionality to manage settings (remove hardcoded stuff (slideshow, proxy, ...))
-
-
-Interface
-=========
-        provide functions to add menu items, global actions (for shortcut management)
-        layout management
-        styles management (see digikam)
-        ...

cmake/modules/FindGLEW.cmake

@@ -0,0 +1,105 @@
+# Copyright (c) 2009 Boudewijn Rempt <boud@valdyas.org>                                                                                          
+#                                                                                                                                                
+# Redistribution and use is allowed according to the terms of the BSD license.                                                                   
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. 
+# 
+# - try to find glew library and include files
+#  GLEW_INCLUDE_DIR, where to find GL/glew.h, etc.
+#  GLEW_LIBRARIES, the libraries to link against
+#  GLEW_FOUND, If false, do not try to use GLEW.
+# Also defined, but not for general use are:
+#  GLEW_GLEW_LIBRARY = the full path to the glew library.
+
+IF (WIN32)
+
+  IF(CYGWIN)
+
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h)
+
+    FIND_LIBRARY( GLEW_GLEW_LIBRARY glew32
+      ${OPENGL_LIBRARY_DIR}
+      /usr/lib/w32api
+      /usr/X11R6/lib
+    )
+
+
+  ELSE(CYGWIN)
+  
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
+      $ENV{GLEW_ROOT_PATH}/include
+    )
+
+    FIND_LIBRARY( GLEW_GLEW_LIBRARY
+      NAMES glew glew32
+      PATHS
+      $ENV{GLEW_ROOT_PATH}/lib
+      ${OPENGL_LIBRARY_DIR}
+    )
+
+  ENDIF(CYGWIN)
+
+ELSE (WIN32)
+
+  IF (APPLE)
+# These values for Apple could probably do with improvement.
+    FIND_PATH( GLEW_INCLUDE_DIR glew.h
+      /System/Library/Frameworks/GLEW.framework/Versions/A/Headers
+      ${OPENGL_LIBRARY_DIR}
+    )
+    SET(GLEW_GLEW_LIBRARY "-framework GLEW" CACHE STRING "GLEW library for OSX")
+    SET(GLEW_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
+  ELSE (APPLE)
+
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
+      /usr/include/GL
+      /usr/openwin/share/include
+      /usr/openwin/include
+      /usr/X11R6/include
+      /usr/include/X11
+      /opt/graphics/OpenGL/include
+      /opt/graphics/OpenGL/contrib/libglew
+    )
+
+    FIND_LIBRARY( GLEW_GLEW_LIBRARY GLEW
+      /usr/openwin/lib
+      /usr/X11R6/lib
+    )
+
+  ENDIF (APPLE)
+
+ENDIF (WIN32)
+
+SET( GLEW_FOUND "NO" )
+IF(GLEW_INCLUDE_DIR)
+  IF(GLEW_GLEW_LIBRARY)
+    # Is -lXi and -lXmu required on all platforms that have it?
+    # If not, we need some way to figure out what platform we are on.
+    SET( GLEW_LIBRARIES
+      ${GLEW_GLEW_LIBRARY}
+      ${GLEW_cocoa_LIBRARY}
+    )
+    SET( GLEW_FOUND "YES" )
+
+#The following deprecated settings are for backwards compatibility with CMake1.4
+    SET (GLEW_LIBRARY ${GLEW_LIBRARIES})
+    SET (GLEW_INCLUDE_PATH ${GLEW_INCLUDE_DIR})
+
+  ENDIF(GLEW_GLEW_LIBRARY)
+ENDIF(GLEW_INCLUDE_DIR)
+
+IF(GLEW_FOUND)
+  IF(NOT GLEW_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Glew: ${GLEW_LIBRARIES}")
+  ENDIF(NOT GLEW_FIND_QUIETLY)
+ELSE(GLEW_FOUND)
+  IF(GLEW_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Glew")
+  ENDIF(GLEW_FIND_REQUIRED)
+ENDIF(GLEW_FOUND)
+
+MARK_AS_ADVANCED(
+  GLEW_INCLUDE_DIR
+  GLEW_GLEW_LIBRARY
+  GLEW_Xmu_LIBRARY
+  GLEW_Xi_LIBRARY
+)

cmake/modules/FindLIBMLT.cmake

@@ -1,72 +0,0 @@
-#
-# Find the MLT includes and libraries.
-#
-
-include(FindPkgConfig)
-pkg_check_modules(MLT mlt++)
-add_definitions(-DMLT_PREFIX=\\\"\"${MLT_PREFIX}\"\\\")
-
-find_path(LIBMLT_INCLUDE_DIR
-  NAMES framework/mlt.h
-  PATHS
-    ${MLT_INCLUDEDIR}/mlt
-    ${MLT_PREFIX}/include/mlt
-    /usr/local/include/mlt
-    /usr/include/mlt
-  NO_DEFAULT_PATH
-)
-
-find_library(LIBMLT_LIBRARY
-  NAMES mlt
-  PATHS
-    ${MLT_LIBDIR}
-    ${MLT_PREFIX}/lib
-    /usr/local/lib
-    /usr/lib
-  NO_DEFAULT_PATH
-)
-
-find_path(LIBMLTPLUS_INCLUDE_DIR
-  NAMES mlt++/Mlt.h
-  PATHS
-    ${MLT_INCLUDEDIR}
-    ${MLT_PREFIX}/include
-    /usr/local/include
-    /usr/include
-  NO_DEFAULT_PATH
-)
-
-find_library(LIBMLTPLUS_LIBRARY
-  NAMES mlt++
-  PATHS
-    ${MLT_LIBDIR}
-    ${MLT_PREFIX}/lib
-    /usr/local/lib
-    /usr/lib
-  NO_DEFAULT_PATH
-)
-
-if(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR)
-  set(LIBMLT_FOUND 1)
-  set(LIBMLT_LIBRARIES ${LIBMLT_LIBRARY})
-else(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR)
-  set(LIBMLT_FOUND 0)
-endif(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR)
-
-if(LIBMLT_FOUND AND LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
-  set(LIBMLT_FOUND 1)
-  set(LIBMLTPLUS_LIBRARIES ${LIBMLTPLUS_LIBRARY})
-else(LIBMLT_FOUND AND LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
-  set(LIBMLT_FOUND 0)
-endif(LIBMLT_FOUND AND LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
-
-if(LIBMLT_FOUND)
-  set(LIBMLT_VERSION ${MLT_VERSION})
-  if(NOT LIBMLT_FIND_QUIETLY)
-    message(STATUS "Found MLT++: ${LIBMLTPLUS_LIBRARY}")
-  endif(NOT LIBMLT_FIND_QUIETLY)
-else(LIBMLT_FOUND)
-  if(LIBMLT_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find MLT++")
-  endif(LIBMLT_FIND_REQUIRED)
-endif(LIBMLT_FOUND)

cmake/modules/FindMLT.cmake

@@ -0,0 +1,64 @@
+# Find the MLT includes and libraries
+#
+# Copyright (c) 2007-2012 Jean-Baptiste Mardell (jb@kdenlive.org)
+# Copyright (c) 2012 Alberto Villa <avilla@FreeBSD.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_MLT QUIET mlt++)
+
+find_path(MLT_INCLUDE_DIR
+  NAMES framework/mlt.h
+  HINTS
+    ${PC_MLT_INCLUDEDIR}
+    ${PC_MLT_PREFIX}/include
+  PATHS
+    /usr/local/include
+    /usr/include
+  PATH_SUFFIXES mlt
+)
+
+find_library(MLT_LIBRARIES
+  NAMES mlt
+  HINTS
+    ${PC_MLT_LIBDIR}
+    ${PC_MLT_PREFIX}/lib
+  PATHS
+    /usr/local/lib
+    /usr/lib
+)
+
+find_path(MLTPP_INCLUDE_DIR
+  NAMES mlt++/Mlt.h
+  HINTS
+    ${PC_MLT_INCLUDEDIR}
+    ${PC_MLT_PREFIX}/include
+  PATHS
+    /usr/local/include
+    /usr/include
+)
+
+find_library(MLTPP_LIBRARIES
+  NAMES mlt++
+  HINTS
+    ${PC_MLT_LIBDIR}
+    ${PC_MLT_PREFIX}/lib
+  PATHS
+    /usr/local/lib
+    /usr/lib
+)
+
+get_filename_component(MLT_ROOT_DIR ${MLTPP_INCLUDE_DIR} PATH)
+
+if(PC_MLT_VERSION)
+  set(MLT_VERSION_STRING ${PC_MLT_VERSION})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MLT
+  REQUIRED_VARS MLT_LIBRARIES MLTPP_LIBRARIES MLT_INCLUDE_DIR MLTPP_INCLUDE_DIR
+  VERSION_VAR MLT_VERSION_STRING
+)
+
+mark_as_advanced(MLT_INCLUDE_DIR MLT_LIBRARIES MLTPP_INCLUDE_DIR MLTPP_LIBRARIES)

cmake/modules/FindQJSON.cmake

@@ -1,11 +1,16 @@
 # Find QJSON - JSON handling library for Qt
-# Source: http://gitorious.org/libmygpo-qt/libmygpo-qt/blobs/634b150fabdcafddcfb98a9a08cc414d95ae0dbe/cmake/modules/FindQJSON.cmake
 #
 # This module defines
 #  QJSON_FOUND - whether the qsjon library was found
 #  QJSON_LIBRARIES - the qjson library
 #  QJSON_INCLUDE_DIR - the include path of the qjson library
 #
+# Copyright (c) 2010 Pino Toscano, <toscano.pino@tiscali.it>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
 
 if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
 
@@ -18,25 +23,23 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
     # use pkg-config to get the values of QJSON_INCLUDE_DIRS
     # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
     include (FindPkgConfig)
-    pkg_check_modules (QJSON REQUIRED QJson>=0.5)
+    pkg_check_modules (PC_QJSON REQUIRED QJson>=0.5)
   endif (NOT WIN32)
 
   find_library (QJSON_LIBRARIES
     NAMES
     qjson
     PATHS
-    ${QJSON_LIBRARY_DIRS}
+    ${PC_QJSON_LIBRARY_DIRS}
     ${LIB_INSTALL_DIR}
     ${KDE4_LIB_DIR}
   )
 
   find_path (QJSON_INCLUDE_DIR
     NAMES
-    parser.h
-    PATH_SUFFIXES
-    qjson
+    qjson/parser.h
     PATHS
-    ${QJSON_INCLUDE_DIRS}
+    ${PC_QJSON_INCLUDE_DIRS}
     ${INCLUDE_INSTALL_DIR}
     ${KDE4_INCLUDE_DIR}
   )

config-kdenlive.h.cmake

@@ -1,7 +1,14 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#cmakedefine VERSION @VERSION@
+#define KDENLIVE_VERSION "@KDENLIVE_VERSION_STRING@"
+
+#define MLT_PREFIX "@MLT_PREFIX@"
+#define MLT_MIN_MAJOR_VERSION @MLT_MIN_MAJOR_VERSION@
+#define MLT_MIN_MINOR_VERSION @MLT_MIN_MINOR_VERSION@
+#define MLT_MIN_PATCH_VERSION @MLT_MIN_PATCH_VERSION@
+
+#define FFMPEG_SUFFIX "@FFMPEG_SUFFIX@"
 
 #cmakedefine HAVE_MALLOC_H 1
 #cmakedefine HAVE_PTHREAD_H 1

data/CMakeLists.txt

@@ -1,4 +1,34 @@
-install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png metadata.properties blacklisted_effects.txt blacklisted_transitions.txt encodingprofiles.rc DESTINATION ${DATA_INSTALL_DIR}/kdenlive )
-install( FILES kdenliveeffectscategory.rc DESTINATION  ${CONFIG_INSTALL_DIR} )
-install (FILES kdenlive.xpm DESTINATION share/pixmaps)
-install (FILES kdenlive.menu DESTINATION share/menu RENAME kdenlive)
+add_subdirectory(effects)
+add_subdirectory(icons)
+add_subdirectory(lumas)
+add_subdirectory(man)
+add_subdirectory(titles)
+install(FILES
+  banner.png
+  blacklisted_effects.txt
+  blacklisted_transitions.txt
+  encodingprofiles.rc
+  metadata.properties
+  meta_ffmpeg.png
+  meta_libav.png
+  meta_magiclantern.png
+  timeline_athumbs.png
+  timeline_avthumbs.png
+  timeline_nothumbs.png
+  timeline_vthumbs.png
+  kdenliveeffectscategory.rc
+  kdenlivetranscodingrc
+  DESTINATION ${DATA_INSTALL_DIR}/kdenlive)
+install(FILES  kdenlive.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+install(FILES kdenlive_projectprofiles.knsrc kdenlive_renderprofiles.knsrc kdenlive_wipes.knsrc kdenlive_titles.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
+install(FILES kdenliveui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdenlive)
+install(FILES profiles.xml DESTINATION ${DATA_INSTALL_DIR}/kdenlive/export)
+install(FILES kdenlive.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
+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)
+install(FILES kdenlive.xml westley.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+

data/XmlMessages.sh

@@ -0,0 +1,22 @@
+function get_files
+{
+    echo kdenlive.xml
+}
+
+function po_for_file
+{
+    case "$1" in
+       kdenlive.xml)
+           echo kdenlive_xml_mimetypes.po
+       ;;
+    esac
+}
+
+function tags_for_file
+{
+    case "$1" in
+       kdenlive.xml)
+           echo comment
+       ;;
+    esac
+}

data/blacklisted_effects.txt

@@ -25,6 +25,7 @@ frei0r.cluster
 frei0r.c0rners
 frei0r.coloradj_RGB
 frei0r.colordistance
+frei0r.colortap
 frei0r.contrast0r
 frei0r.curves
 frei0r.defish0r
@@ -75,6 +76,8 @@ frei0r.vignette
 
 
 #MLT effects with XML UI
+channelcopy
+crop
 dust
 grain
 lines
@@ -82,10 +85,8 @@ oldfilm
 tcolor
 rotoscoping
 wave
-volume
 vignette
-crop
-
+volume
 
 #Effects not usable with a simple GUI
 sox

data/effects/CMakeLists.txt

@@ -16,6 +16,7 @@ gamma.xml
 grain.xml
 greyscale.xml
 invert.xml
+loudness.xml
 mirror.xml
 mute.xml
 normalise.xml
@@ -74,6 +75,7 @@ frei0r_levels.xml
 frei0r_lightgraffiti.xml
 frei0r_luminance.xml
 frei0r_mask0mate.xml
+frei0r_medians.xml
 frei0r_nervous.xml
 frei0r_nosync0r.xml
 frei0r_pixeliz0r.xml

data/effects/channelcopy.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
- <effect tag="channelcopy" id="channelcopy" type="audio">
+ <effect tag="channelcopy" id="stereocopy" type="audio">
          <name>Mono to stereo</name>
          <description>Copy one channel to another</description>
          <author>Dan Dennedy</author>

data/effects/dust.xml

@@ -3,7 +3,7 @@
 	<name>Dust</name>
 	<description>Add dust and specks to the video, as in old movies</description>
 	<author>Marco Gittler</author>
-	<parameter type="double" name="maxdiameter" max="100" min="0" default="2">
+	<parameter type="double" name="maxdiameter" max="100" min="0" default="2" suffix="%">
 		<name>Maximal Diameter</name>
 	</parameter>
 	<parameter type="double" name="maxcount" max="400" min="0" default="10">

data/effects/dynamictext.xml

@@ -6,7 +6,7 @@
     <parameter type="geometry" name="geometry" default="0%/0%:100%x100%:100" fixed="0">
         <name>Geometry</name>
     </parameter>
-    <parameter type="fontfamily" name="family" default="Sans">
+    <parameter type="fontfamily" name="family" default="DejaVu Sans">
         <name>Font Family</name>
     </parameter>
     <parameter type="constant" name="size" max="200" min="8" default="48">

data/effects/frei0r_medians.xml

@@ -0,0 +1,17 @@
+<!DOCTYPE kpartgui>
+<effect LC_NUMERIC="C" tag="frei0r.medians" id="frei0r.medians">
+	<name>Medians</name>
+	<description>Implements several median-type filters</description>
+	<author>Marko Cebokli</author>
+	
+	<parameter type="list" name="Type" default="Square3x3" paramlist="Cross5;Square3x3;Bilevel;Diamond3x3;Square5x5;Temp3;Temp5;ArceBI;ML3D;ML3dEX;VarSize">
+                <paramlistdisplay>Cross5,Square3x3,Bilevel,Diamond3x3,Square5x5,Temp3,Temp5,ArceBI,ML3D,ML3dEX,VarSize</paramlistdisplay>
+		<name>Type</name>
+	</parameter>
+
+	<parameter type="constant" name="Size" default="5" min="0" max="50" factor="50">
+	<name>Size</name>
+	</parameter>
+	
+
+</effect>