Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ofQTKitPlayer, set OS X 10.8 as the minimum #3543

Closed
wants to merge 8 commits into from
Closed

Remove ofQTKitPlayer, set OS X 10.8 as the minimum #3543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee93595
remove video player handling for 10.6 and 10.7
Jan 10, 2015
f107128
remove the QTKit video player
Jan 10, 2015
b71a701
add braces around AV Foundation player
Jan 10, 2015
6b5d358
simplify capture assignment on OS X
Jan 10, 2015
bb197d3
remove empty SDKROOT assignment
Jan 10, 2015
96d5737
set OS X 10.8 as the minimum version
Jan 10, 2015
97ffed6
remove braces that provded problematic
Jan 11, 2015
ad1fead
remove the high performance video player
Jan 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed examples/video/osxHighPerformanceVideoPlayerExample/bin/data/movies/fingers.mov
View file
Open in desktop
Binary file not shown.
14 changes: 0 additions & 14 deletions examples/video/osxHighPerformanceVideoPlayerExample/src/main.cpp
View file
Open in desktop

This file was deleted.

182 changes: 0 additions & 182 deletions examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.cpp
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.h
View file
Open in desktop

This file was deleted.

25 changes: 5 additions & 20 deletions libs/openFrameworks/utils/ofConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,17 +255,9 @@ typedef TESSindex ofIndexType;
// check if any video capture system is already defined from the compiler
#if !defined(OF_VIDEO_CAPTURE_GSTREAMER) && !defined(OF_VIDEO_CAPTURE_QUICKTIME) && !defined(OF_VIDEO_CAPTURE_DIRECTSHOW) && !defined(OF_VIDEO_CAPTURE_ANDROID) && !defined(OF_VIDEO_CAPTURE_IOS)
#ifdef TARGET_LINUX

#define OF_VIDEO_CAPTURE_GSTREAMER

#elif defined(TARGET_OSX)
//on 10.6 and below we can use the old grabber
#ifndef MAC_OS_X_VERSION_10_7
#define OF_VIDEO_CAPTURE_QUICKTIME
#else
#define OF_VIDEO_CAPTURE_QTKIT
#endif

#define OF_VIDEO_CAPTURE_QTKIT
#elif defined (TARGET_WIN32)

// comment out this following line, if you'd like to use the
Expand Down Expand Up @@ -299,23 +291,16 @@ typedef TESSindex ofIndexType;
//------------------------------------------------ video player
// check if any video player system is already defined from the compiler
#if !defined(OF_VIDEO_PLAYER_GSTREAMER) && !defined(OF_VIDEO_PLAYER_IOS) && !defined(OF_VIDEO_PLAYER_DIRECTSHOW) && !defined(OF_VIDEO_PLAYER_QUICKTIME) && !defined(OF_VIDEO_PLAYER_AVFOUNDATION) && !defined(OF_VIDEO_PLAYER_EMSCRIPTEN)
#ifdef TARGET_LINUX
#if defined(TARGET_LINUX)
#define OF_VIDEO_PLAYER_GSTREAMER
#elif defined(TARGET_ANDROID)
#define OF_VIDEO_PLAYER_ANDROID
#elif defined(TARGET_OSX)
#define OF_VIDEO_PLAYER_AVFOUNDATION
#elif defined(TARGET_OF_IOS)
#define OF_VIDEO_PLAYER_IOS
#elif defined(TARGET_WIN32) && !defined(__MINGW32__)
#elif defined(TARGET_WIN32) && !defined(__MINGW32__)
#define OF_VIDEO_PLAYER_DIRECTSHOW
#elif defined(TARGET_OSX)
//for 10.8 and 10.9 users we use AVFoundation, for 10.7 we use QTKit, for 10.6 users we use QuickTime
#ifndef MAC_OS_X_VERSION_10_7
#define OF_VIDEO_PLAYER_QUICKTIME
#elif !defined(MAC_OS_X_VERSION_10_8)
#define OF_VIDEO_PLAYER_QTKIT
#else
#define OF_VIDEO_PLAYER_AVFOUNDATION
#endif
#elif defined(TARGET_EMSCRIPTEN)
#define OF_VIDEO_PLAYER_EMSCRIPTEN
#else
Expand Down
90 changes: 0 additions & 90 deletions libs/openFrameworks/video/ofQTKitMovieRenderer.h
View file
Open in desktop

This file was deleted.

Loading