diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-05-12 07:48:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:48:41 -0700 |
| commit | d8c33747afbe98e893e0569f3bf45b67a9e8e728 (patch) | |
| tree | b1bc2ccdd689301479741bfbd97b212bcdb022ed /include | |
| parent | a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4 (diff) | |
| parent | 78624e41da166712aaa5ae47e4d3467337ac810a (diff) | |
| download | frameworks_base-d8c33747afbe98e893e0569f3bf45b67a9e8e728.zip frameworks_base-d8c33747afbe98e893e0569f3bf45b67a9e8e728.tar.gz frameworks_base-d8c33747afbe98e893e0569f3bf45b67a9e8e728.tar.bz2 | |
am 78624e41: Add remove method in CameraParameters class.
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp
* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
Add remove method in CameraParameters class.
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 3b0e9e5..5ea83a5 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -39,23 +39,16 @@ public: int getInt(const char *key) const; float getFloat(const char *key) const; - /* preview-size=176x144 */ + void remove(const char *key); + void setPreviewSize(int width, int height); void getPreviewSize(int *width, int *height) const; - - /* preview-fps=15 */ void setPreviewFrameRate(int fps); int getPreviewFrameRate() const; - - /* preview-format=rgb565|yuv422 */ void setPreviewFormat(const char *format); const char *getPreviewFormat() const; - - /* picture-size=1024x768 */ void setPictureSize(int width, int height); void getPictureSize(int *width, int *height) const; - - /* picture-format=yuv422|jpeg */ void setPictureFormat(const char *format); const char *getPictureFormat() const; |