diff options
Diffstat (limited to 'cmds/bootanimation/BootAnimation.h')
-rw-r--r-- | cmds/bootanimation/BootAnimation.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h index ba1c507..f968b25 100644 --- a/cmds/bootanimation/BootAnimation.h +++ b/cmds/bootanimation/BootAnimation.h @@ -21,7 +21,7 @@ #include <sys/types.h> #include <androidfw/AssetManager.h> -#include <utils/threads.h> +#include <utils/Thread.h> #include <EGL/egl.h> #include <GLES/gl.h> @@ -30,6 +30,7 @@ class SkBitmap; namespace android { +class AudioPlayer; class Surface; class SurfaceComposerClient; class SurfaceControl; @@ -71,6 +72,8 @@ private: String8 path; SortedVector<Frame> frames; bool playUntilComplete; + float backgroundColor[3]; + FileMap* audioFile; }; int fps; int width; @@ -81,11 +84,13 @@ private: status_t initTexture(Texture* texture, AssetManager& asset, const char* name); status_t initTexture(const Animation::Frame& frame); bool android(); + bool readFile(const char* name, String8& outString); bool movie(); void checkExit(); sp<SurfaceComposerClient> mSession; + sp<AudioPlayer> mAudioPlayer; AssetManager mAssets; Texture mAndroid[2]; int mWidth; |