summaryrefslogtreecommitdiffstats
path: root/libvideoeditor/lvpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-17 07:25:59 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-17 07:25:59 -0800
commit4a108948e915b5c758cada106c129f56532ccf35 (patch)
tree1d4598805ba72409919720634c5543b19fa65459 /libvideoeditor/lvpp
parentdaeb5b33861147fda0096f9c794be6f341d884c2 (diff)
parent813c1017a499d5fe7a9ee7f40aae845954a3ba55 (diff)
downloadframeworks_av-4a108948e915b5c758cada106c129f56532ccf35.zip
frameworks_av-4a108948e915b5c758cada106c129f56532ccf35.tar.gz
frameworks_av-4a108948e915b5c758cada106c129f56532ccf35.tar.bz2
Merge "Use audio_stream_type_t consistently"
Diffstat (limited to 'libvideoeditor/lvpp')
-rwxr-xr-xlibvideoeditor/lvpp/VideoEditorPlayer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h
index 684a2e6..88a2aeb 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.h
@@ -59,7 +59,7 @@ class VideoEditorPlayer : public MediaPlayerInterface {
virtual void flush();
virtual void pause();
virtual void close();
- void setAudioStreamType(int streamType) { mStreamType = streamType; }
+ void setAudioStreamType(audio_stream_type_t streamType) { mStreamType = streamType; }
void setVolume(float left, float right);
virtual status_t dump(int fd,const Vector<String16>& args) const;
@@ -73,7 +73,7 @@ class VideoEditorPlayer : public MediaPlayerInterface {
AudioTrack* mTrack;
AudioCallback mCallback;
void * mCallbackCookie;
- int mStreamType;
+ audio_stream_type_t mStreamType;
float mLeftVolume;
float mRightVolume;
float mMsecsPerFrame;