commit c9dedc4e1d0c8343ab1029cb601253826cd67c81
author James Dong <jdong@google.com> Sun May 01 12:36:22 2011 -0700
committer James Dong <jdong@google.com> Sun May 01 13:52:00 2011 -0700
tree 08c3e7d3c4c18c7f0dee9b991780b0e117c00b4b
parent acb62af8ccf493b38decd91d94eb18395b6f9461

Separate preview player from AwesomePlayer and also video editor audio player from AudioPlayer

Change-Id: I436ac541df3e34ad16be95a50c96d7af67fa15e4

libvideoeditor/lvpp/VideoEditorAudioPlayer.h

diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.h b/libvideoeditor/lvpp/VideoEditorAudioPlayer.h
index f5232cf..73aea65 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.h
@@ -27,7 +27,8 @@
 #include "VideoEditorMain.h"

 #include "M4OSA_FileReader.h"

 #include "VideoEditorBGAudioProcessing.h"

-#include <media/stagefright/AudioPlayer.h>

+#include "AudioPlayerBase.h"

+#include "PreviewPlayerBase.h"

 

 namespace android {

 

@@ -36,7 +37,7 @@
 class PreviewPlayer;

 

 

-class VideoEditorAudioPlayer : public AudioPlayer {

+class VideoEditorAudioPlayer : public AudioPlayerBase {

 public:

     enum {

         REACHED_EOS,

@@ -44,7 +45,7 @@
     };

 

     VideoEditorAudioPlayer(const sp<MediaPlayerBase::AudioSink> &audioSink,

-        AwesomePlayer *audioObserver = NULL);

+        PreviewPlayerBase *audioObserver = NULL);

 

     virtual ~VideoEditorAudioPlayer();

 

@@ -58,7 +59,7 @@
         M4OSA_UInt32 pBGAudioCurrentMediaBeginCutTS,

         M4OSA_UInt32 pBGAudioCurrentMediaVolumeVal);

 

-    void setObserver(AwesomePlayer *observer);

+    void setObserver(PreviewPlayerBase *observer);

     void setSource(const sp<MediaSource> &source);

     sp<MediaSource> getSource();