commit 984eae0d1715c2caa6da6cccb55b919db9da1da2
author Glenn Kasten <gkasten@google.com> Wed May 04 15:37:39 2011 -0700
committer Glenn Kasten <gkasten@google.com> Wed Jun 01 14:07:00 2011 -0700
tree 0cdf29d19c54e757b991368641814dd6f2ef9c86
parent 883d7c1b80e5533807fa5351fd640eea6d358d96

Use AudioTrack::event_type not int in callback

Change-Id: I09ff321f9457c0a9ee58e59bee38ed53799e494b

libvideoeditor/lvpp/AudioPlayerBase.cpp

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 @@
 }
 
 // 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 @@
     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;
     }

libvideoeditor/lvpp/AudioPlayerBase.h

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 @@
     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,

libvideoeditor/lvpp/VideoEditorPlayer.cpp

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 @@
 

 // 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;

libvideoeditor/lvpp/VideoEditorPlayer.h

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 @@
     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;