Merge pull request openframeworks#672 from stfj/master

ofxiPhoneSoundStream
damian0815 · Jul 21, 2011 · d6183cd · d6183cd
2 parents 935c0ee + a617b38
commit d6183cd
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 85 deletions.
diff --git a/addons/ofxiPhone/src/ofAppiPhoneWindow.mm b/addons/ofxiPhone/src/ofAppiPhoneWindow.mm
@@ -155,35 +155,17 @@ void setWindowShape(int w, int h) {
 
 int ofAppiPhoneWindow::getWidth(){
 	if( orientation == OF_ORIENTATION_DEFAULT || orientation == OF_ORIENTATION_180 ){
-
-		if(retinaEnabled)
-			if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
-				return (int)getScreenSize().x * [[UIScreen mainScreen] scale];
-
 		return (int)getScreenSize().x;
 	}
 
-	if(retinaEnabled)
-		if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
-			return (int)getScreenSize().y * [[UIScreen mainScreen] scale];
-
 	return (int)getScreenSize().y;
 }
 
 int ofAppiPhoneWindow::getHeight(){
 	if( orientation == OF_ORIENTATION_DEFAULT || orientation == OF_ORIENTATION_180 ){
-
-		if(retinaEnabled)
-			if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
-				return (int)getScreenSize().y * [[UIScreen mainScreen] scale];
-
 		return (int)getScreenSize().y;
 	}
 
-	if(retinaEnabled)
-		if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
-			return (int)getScreenSize().x * [[UIScreen mainScreen] scale];
-
 	return (int)getScreenSize().x;
 }
 

diff --git a/libs/openFrameworks/sound/ofSoundStream.h b/libs/openFrameworks/sound/ofSoundStream.h
@@ -15,8 +15,9 @@
 #elif defined(OF_SOUNDSTREAM_ANDROID)
 	#include "ofxAndroidSoundStream.h"
 	#define OF_SOUND_STREAM_TYPE ofxAndroidSoundStream
-#else
-	// iphone soundstream
+#elif defined(OF_SOUNDSTREAM_IPHONE)
+	#include "ofxiPhoneSoundStream.h"
+	#define OF_SOUND_STREAM_TYPE ofxiPhoneSoundStream
 #endif 
 
 void ofSoundStreamSetup(int nOutputChannels, int nInputChannels, ofBaseApp * appPtr = NULL);

diff --git a/libs/openFrameworks/sound/ofxiPhoneSoundStream.h b/libs/openFrameworks/sound/ofxiPhoneSoundStream.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "ofConstants.h"
+
+#include "ofBaseSoundStream.h"
+#include "ofTypes.h"
+
+
+class ofxiPhoneSoundStream : public ofBaseSoundStream{
+	public:
+		ofxiPhoneSoundStream();
+		~ofxiPhoneSoundStream();
+
+		void listDevices();
+		void setDeviceID(int deviceID);
+
+		void setInput(ofBaseSoundInput * soundInput);
+		void setOutput(ofBaseSoundOutput * soundOutput);
+		bool setup(int outChannels, int inChannels, int sampleRate, int bufferSize, int nBuffers);
+		bool setup(ofBaseApp * app, int outChannels, int inChannels, int sampleRate, int bufferSize, int nBuffers);
+
+		void start();
+		void stop();
+		void close();
+
+		long unsigned long getTickCount();		 // always returns 0. not implemented on iphone
+
+		int getNumInputChannels();
+		int getNumOutputChannels();
+
+	private:
+		long unsigned long	tickCount;
+		int					nInputChannels;
+		int					nOutputChannels;
+		int					sampleRate;
+};
+
+