diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2015-09-01 20:29:12 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-09-01 20:29:12 +0900 |
| commit | 64263aeeec5eaaafa154b5af6e4b89add4497862 (patch) | |
| tree | 98c6145630db4f7568051a8ea1dfeb90f3a4734d | |
| parent | e3c2ca9b70dbbf1805ce2240d49370d6d2fcd0f5 (diff) | |
| download | camera-64263aeeec5eaaafa154b5af6e4b89add4497862.tar.gz camera-64263aeeec5eaaafa154b5af6e4b89add4497862.tar.bz2 camera-64263aeeec5eaaafa154b5af6e4b89add4497862.zip | |
Fix build error on wearable profilesubmit/tizen/20150901.113441accepted/tizen/wearable/20150902.004734accepted/tizen/tv/20150902.004723accepted/tizen/mobile/20150902.004718
Change-Id: I7686953faf36cd6d9c0691c96d648271778e6572
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rwxr-xr-x | packaging/capi-media-camera.spec | 2 | ||||
| -rw-r--r-- | src/camera.c | 2 | ||||
| -rw-r--r-- | src/camera_internal.c | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index aecfb06..9ff8cc3 100755 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -3,7 +3,7 @@ Name: capi-media-camera Summary: A Camera library in Tizen C API -Version: 0.2.4 +Version: 0.2.5 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index 76d3422..d2faba8 100644 --- a/src/camera.c +++ b/src/camera.c @@ -32,7 +32,9 @@ #include <tbm_surface_internal.h> #include <Evas.h> #include <Ecore.h> +#ifdef HAVE_WAYLAND #include <Ecore_Wayland.h> +#endif /* HAVE_WAYLAND */ #include <Elementary.h> #ifdef LOG_TAG diff --git a/src/camera_internal.c b/src/camera_internal.c index 9db01a2..92fbd5e 100644 --- a/src/camera_internal.c +++ b/src/camera_internal.c @@ -20,7 +20,9 @@ #include <string.h> #include <mm.h> #include <mm_camcorder.h> +#ifdef HAVE_WAYLAND #include <mm_camcorder_mused.h> +#endif /* HAVE_WAYLAND */ #include <mm_types.h> #include <camera.h> #include <camera_internal.h> @@ -164,10 +166,12 @@ int camera_get_video_caps(camera_h camera, char **caps) int ret; camera_s *handle = (camera_s *)camera; +#ifdef HAVE_WAYLAND ret = mm_camcorder_mused_get_video_caps(handle->mm_handle, caps); if(ret != MM_ERROR_NONE) { return __convert_camera_error_code(__func__, ret); } +#endif /* HAVE_WAYLAND */ return CAMERA_ERROR_NONE; } |