diff options
-rw-r--r-- | libvideoeditor/lvpp/AudioPlayerBase.cpp | 4 | ||||
-rw-r--r-- | libvideoeditor/lvpp/AudioPlayerBase.h | 5 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPlayer.cpp | 2 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPlayer.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/libvideoeditor/lvpp/AudioPlayerBase.cpp b/libvideoeditor/lvpp/AudioPlayerBase.cpp index 26c6a63..eac45b1 100644 --- a/libvideoeditor/lvpp/AudioPlayerBase.cpp +++ b/libvideoeditor/lvpp/AudioPlayerBase.cpp @@ -243,7 +243,7 @@ void AudioPlayerBase::reset() { } // static -void AudioPlayerBase::AudioCallback(int event, void *user, void *info) { +void AudioPlayerBase::AudioCallback(AudioTrack::event_type event, void *user, void *info) { static_cast<AudioPlayerBase *>(user)->AudioCallback(event, info); } @@ -269,7 +269,7 @@ size_t AudioPlayerBase::AudioSinkCallback( return me->fillBuffer(buffer, size); } -void AudioPlayerBase::AudioCallback(int event, void *info) { +void AudioPlayerBase::AudioCallback(AudioTrack::event_type event, void *info) { if (event != AudioTrack::EVENT_MORE_DATA) { return; } diff --git a/libvideoeditor/lvpp/AudioPlayerBase.h b/libvideoeditor/lvpp/AudioPlayerBase.h index 31b9fa2..b82757b 100644 --- a/libvideoeditor/lvpp/AudioPlayerBase.h +++ b/libvideoeditor/lvpp/AudioPlayerBase.h @@ -18,6 +18,7 @@ #define AUDIO_PLAYER_BASE_H_ +#include <media/AudioTrack.h> #include <media/MediaPlayerInterface.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/TimeSource.h> @@ -95,8 +96,8 @@ private: sp<MediaPlayerBase::AudioSink> mAudioSink; PreviewPlayerBase *mObserver; - static void AudioCallback(int event, void *user, void *info); - void AudioCallback(int event, void *info); + static void AudioCallback(AudioTrack::event_type event, void *user, void *info); + void AudioCallback(AudioTrack::event_type event, void *info); static size_t AudioSinkCallback( MediaPlayerBase::AudioSink *audioSink, diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp index 912aab0..033445e 100755 --- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp @@ -525,7 +525,7 @@ void VideoEditorPlayer::VeAudioOutput::setVolume(float left, float right) { // static
void VideoEditorPlayer::VeAudioOutput::CallbackWrapper(
- int event, void *cookie, void *info) {
+ AudioTrack::event_type event, void *cookie, void *info) {
//LOGV("VeAudioOutput::callbackwrapper");
if (event != AudioTrack::EVENT_MORE_DATA) {
return;
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h index 349f7fd..f87a076 100755 --- a/libvideoeditor/lvpp/VideoEditorPlayer.h +++ b/libvideoeditor/lvpp/VideoEditorPlayer.h @@ -68,7 +68,7 @@ class VideoEditorPlayer : public MediaPlayerInterface { private:
static void setMinBufferCount();
static void CallbackWrapper(
- int event, void *me, void *info);
+ AudioTrack::event_type event, void *me, void *info);
AudioTrack* mTrack;
AudioCallback mCallback;
|