Merge branch 'develop' into hardware-support

Author: eisneinechse

src/CMakeLists.txt

@@ -199,10 +199,12 @@ endif(RESVG_FOUND)
 ################### JSONCPP #####################
 # Include jsoncpp headers (needed for JSON parsing)
 if (USE_SYSTEM_JSONCPP)
+	message(STATUS "Discovering system JsonCPP (USE_SYSTEM_JSONCPP enabled)")
 	find_package(JsonCpp REQUIRED)
 	include_directories(${JSONCPP_INCLUDE_DIRS})
+	message(STATUS "Discovering system JsonCPP - done")
 else()
-	message("-- Could NOT find JsonCpp library (Using embedded JsonCpp instead)")
+	message(STATUS "Using embedded JsonCpp (USE_SYSTEM_JSONCPP not enabled)")
 	include_directories("../thirdparty/jsoncpp/include")
 endif(USE_SYSTEM_JSONCPP)
 

src/bindings/ruby/CMakeLists.txt

@@ -30,10 +30,10 @@ FIND_PACKAGE(SWIG 2.0 REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 ### Enable some legacy SWIG behaviors, in newer CMAKEs
-if (CMAKE_VERSION VERSION_GREATER 3.13)
+if (POLICY CMP0078)
 	cmake_policy(SET CMP0078 OLD)
 endif()
-if (CMAKE_VERSION VERSION_GREATER 3.14)
+if (POLICY CMP0086)
 	cmake_policy(SET CMP0086 OLD)
 endif()
 

src/examples/OpenShot Wipe Tests.py

@@ -1,42 +1,44 @@
 import openshot
 
-# Create a empty clip
-t = openshot.Timeline(720, 480, openshot.Fraction(24,1), 44100, 2)
+# Create an empty timeline
+t = openshot.Timeline(720, 480, openshot.Fraction(24,1), 44100, 2, openshot.LAYOUT_STEREO)
+t.Open()
 
 # lower layer
-lower = openshot.ImageReader("/home/jonathan/apps/libopenshot/src/examples/back.png")
+lower = openshot.QtImageReader("back.png")
 c1 = openshot.Clip(lower)
 c1.Layer(1)
 t.AddClip(c1)
 
 # higher layer
-higher = openshot.ImageReader("/home/jonathan/apps/libopenshot/src/examples/front3.png")
+higher = openshot.QtImageReader("front3.png")
 c2 = openshot.Clip(higher)
 c2.Layer(2)
 #c2.alpha = openshot.Keyframe(0.5)
 t.AddClip(c2)
 
 # Wipe / Transition
 brightness = openshot.Keyframe()
-brightness.AddPoint(1, 100.0, openshot.BEZIER)
-brightness.AddPoint(24, -100.0, openshot.BEZIER)
+brightness.AddPoint(1, 1.0, openshot.BEZIER)
+brightness.AddPoint(24, -1.0, openshot.BEZIER)
 
 contrast = openshot.Keyframe()
 contrast.AddPoint(1, 20.0, openshot.BEZIER)
 contrast.AddPoint(24, 20.0, openshot.BEZIER)
 
-e = openshot.Wipe("/home/jonathan/apps/libopenshot/src/examples/mask.png", brightness, contrast)
+reader = openshot.QtImageReader("mask.png")
+e = openshot.Mask(reader, brightness, contrast)
 e.Layer(2)
 e.End(60)
 t.AddEffect(e)
 
-e1 = openshot.Wipe("/home/jonathan/apps/libopenshot/src/examples/mask2.png", brightness, contrast)
+reader1 = openshot.QtImageReader("mask2.png")
+e1 = openshot.Mask(reader1, brightness, contrast)
 e1.Layer(2)
 e1.Order(2)
 e1.End(60)
 #t.AddEffect(e1)
 
-
 for n in range(1,25):
- print n
+ print(n, end=" ", flush=1)
  t.GetFrame(n).Save("%s.png" % n, 1.0)

tests/CMakeLists.txt

@@ -226,5 +226,5 @@ IF (NOT DISABLE_TESTS)
 
 	#################### MAKE TEST ######################
 	# Hook up the 'make os_test' target to the 'openshot-test' executable
-	ADD_CUSTOM_TARGET(os_test ${CMAKE_CURRENT_BINARY_DIR}/openshot-test)
+	ADD_CUSTOM_TARGET(os_test COMMAND openshot-test)
 ENDIF (NOT DISABLE_TESTS)