Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
7582931b
Commit
7582931b
authored
Oct 11, 2012
by
Simon Morlat
Committed by
Ghislain MARY
Oct 15, 2012
Browse files
remove getInput that is unused
parent
e5d70d70
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
12 deletions
+16
-12
src/android/AudioRecord.cpp
src/android/AudioRecord.cpp
+7
-5
src/android/AudioRecord.h
src/android/AudioRecord.h
+1
-1
src/android/AudioSystem.cpp
src/android/AudioSystem.cpp
+7
-5
src/android/AudioSystem.h
src/android/AudioSystem.h
+1
-1
No files found.
src/android/AudioRecord.cpp
View file @
7582931b
#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")
{
}
...
...
src/android/AudioRecord.h
View file @
7582931b
...
...
@@ -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
;
...
...
src/android/AudioSystem.cpp
View file @
7582931b
#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
;
...
...
src/android/AudioSystem.h
View file @
7582931b
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment