diff options
author | James Dong <jdong@google.com> | 2011-05-01 12:36:22 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2011-05-01 13:52:00 -0700 |
commit | c9dedc4e1d0c8343ab1029cb601253826cd67c81 (patch) | |
tree | 08c3e7d3c4c18c7f0dee9b991780b0e117c00b4b /libvideoeditor/lvpp/PreviewPlayer.cpp | |
parent | acb62af8ccf493b38decd91d94eb18395b6f9461 (diff) | |
download | frameworks_av-c9dedc4e1d0c8343ab1029cb601253826cd67c81.zip frameworks_av-c9dedc4e1d0c8343ab1029cb601253826cd67c81.tar.gz frameworks_av-c9dedc4e1d0c8343ab1029cb601253826cd67c81.tar.bz2 |
Separate preview player from AwesomePlayer and also video editor audio player from AudioPlayer
Change-Id: I436ac541df3e34ad16be95a50c96d7af67fa15e4
Diffstat (limited to 'libvideoeditor/lvpp/PreviewPlayer.cpp')
-rwxr-xr-x | libvideoeditor/lvpp/PreviewPlayer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp index 552e1cd..8c9ef10 100755 --- a/libvideoeditor/lvpp/PreviewPlayer.cpp +++ b/libvideoeditor/lvpp/PreviewPlayer.cpp @@ -170,7 +170,7 @@ int PreviewLocalRenderer::init( } PreviewPlayer::PreviewPlayer() - : AwesomePlayer(), + : PreviewPlayerBase(), mCurrFramingEffectIndex(0) , mReportedWidth(0), mReportedHeight(0), @@ -202,7 +202,7 @@ PreviewPlayer::PreviewPlayer() mStreamDoneEventPending = false; mCheckAudioStatusEvent = new PreviewPlayerEvent( - this, &AwesomePlayer::onCheckAudioStatus); + this, &PreviewPlayerBase::onCheckAudioStatus); mAudioStatusEventPending = false; @@ -493,7 +493,7 @@ status_t PreviewPlayer::startAudioPlayer_l() { return OK; } -status_t PreviewPlayer::setAudioPlayer(AudioPlayer *audioPlayer) { +status_t PreviewPlayer::setAudioPlayer(AudioPlayerBase *audioPlayer) { Mutex::Autolock autoLock(mLock); CHECK(!(mFlags & PLAYING)); mAudioPlayer = audioPlayer; @@ -1513,13 +1513,13 @@ status_t PreviewPlayer::resume() { status_t err; if (state->mFileSource != NULL) { - err = AwesomePlayer::setDataSource_l(state->mFileSource); + err = PreviewPlayerBase::setDataSource_l(state->mFileSource); if (err == OK) { mFileSource = state->mFileSource; } } else { - err = AwesomePlayer::setDataSource_l(state->mUri, &state->mUriHeaders); + err = PreviewPlayerBase::setDataSource_l(state->mUri, &state->mUriHeaders); } if (err != OK) { |