ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 

* commit '307003a844c90458bcfd7398c44bbae734936238':
  integrate videoeditor preview player.
This commit is contained in:
Dharmaray Kundargi 2011-01-17 11:40:16 -08:00 committed by Android Git Automerger
parent 35421c75c8 f47c93b79c
commit b610bb8ea5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/surfaceflinger/Surface.h
View File

@ -100,6 +100,9 @@ private:
friend class MediaPlayer;
// for testing
friend class Test;
// videoEditor preview classes
friend class VideoEditorPreviewController;
const sp<ISurface>& getISurface() const { return mSurface; }
@ -181,6 +184,9 @@ private:
friend class SoftwareRenderer;
// this is just to be able to write some unit tests
friend class Test;
// videoEditor preview classes
friend class VideoEditorPreviewController;
friend class PreviewRenderer;
private:
friend class SurfaceComposerClient;