incorporate OF PR openframeworks#8184, cleanup make and other stuff

Author: dimitre

libs/openFrameworks/app/ofAppRunner.cpp

@@ -50,11 +50,6 @@ void ofSetupOpenGL(const shared_ptr<ofWindow> & windowPtr, int w, int h, ofWindo
 	#include "ofGstUtils.h"
 #endif
 
-// adding this for vc2010 compile: error C3861: 'closeQuicktime': identifier not found
-#if defined(OF_VIDEO_CAPTURE_QUICKTIME) || defined(OF_VIDEO_PLAYER_QUICKTIME)
-	#include "ofQtUtils.h"
-#endif
-
 #if defined(TARGET_WIN32)
 	#include <mmsystem.h>
 #endif

libs/openFrameworks/utils/ofConstants.h

@@ -126,8 +126,8 @@ enum ofTargetPlatform{
 	#define GLEW_NO_GLU
     #define TARGET_GLFW_WINDOW
     #define OF_CAIRO
-	#include "GL/glew.h"
-	#include "GL/wglew.h"
+	#include <GL/glew.h>
+	#include <GL/wglew.h>
 	#define OF_RTAUDIO
 	#define __WINDOWS_DS__
 	#define __WINDOWS_WASAPI__
@@ -303,16 +303,20 @@ typedef TESSindex ofIndexType;
 // check if any soundplayer api is defined from the compiler
 
 #if !defined(TARGET_NO_SOUND)
-	#if !defined(OF_SOUND_PLAYER_FMOD) && !defined(OF_SOUND_PLAYER_OPENAL) && !defined(OF_SOUND_PLAYER_EMSCRIPTEN) && !defined(OF_SOUND_PLAYER_MEDIA_FOUNDATION)
-	  #ifdef TARGET_OF_IOS
-		#define OF_SOUND_PLAYER_IPHONE
-	  #elif defined(TARGET_LINUX) || defined(TARGET_MINGW)
-		#define OF_SOUND_PLAYER_OPENAL
-	  #elif defined(TARGET_EMSCRIPTEN)
-		#define OF_SOUND_PLAYER_EMSCRIPTEN
-	  #elif !defined(TARGET_ANDROID) && !defined(TARGET_OF_MAC)
-//		#define OF_SOUND_PLAYER_FMOD
-	  #endif
+	#if defined(USE_FMOD)
+		#define OF_SOUND_PLAYER_FMOD
+	#else
+		#if defined(TARGET_OF_IOS) || defined(TARGET_OSX)
+			#define OF_SOUND_PLAYER_AV_ENGINE
+		// #elif defined(TARGET_OF_IOS)
+		// 	#define OF_SOUND_PLAYER_IPHONE
+		#elif defined(TARGET_LINUX) || defined(TARGET_MINGW)
+			#define OF_SOUND_PLAYER_OPENAL
+		#elif defined(TARGET_EMSCRIPTEN)
+			#define OF_SOUND_PLAYER_EMSCRIPTEN
+		#elif defined(TARGET_WIN32)
+			#define OF_SOUND_PLAYER_MEDIA_FOUNDATION
+		#endif
 	#endif
 #endif
 

libs/openFrameworks/video/ofDirectShowGrabber.h

@@ -6,24 +6,11 @@
 #include "ofVideoBaseTypes.h"
 #include "ofPixels.h" // MARK: ofPixels pixels
 
-// comment out this following line, if you'd like to use the
-// quicktime capture interface on windows
-// if not, we default to videoInput library for
-// direct show capture...
-
-#define OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
-
-#ifdef OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
+// #define OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
+// #ifdef OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
 	#define OF_VIDEO_CAPTURE_DIRECTSHOW
-#else
-	#define OF_VIDEO_CAPTURE_QUICKTIME
-#endif
-
-
-#ifdef OF_VIDEO_CAPTURE_DIRECTSHOW
 	#include <videoInput.h>
-#endif
-
+// #endif
 
 class ofDirectShowGrabber : public ofBaseVideoGrabber{
 
@@ -39,16 +26,16 @@ class ofDirectShowGrabber : public ofBaseVideoGrabber{
 		bool					isInitialized() const;
 
 		bool					setPixelFormat(ofPixelFormat pixelFormat);
-		ofPixelFormat			getPixelFormat() const;		
+		ofPixelFormat			getPixelFormat() const;
 
 		ofPixels &				getPixels();
 		const ofPixels &		getPixels() const;
-		
+
 		void					close();
 		void					clearMemory();
 
 		void					videoSettings();
-		
+
 		float					getWidth() const;
 		float					getHeight() const;
 
@@ -57,24 +44,23 @@ class ofDirectShowGrabber : public ofBaseVideoGrabber{
 		void					setDesiredFrameRate(int framerate);
 
 
-		
+
 
 	protected:
-	
+
 		bool					bChooseDevice;
 		int						deviceID;
 		bool 					bVerbose;
 		bool 					bGrabberInited;
 	    ofPixels pixels;
 		int						attemptFramerate;
-		bool 					bIsFrameNew;	
-		
-		int						width, height;	
+		bool 					bIsFrameNew;
+
+		int						width, height;
 		//--------------------------------- directshow
 		#ifdef OF_VIDEO_CAPTURE_DIRECTSHOW
 			int 					device;
 			videoInput 				VI;
 			bool 					bDoWeNeedToResize;
-		#endif	
+		#endif
 };
-

libs/openFrameworks/video/ofDirectShowPlayer.h

@@ -1,16 +1,15 @@
 //DirectShowVideo and ofDirectShowPlayer written by Theodore Watson, Jan 2014
-//See the cpp file for the DirectShow implementation 
-//To allow for QuickTime video playback install the K-Lite Mega Codec Pack 10.2
+//See the cpp file for the DirectShow implementation
 
-#pragma once 
+#pragma once
 #include "ofVideoBaseTypes.h"
 
 template<typename T>
 class ofPixels_;
 
 typedef ofPixels_<unsigned char> ofPixels;
 
-class DirectShowVideo; 
+class DirectShowVideo;
 
 class ofDirectShowPlayer : public ofBaseVideoPlayer{
     public:
@@ -24,41 +23,41 @@ class ofDirectShowPlayer : public ofBaseVideoPlayer{
         void                update();
 
         void                close();
-    
+
         void                play();
-        void                stop();     
-    
+        void                stop();
+
         bool                isFrameNew() const;
 
         const ofPixels &    getPixels() const;
         ofPixels &          getPixels();
-    
+
         float               getWidth() const;
         float               getHeight() const;
-    
+
         bool                isPaused() const;
         bool                isLoaded() const;
         bool                isPlaying() const;
-    
+
         bool                setPixelFormat(ofPixelFormat pixelFormat);
         ofPixelFormat       getPixelFormat() const;
 
         float               getPosition() const;
         float               getSpeed() const;
         float               getDuration() const;
         bool                getIsMovieDone() const;
-    
+
         void                setPaused(bool bPause);
         void                setPosition(float pct);
         void                setVolume(float volume); // 0..1
         void                setLoopState(ofLoopType state);
         void                setSpeed(float speed);
         void                setFrame(int frame);  // frame 0 = first frame...
-    
+
         int                 getCurrentFrame() const;
         int                 getTotalNumFrames() const;
         ofLoopType          getLoopState() const;
-    
+
         void                firstFrame();
         void                nextFrame();
         void                previousFrame();

libs/openFrameworks/video/ofVideoGrabber.cpp

@@ -7,39 +7,27 @@
 
 // ------------------------------------------------ capture
 // 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)
+#if !defined(OF_VIDEO_CAPTURE_GSTREAMER) && \
+	!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)
 		#define OF_VIDEO_CAPTURE_AVF
-
 	#elif defined (TARGET_WIN32)
-		// comment out this following line, if you'd like to use the
-		// quicktime capture interface on windows
-		// if not, we default to videoInput library for
-		// direct show capture...
-
-		#define OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
-
-		#ifdef OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
-			#define OF_VIDEO_CAPTURE_DIRECTSHOW
-		#else
-			#define OF_VIDEO_CAPTURE_QUICKTIME
-		#endif
+		// #define OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
+		// #ifdef OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP
+		#define OF_VIDEO_CAPTURE_DIRECTSHOW
+		// #endif
 
 	#elif defined(TARGET_ANDROID)
-
 		#define OF_VIDEO_CAPTURE_ANDROID
-
 	#elif defined(TARGET_EMSCRIPTEN)
-
 		#define OF_VIDEO_CAPTURE_EMSCRIPTEN
-
 	#elif defined(TARGET_OF_IOS)
-
 		#define OF_VIDEO_CAPTURE_IOS
-
 	#endif
 #endif
 
@@ -54,16 +42,6 @@
 	#define OF_VID_GRABBER_TYPE ofxiOSVideoGrabber
 #endif
 
-// #ifdef OF_VIDEO_CAPTURE_QUICKTIME
-// 	#include "ofQuickTimeGrabber.h"
-// 	#define OF_VID_GRABBER_TYPE ofQuickTimeGrabber
-// #endif
-
-// #ifdef OF_VIDEO_CAPTURE_QTKIT
-// 	#include "ofQTKitGrabber.h"
-// 	#define OF_VID_GRABBER_TYPE ofQTKitGrabber
-// #endif
-
 #ifdef OF_VIDEO_CAPTURE_AVF
 	#include "ofAVFoundationGrabber.h"
 	#define OF_VID_GRABBER_TYPE ofAVFoundationGrabber

libs/openFrameworks/video/ofVideoPlayer.cpp

@@ -6,64 +6,29 @@
 
 //------------------------------------------------  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_MEDIA_FOUNDATION) && !defined(OF_VIDEO_PLAYER_QUICKTIME) && !defined(OF_VIDEO_PLAYER_AVFOUNDATION) && !defined(OF_VIDEO_PLAYER_EMSCRIPTEN)
-	#ifdef TARGET_LINUX
-		#define OF_VIDEO_PLAYER_GSTREAMER
-	#elif defined(TARGET_ANDROID)
-		#define OF_VIDEO_PLAYER_ANDROID
-	#elif defined(TARGET_OF_IOS)
-		#define OF_VIDEO_PLAYER_IOS
-	#elif defined(TARGET_WIN32)
-			#ifdef _MSC_VER //use MF Foundation player for VS as mingw doesn't have needed symbols
-			#define OF_VIDEO_PLAYER_MEDIA_FOUNDATION
-			#else
-			#define OF_VIDEO_PLAYER_DIRECTSHOW
-			#endif
-	#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
-		#define OF_VIDEO_PLAYER_QUICKTIME
-	#endif
-#endif
-
+#if !defined(OF_VIDEO_PLAYER_GSTREAMER) && \
+	!defined(OF_VIDEO_PLAYER_IOS) && \
+	!defined(OF_VIDEO_PLAYER_DIRECTSHOW) && \
+	!defined(OF_VIDEO_PLAYER_MEDIA_FOUNDATION) && \
+	!defined(OF_VIDEO_PLAYER_AVFOUNDATION) && \
+	!defined(OF_VIDEO_PLAYER_EMSCRIPTEN)
 
-//------------------------------------------------  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_MEDIA_FOUNDATION) && !defined(OF_VIDEO_PLAYER_QUICKTIME) && !defined(OF_VIDEO_PLAYER_AVFOUNDATION) && !defined(OF_VIDEO_PLAYER_EMSCRIPTEN)
 	#ifdef TARGET_LINUX
 		#define OF_VIDEO_PLAYER_GSTREAMER
 	#elif defined(TARGET_ANDROID)
 		#define OF_VIDEO_PLAYER_ANDROID
 	#elif defined(TARGET_OF_IOS)
 		#define OF_VIDEO_PLAYER_IOS
 	#elif defined(TARGET_WIN32)
-			#ifdef _MSC_VER //use MF Foundation player for VS as mingw doesn't have needed symbols
+		#ifdef _MSC_VER //use MF Foundation player for VS as mingw doesn't have needed symbols
 			#define OF_VIDEO_PLAYER_MEDIA_FOUNDATION
-			#else
-			#define OF_VIDEO_PLAYER_DIRECTSHOW
-			#endif
-	#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
+			#define OF_VIDEO_PLAYER_DIRECTSHOW
 		#endif
+	#elif defined(TARGET_OSX)
+		#define OF_VIDEO_PLAYER_AVFOUNDATION
 	#elif defined(TARGET_EMSCRIPTEN)
 		#define OF_VIDEO_PLAYER_EMSCRIPTEN
-	#else
-		#define OF_VIDEO_PLAYER_QUICKTIME
 	#endif
 #endif
 
@@ -73,16 +38,6 @@
 	#define OF_VID_PLAYER_TYPE ofGstVideoPlayer
 #endif
 
-//#ifdef OF_VIDEO_PLAYER_QUICKTIME
-//	#include "ofQuickTimePlayer.h"
-//	#define OF_VID_PLAYER_TYPE ofQuickTimePlayer
-//#endif
-//
-//#ifdef OF_VIDEO_PLAYER_QTKIT
-//	#include "ofQTKitPlayer.h"
-//	#define OF_VID_PLAYER_TYPE ofQTKitPlayer
-//#endif
-
 #ifdef OF_VIDEO_PLAYER_AVFOUNDATION
 	#include "ofAVFoundationPlayer.h"
 	#define OF_VID_PLAYER_TYPE ofAVFoundationPlayer