Commit 7582931b authored by Simon Morlat's avatar Simon Morlat Committed by Ghislain MARY
Browse files

remove getInput that is unused

parent e5d70d70
#include "mediastreamer2/mscommon.h"
#include "AudioRecord.h"
namespace fake_android{
......@@ -61,7 +61,9 @@ status_t AudioRecord::getMinFrameCount(int* frameCount,
}
audio_io_handle_t AudioRecord::getInput() const{
return mImpl->mGetInput.invoke(mThis);
//return mImpl->mGetInput.invoke(mThis);
ms_error("AudioRecord::getInput() not implemented.");
return 0;
}
bool AudioRecordImpl::init(Library *lib){
......@@ -72,7 +74,7 @@ bool AudioRecordImpl::init(Library *lib){
if (!impl->mStop.isFound()) goto fail;
if (!impl->mStart.isFound()) goto fail;
if (!impl->mGetMinFrameCount.isFound()) goto fail;
if (!impl->mGetInput.isFound()) goto fail;
//if (!impl->mGetInput.isFound()) goto fail;
sImpl=impl;
return true;
......@@ -89,8 +91,8 @@ AudioRecordImpl::AudioRecordImpl(Library *lib) :
mInitCheck(lib,"_ZNK7android11AudioRecord9initCheckEv"),
mStop(lib,"_ZN7android11AudioRecord4stopEv"),
mStart(lib,"_ZN7android11AudioRecord5startEv"),
mGetMinFrameCount(lib,"_ZN7android11AudioRecord16getMinFrameCountEPijii"),
mGetInput(lib,"_ZN7android11AudioRecord8getInputEv")
mGetMinFrameCount(lib,"_ZN7android11AudioRecord16getMinFrameCountEPijii")
//mGetInput(lib,"_ZN7android11AudioRecord8getInputEv")
{
}
......
......@@ -354,7 +354,7 @@ public:
Function1<status_t,void *> mStop;
Function3<status_t, void *, AudioSystem::sync_event_t , int> mStart;
Function4<status_t, int*, uint32_t, int, int> mGetMinFrameCount;
Function1<audio_io_handle_t,void*> mGetInput;
//Function1<audio_io_handle_t,void*> mGetInput;
private:
AudioRecordImpl(Library *lib);
static AudioRecordImpl *sImpl;
......
#include "AudioSystem.h"
#include "mediastreamer2/mscommon.h"
namespace fake_android{
......@@ -22,21 +22,23 @@ audio_io_handle_t AudioSystem::getInput(audio_source_t inputSource,
uint32_t channels,
audio_in_acoustics_t acoustics,
int sessionId){
return AudioSystemImpl::get()->mGetInput.invoke(inputSource,samplingRate,format,channels,acoustics,sessionId);
ms_error("AudioSystem::getInput() not implemented.");
return 0;
//return AudioSystemImpl::get()->mGetInput.invoke(inputSource,samplingRate,format,channels,acoustics,sessionId);
}
AudioSystemImpl::AudioSystemImpl(Library *lib) :
mGetOutputSamplingRate(lib,"_ZN7android11AudioSystem21getOutputSamplingRateEPii"),
mSetParameters(lib,"_ZN7android11AudioSystem13setParametersEiRKNS_7String8E"),
mGetInput(lib,"_ZN7android11AudioSystem8getInputEijjjNS0_18audio_in_acousticsE"){
mSetParameters(lib,"_ZN7android11AudioSystem13setParametersEiRKNS_7String8E"){
//mGetInput(lib,"_ZN7android11AudioSystem8getInputEijjjNS0_18audio_in_acousticsE"){
}
bool AudioSystemImpl::init(Library *lib){
AudioSystemImpl *impl=new AudioSystemImpl(lib);
if (!impl->mGetOutputSamplingRate.isFound()) goto fail;
if (!impl->mSetParameters.isFound()) goto fail;
if (!impl->mGetInput.isFound()) goto fail;
//if (!impl->mGetInput.isFound()) goto fail;
sImpl=impl;
return true;
......
......@@ -247,7 +247,7 @@ public:
}
Function2<status_t,int*,int> mGetOutputSamplingRate;
Function2<status_t,audio_io_handle_t,const String8 &> mSetParameters;
Function6<audio_io_handle_t,audio_source_t,uint32_t,audio_format_t,uint32_t,audio_in_acoustics_t,int> mGetInput;
//Function6<audio_io_handle_t,audio_source_t,uint32_t,audio_format_t,uint32_t,audio_in_acoustics_t,int> mGetInput;
private:
AudioSystemImpl(Library *lib);
static AudioSystemImpl *sImpl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment