From 7485c2989d727a1d0c14a66fb75e140f885a1583 Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Mon, 19 Mar 2012 11:35:29 -0700 Subject: Refactor HW config to use hw.camera_back, and hw.camera_front properties. This is a continuation of an effort to simplify HW config, and make the UI for it clearer. This CL gets rid of multiple camera emulation properties, combining everything into just two properties: - hw.camera_back that controls emulation of a camera facing back, and - hw.camera_front that controls emulation of a camera facing front. Change-Id: Ia114ae4caf2053685cbff00f39088e5b5be2952c --- android/help.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'android/help.c') diff --git a/android/help.c b/android/help.c index db630e0..54d2f10 100644 --- a/android/help.c +++ b/android/help.c @@ -1457,34 +1457,36 @@ help_gpu(stralloc_t* out) } static void -help_fake_camera(stralloc_t* out) +help_camera_back(stralloc_t* out) { PRINTF( - " Use -fake-camera to control fake camera emulation.\n" + " Use -camera-back to control emulation of a camera facing back.\n" " Valid values for are:\n\n" - " off -> disable fake camera emulation\n" - " back -> fake camera is facing back\n" - " front -> fake camera is facing front\n\n" + " emulated -> camera will be emulated using software ('fake') camera emulation\n" + " webcam -> camera will be emulated using a webcamera connected to the host\n" + " none -> camera emulation will be disabled\n\n" ); } static void -help_webcam(stralloc_t* out) +help_camera_front(stralloc_t* out) { PRINTF( - " Use -webcam off to disable web camera emulation.\n" - " Use -webcam list to list web cameras available for emulation.\n" - " Use -webcam name=[,dir=] to setup parameters for web camera emulation.\n" - - " platform-independent name identifying emulated camera device.\n" - " use '-webcam list' to obtain the list of emulated camera devices.\n" - " defines direction the camera is facing. Valid values are:\n\n" + " Use -camera-front to control emulation of a camera facing front.\n" + " Valid values for are:\n\n" - " front -> emulate camera as facing front\n" - " back -> emulate camera as facing back\n\n" + " emulated -> camera will be emulated using software ('fake') camera emulation\n" + " webcam -> camera will be emulated using a webcamera connected to the host\n" + " none -> camera emulation will be disabled\n\n" + ); +} - " Default direction value for emulated web camera is 'front'\n\n" +static void +help_webcam_list(stralloc_t* out) +{ + PRINTF( + " Use -webcam-list to list web cameras available for emulation.\n\n" ); } -- cgit v1.1