Sound Types Fix up issues with types in old deprecated functions

Author: danoli3

addons/ofxAndroid/src/ofxAndroidSoundPlayer.cpp

@@ -482,19 +482,4 @@ void ofxAndroidSoundPlayer::audioOut(ofSoundBuffer &) const {
 
 }
 
-void ofxAndroidSoundPlayer::audioOut(float*, int, int) {
-	
-}
-
-
-void ofxAndroidSoundPlayer::audioIn(float*, int, int) {
-
-}
 
-void ofxAndroidSoundPlayer::audioIn(float*, int, int, int, unsigned long long) {
-
-}
-
-void ofxAndroidSoundPlayer::audioOut(float*, int, int, int, unsigned long long) {
-
-}

addons/ofxAndroid/src/ofxAndroidSoundPlayer.h

@@ -3,6 +3,8 @@
 #include "ofSoundBaseTypes.h"
 #include <jni.h>
 
+class ofSoundBuffer;
+
 class ofxAndroidSoundPlayer: public ofBaseSoundPlayer{
 public:
 	ofxAndroidSoundPlayer();
@@ -34,16 +36,6 @@ class ofxAndroidSoundPlayer: public ofBaseSoundPlayer{
 	void audioIn(ofSoundBuffer&) const;
 	void audioOut(ofSoundBuffer&) const;
 
-
-	void audioIn(float*, int, int, int, unsigned long long);
-
-	void audioIn(float*, int, int);
-
-	void audioOut(float*, int, int);
-
-	void audioOut(float*, int, int, int, unsigned long long);
-
-
 private:
 	jobject javaSoundPlayer;
 	jclass javaClass;

libs/openFrameworks/sound/ofSoundBaseTypes.cpp

@@ -38,32 +38,14 @@ std::ostream& operator << (std::ostream& os, const std::vector<ofSoundDevice>& d
 	return os;
 }
 
-#else
+#endif
 
 void ofBaseSoundInput::audioIn(ofSoundBuffer &buffer) {
 
 }
 
-void ofBaseSoundInput::audioIn(float *input, int bufferSize, int nChannels, int deviceID,
-                               unsigned long long int tickCount) {
-
-}
-
-void ofBaseSoundInput::audioIn(float *input, int bufferSize, int nChannels) {
-
-}
-
 void ofBaseSoundOutput::audioOut(ofSoundBuffer &buffer) {
 
 }
 
-void ofBaseSoundOutput::audioOut(float *output, int bufferSize, int nChannels) {
-
-}
-
-void ofBaseSoundOutput::audioOut(float *output, int bufferSize, int nChannels, int deviceID,
-								 unsigned long long int tickCount) {
 
-}
-
-#endif

libs/openFrameworks/sound/ofSoundBaseTypes.h

@@ -14,18 +14,6 @@ class ofBaseSoundInput{
 		/// \brief Receive an audio buffer.
 		/// \param buffer An audio buffer.
 		virtual void audioIn( ofSoundBuffer& buffer );
-
-		/// \deprecated This legacy method is deprecated and will be removed.
-		/// Use void audioIn(ofSoundBuffer& buffer) instead.
-		virtual void audioIn( float * input, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount );
-
-		/// \deprecated This legacy method is deprecated and will be removed.
-		/// Use void audioIn(ofSoundBuffer& buffer) instead.
-		virtual void audioIn( float * input, int bufferSize, int nChannels );
-
-		/// \deprecated This legacy method is deprecated and will be removed.
-		/// Use void audioIn(ofSoundBuffer& buffer) instead.
-		virtual void audioReceived( float * input, int bufferSize, int nChannels ){}
 };
 
 
@@ -38,18 +26,6 @@ class ofBaseSoundOutput{
 		/// \brief Output an audio buffer.
 		/// \param buffer An audio buffer.
 		virtual void audioOut( ofSoundBuffer& buffer );
-
-		/// \deprecated This legacy method is deprecated and will be removed.
-		/// Use void audioOut(ofSoundBuffer& buffer) instead.
-		virtual void audioOut( float * output, int bufferSize, int nChannels, int deviceID, long unsigned long tickCount  );
-
-		/// \deprecated This legacy method is deprecated and will be removed.
-		/// Use void audioOut(ofSoundBuffer& buffer) instead.
-		virtual void audioOut( float * output, int bufferSize, int nChannels );
-
-		/// \deprecated This legacy method is deprecated and will be removed.
-		/// Use void audioOut(ofSoundBuffer& buffer) instead.
-		virtual void audioRequested( float * output, int bufferSize, int nChannels ){}
 };
 
 /// \class ofSoundDevice