From c9dedc4e1d0c8343ab1029cb601253826cd67c81 Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Sun, 1 May 2011 12:36:22 -0700
Subject: Separate preview player from AwesomePlayer and also video editor
 audio player from AudioPlayer

Change-Id: I436ac541df3e34ad16be95a50c96d7af67fa15e4
---
 libvideoeditor/lvpp/PreviewPlayer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libvideoeditor/lvpp/PreviewPlayer.cpp')

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) {
-- 
cgit v1.1