commit 72e95e7ee6fe2892201575e7f7e4dd798fb225f6
author Glenn Kasten <gkasten@google.com> Wed Jun 01 15:20:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 15:20:41 2011 -0700
tree c7563010d0992524be11bd4a77de268faa37f543
parent 984eae0d1715c2caa6da6cccb55b919db9da1da2

Revert "Use AudioTrack::event_type not int in callback"

This reverts commit dd51bdc4cf4b7c9f09e7dc4116651c6681d5287c

libvideoeditor/lvpp/AudioPlayerBase.cpp

diff --git a/libvideoeditor/lvpp/AudioPlayerBase.cpp b/libvideoeditor/lvpp/AudioPlayerBase.cpp
index eac45b1..26c6a63 100644
--- a/libvideoeditor/lvpp/AudioPlayerBase.cpp
+++ b/libvideoeditor/lvpp/AudioPlayerBase.cpp
@@ -243,7 +243,7 @@
 }
 
 // static
-void AudioPlayerBase::AudioCallback(AudioTrack::event_type event, void *user, void *info) {
+void AudioPlayerBase::AudioCallback(int event, void *user, void *info) {
     static_cast<AudioPlayerBase *>(user)->AudioCallback(event, info);
 }
 
@@ -269,7 +269,7 @@
     return me->fillBuffer(buffer, size);
 }
 
-void AudioPlayerBase::AudioCallback(AudioTrack::event_type event, void *info) {
+void AudioPlayerBase::AudioCallback(int event, void *info) {
     if (event != AudioTrack::EVENT_MORE_DATA) {
         return;
     }

libvideoeditor/lvpp/AudioPlayerBase.h

diff --git a/libvideoeditor/lvpp/AudioPlayerBase.h b/libvideoeditor/lvpp/AudioPlayerBase.h
index b82757b..31b9fa2 100644
--- a/libvideoeditor/lvpp/AudioPlayerBase.h
+++ b/libvideoeditor/lvpp/AudioPlayerBase.h
@@ -18,7 +18,6 @@
 
 #define AUDIO_PLAYER_BASE_H_
 
-#include <media/AudioTrack.h>
 #include <media/MediaPlayerInterface.h>
 #include <media/stagefright/MediaBuffer.h>
 #include <media/stagefright/TimeSource.h>
@@ -96,8 +95,8 @@
     sp<MediaPlayerBase::AudioSink> mAudioSink;
     PreviewPlayerBase *mObserver;
 
-    static void AudioCallback(AudioTrack::event_type event, void *user, void *info);
-    void AudioCallback(AudioTrack::event_type event, void *info);
+    static void AudioCallback(int event, void *user, void *info);
+    void AudioCallback(int event, void *info);
 
     static size_t AudioSinkCallback(
             MediaPlayerBase::AudioSink *audioSink,

libvideoeditor/lvpp/VideoEditorPlayer.cpp

diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
index 033445e..912aab0 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
@@ -525,7 +525,7 @@
 

 // static

 void VideoEditorPlayer::VeAudioOutput::CallbackWrapper(

-        AudioTrack::event_type event, void *cookie, void *info) {

+        int event, void *cookie, void *info) {

     //LOGV("VeAudioOutput::callbackwrapper");

     if (event != AudioTrack::EVENT_MORE_DATA) {

         return;

libvideoeditor/lvpp/VideoEditorPlayer.h

diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h
index f87a076..349f7fd 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.h
@@ -68,7 +68,7 @@
     private:

         static void             setMinBufferCount();

         static void             CallbackWrapper(

-                AudioTrack::event_type event, void *me, void *info);

+                int event, void *me, void *info);

 

         AudioTrack*             mTrack;

         AudioCallback           mCallback;