Merge branch 'master' of github.com:openframeworks/openFrameworks

damian0815 · Jul 21, 2011 · a46daaa · a46daaa
2 parents 02ad747 + c6b4be7
commit a46daaa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/libs/openFrameworks/sound/ofSoundStream.h b/libs/openFrameworks/sound/ofSoundStream.h
@@ -4,6 +4,7 @@
 #include "ofBaseTypes.h"
 #include "ofBaseApp.h"
 #include "ofTypes.h"
+#include "ofBaseSoundStream.h"
 
 #ifdef OF_SOUNDSTREAM_RTAUDIO
 	#include "ofRtAudioSoundStream.h"

diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
@@ -205,7 +205,7 @@ 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_CAPTURE_IPHONE) && !defined(OF_VIDEO_PLAYER_QUICKTIME)
+#if !defined(OF_VIDEO_PLAYER_GSTREAMER) && !defined(OF_VIDEO_PLAYER_IPHONE) && !defined(OF_VIDEO_PLAYER_QUICKTIME)
 	#ifdef TARGET_LINUX
 		#define OF_VIDEO_PLAYER_GSTREAMER
 	#else