commit 6859837b0bdea82be855ab50bd69c5ac9b62acf2
author Dima Zavin <dima@android.com> Tue Apr 05 16:13:49 2011 -0700
committer Dima Zavin <dima@android.com> Wed Apr 27 10:48:48 2011 -0700
tree b1df1a7602378396d2087cb2f02cd9c055d22ab8
parent 0a389ab70db304fb840e33f33781ecc0503eae3c

libvideoeditor: convert to use new audio.h

Change-Id: I39726f6f6cd5aabbd91629f329876660b3d3cec2
Signed-off-by: Dima Zavin <dima@android.com>

libvideoeditor/lvpp/VideoEditorPlayer.cpp

diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
index cea1576..2ca7996 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
@@ -24,6 +24,8 @@
 

 #include <media/Metadata.h>

 #include <media/stagefright/MediaExtractor.h>

+
+#include <hardware/audio.h>
 

 namespace android {

 

@@ -306,7 +308,7 @@
     : mCallback(NULL),

       mCallbackCookie(NULL) {

     mTrack = 0;

-    mStreamType = AudioSystem::MUSIC;

+    mStreamType = AUDIO_STREAM_MUSIC;

     mLeftVolume = 1.0;

     mRightVolume = 1.0;

     mLatency = 0;

@@ -415,7 +417,7 @@
                 sampleRate,

                 format,

                 (channelCount == 2) ?

-                 AudioSystem::CHANNEL_OUT_STEREO : AudioSystem::CHANNEL_OUT_MONO,

+                 AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,

                 frameCount,

                 0 /* flags */,

                 CallbackWrapper,

@@ -426,7 +428,7 @@
                 sampleRate,

                 format,

                 (channelCount == 2) ?

-                 AudioSystem::CHANNEL_OUT_STEREO : AudioSystem::CHANNEL_OUT_MONO,

+                 AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,

                 frameCount);

     }