FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, "attached you'll find a fix for Registry.cpp not using the QTKit-plugin for video-files. W/o this fix you had to preload the plugin to open movie-files."

Browse Source
This commit is contained in:
Robert Osfield 2012-10-04 13:45:54 +00:00
parent 1796d55bea
commit 23786604c6
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeModules/FindQuickTime.cmake
View File

@ -63,4 +63,10 @@ IF(APPLE)
SET(QUICKTIME_FOUND "NO")
ENDIF()
ENDIF()
# Disable quicktime for >= 10.7, as it's officially deprecated
IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9")
MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}")
SET(QUICKTIME_FOUND "NO")
ENDIF()
ENDIF()

4
src/osgDB/CMakeLists.txt
View File

@ -133,7 +133,9 @@ IF(APPLE)
ADD_DEFINITIONS(-DDARWIN_IMAGEIO)
ENDIF()
ENDIF()
IF(QTKIT_FOUND)
ADD_DEFINITIONS(-DUSE_QTKIT)
ENDIF()
IF(QUICKTIME_FOUND)
ADD_DEFINITIONS(-DUSE_QUICKTIME)
ENDIF()

9
src/osgDB/Registry.cpp
View File

@ -317,7 +317,7 @@ Registry::Registry()
#endif
#if defined(DARWIN_QTKIT)
#if defined(USE_QTKIT)
addFileExtensionAlias("mov", "QTKit");
addFileExtensionAlias("mp4", "QTKit");
addFileExtensionAlias("mov", "QTKit");
@ -326,7 +326,6 @@ Registry::Registry()
addFileExtensionAlias("mpv", "QTKit");
addFileExtensionAlias("m4v", "QTKit");
addFileExtensionAlias("3gp", "QTKit");
addFileExtensionAlias("live", "QTKit");
// Requires Perian
addFileExtensionAlias("avi", "QTKit");
addFileExtensionAlias("xvid", "QTKit");
@ -347,8 +346,8 @@ Registry::Registry()
addFileExtensionAlias("tga", "qt");
addFileExtensionAlias("flv", "qt");
addFileExtensionAlias("dv", "qt");
#if !defined(DARWIN_QTKIT)
#if !defined(USE_QTKIT)
addFileExtensionAlias("mov", "qt");
addFileExtensionAlias("avi", "qt");
addFileExtensionAlias("mpg", "qt");
@ -380,7 +379,7 @@ Registry::Registry()
// support QuickTime for Windows
// Logic error here. It is possible for Apple to not define Quicktime and end up in
// this Quicktime for Windows block. So add an extra check to avoid QTKit clashes.
#if defined(USE_QUICKTIME) && !defined(DARWIN_QTKIT)
#if defined(USE_QUICKTIME) && !defined(USE_QTKIT)
addFileExtensionAlias("mov", "qt");
addFileExtensionAlias("live", "qt");