openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Python and Ruby Bindings with new classes

Browse Source 
Update cmake build scripts
This commit is contained in:
Jonathan Thomas
2015-02-05 00:10:00 -06:00
parent bf73482244
commit 6607f81922
4 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/CMakeLists.txt
View File

@@ -44,19 +44,28 @@ IF (APPLE)
ENDIF(APPLE)
################ IMAGE MAGICK ##################
# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
IF (MAGICKCORE_QUANTUM_DEPTH)
add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} )
ELSE (MAGICKCORE_QUANTUM_DEPTH)
add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=16 )
ENDIF (MAGICKCORE_QUANTUM_DEPTH)
IF (MAGICKCORE_HDRI_ENABLE)
add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} )
ELSE (MAGICKCORE_HDRI_ENABLE)
add_definitions( -DMAGICKCORE_HDRI_ENABLE=0 )
ENDIF (MAGICKCORE_HDRI_ENABLE)
IF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=${OPENSHOT_IMAGEMAGICK_COMPATIBILITY} )
ELSE (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=0 )
ENDIF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
# Find the ImageMagick++ library
FIND_PACKAGE(ImageMagick REQUIRED COMPONENTS Magick++ MagickWand MagickCore)
# Include ImageMagick++ headers (needed for compile)
include_directories(${ImageMagick_INCLUDE_DIRS})
# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
IF (MAGICKCORE_QUANTUM_DEPTH)
add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} )
ENDIF (MAGICKCORE_QUANTUM_DEPTH)
IF (MAGICKCORE_HDRI_ENABLE)
add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} )
ENDIF (MAGICKCORE_HDRI_ENABLE)
################### FFMPEG #####################
# Find FFmpeg libraries (used for video encoding / decoding)
@@ -173,6 +182,7 @@ SET ( OPENSHOT_SOURCE_FILES
FrameMapper.cpp
KeyFrame.cpp
ImageReader.cpp
ImageWriter.cpp
PlayerBase.cpp
Point.cpp
Profiles.cpp
@@ -239,19 +249,19 @@ SET ( REQUIRED_LIBRARIES
target_link_libraries(openshot ${REQUIRED_LIBRARIES})
############### TEST EXECUTABLE ################
############### CLI EXECUTABLE ################
# Create test executable
add_executable(example Main.cpp)
# Link test executable to the new library
target_link_libraries(example openshot)
############### TEST QT EXECUTABLE ################
############### PLAYER EXECUTABLE ################
# Create test executable
add_executable(demo_player Qt/demo/main.cpp)
add_executable(openshot_player Qt/demo/main.cpp)
# Link test executable to the new library
target_link_libraries(demo_player openshot)
target_link_libraries(openshot_player openshot)
############### TEST BLACKMAGIC CAPTURE APP ################
IF (BLACKMAGIC_FOUND)

2
src/bindings/python/openshot.i
View File

@@ -70,6 +70,7 @@
#include "../../../include/Frame.h"
#include "../../../include/FrameMapper.h"
#include "../../../include/ImageReader.h"
#include "../../../include/ImageWriter.h"
#include "../../../include/PlayerBase.h"
#include "../../../include/Point.h"
#include "../../../include/Profiles.h"
@@ -112,6 +113,7 @@
%include "../../../include/Frame.h"
%include "../../../include/FrameMapper.h"
%include "../../../include/ImageReader.h"
%include "../../../include/ImageWriter.h"
%include "../../../include/PlayerBase.h"
%include "../../../include/Point.h"
%include "../../../include/Profiles.h"

2
src/bindings/ruby/openshot.i
View File

@@ -76,6 +76,7 @@ namespace tr1
#include "../../../include/Frame.h"
#include "../../../include/FrameMapper.h"
#include "../../../include/ImageReader.h"
#include "../../../include/ImageWriter.h"
#include "../../../include/PlayerBase.h"
#include "../../../include/Point.h"
#include "../../../include/Profiles.h"
@@ -118,6 +119,7 @@ namespace tr1
%include "../../../include/Frame.h"
%include "../../../include/FrameMapper.h"
%include "../../../include/ImageReader.h"
%include "../../../include/ImageWriter.h"
%include "../../../include/PlayerBase.h"
%include "../../../include/Point.h"
%include "../../../include/Profiles.h"

26
tests/CMakeLists.txt
View File

@@ -41,21 +41,29 @@ FIND_PACKAGE(UnitTest++ REQUIRED)
include_directories(${UNITTEST++_INCLUDE_DIR})
################ IMAGE MAGICK ##################
# Find the ImageMagick++ library
FIND_PACKAGE(ImageMagick COMPONENTS Magick++ MagickWand MagickCore)
# Include ImageMagick++ headers (needed for compile)
include_directories(${ImageMagick_INCLUDE_DIRS})
# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
IF (MAGICKCORE_QUANTUM_DEPTH)
add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} )
MESSAGE("-- MAGICKCORE_QUANTUM_DEPTH = ${MAGICKCORE_QUANTUM_DEPTH}")
ELSE (MAGICKCORE_QUANTUM_DEPTH)
add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=16 )
ENDIF (MAGICKCORE_QUANTUM_DEPTH)
IF (MAGICKCORE_HDRI_ENABLE)
add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} )
MESSAGE("-- MAGICKCORE_HDRI_ENABLE = ${MAGICKCORE_HDRI_ENABLE}")
ELSE (MAGICKCORE_HDRI_ENABLE)
add_definitions( -DMAGICKCORE_HDRI_ENABLE=0 )
ENDIF (MAGICKCORE_HDRI_ENABLE)
IF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=${OPENSHOT_IMAGEMAGICK_COMPATIBILITY} )
ELSE (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=0 )
ENDIF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
# Find the ImageMagick++ library
FIND_PACKAGE(ImageMagick REQUIRED COMPONENTS Magick++ MagickWand MagickCore)
# Include ImageMagick++ headers (needed for compile)
include_directories(${ImageMagick_INCLUDE_DIRS})
################### FFMPEG #####################
# Find FFmpeg libraries (used for video encoding / decoding)
@@ -140,8 +148,10 @@ IF (ENABLE_TESTS)
SET ( OPENSHOT_TEST_FILES ${OPENSHOT_TEST_FILES}
Cache_Tests.cpp
Clip_Tests.cpp
Color_Tests.cpp
Coordinate_Tests.cpp
ReaderBase_Tests.cpp
ImageWriter_Tests.cpp
FFmpegReader_Tests.cpp
FFmpegWriter_Tests.cpp
Fraction_Tests.cpp