[UTC][dali-adaptor][ACR-1552][Add capture APIs in common profile]

 - Dali::Capture is originally only supported for the Wearable profile.
 - This patch copy the utc information to the mobile and iot.

Change-Id: I438cb582c86acdf03f9927137cd2c37e285e0ae5
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>

diff --git a/src/utc/dali-adaptor/CMakeLists.txt b/src/utc/dali-adaptor/CMakeLists.txt
index a0f7e640ef647a6581dea0b4fdd5ac7f61f8a663..54fc1dc1ef2ff6794dbd53284413a720774bc821 100644 (file)
--- a/src/utc/dali-adaptor/CMakeLists.txt
+++ b/src/utc/dali-adaptor/CMakeLists.txt
@@ -17,14 +17,14 @@ SET(TC_SOURCES
     ttsplayer/utc-dali-ttsplayer-common.cpp
     application/utc-dali-application.cpp
     application/utc-dali-application-common.cpp
+    capture/utc-dali-capture.cpp
+    capture/utc-dali-capture-common.cpp
 )
 
 IF(DEFINED WEARABLE)
 SET(TC_SOURCES ${TC_SOURCES}
     application/utc-dali-watch.cpp
     application/utc-dali-watch-time.cpp
-    capture/utc-dali-capture.cpp
-    capture/utc-dali-capture-common.cpp
 )
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
     ${CAPI_LIB}

diff --git a/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h b/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h
index 484ca6b2c60af18971dbbbea26a63c4a7eac9b00..48f6b6180b57da7a70d9efb6284e541dd6f4a33e 100755 (executable)
--- a/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h
+++ b/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h
@@ -31,6 +31,8 @@ extern void utc_Dali_TtsPlayer_startup(void);
 extern void utc_Dali_TtsPlayer_cleanup(void);
 extern void utc_Dali_Application_startup(void);
 extern void utc_Dali_Application_cleanup(void);
+extern void utc_Dali_Capture_startup(void);
+extern void utc_Dali_Capture_cleanup(void);
 
 extern int UtcDaliTimerNewP(void);
 extern int UtcDaliTimerSetGetIntervalP(void);
@@ -156,6 +158,14 @@ extern int UtcDaliApplicationLowBatterySignalP(void);
 extern int UtcDaliApplicationLowBatterySignalN(void);
 extern int UtcDaliApplicationLowMemorySignalP(void);
 extern int UtcDaliApplicationLowMemorySignalN(void);
+extern int UtcDaliCaptureConstructorP(void);
+extern int UtcDaliCaptureNewP(void);
+extern int UtcDaliCaptureNewCameraP(void);
+extern int UtcDaliCaptureAssignmentP(void);
+extern int UtcDaliCaptureDownCastP(void);
+extern int UtcDaliCaptureStartP(void);
+extern int UtcDaliCaptureStartColorP(void);
+extern int UtcDaliCaptureFinishedN(void);
 
 testcase tc_array[] = {
        {"UtcDaliTimerNewP",UtcDaliTimerNewP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
@@ -282,6 +292,14 @@ testcase tc_array[] = {
        {"UtcDaliApplicationLowBatterySignalN",UtcDaliApplicationLowBatterySignalN,utc_Dali_Application_startup,utc_Dali_Application_cleanup},
        {"UtcDaliApplicationLowMemorySignalP",UtcDaliApplicationLowMemorySignalP,utc_Dali_Application_startup,utc_Dali_Application_cleanup},
        {"UtcDaliApplicationLowMemorySignalN",UtcDaliApplicationLowMemorySignalN,utc_Dali_Application_startup,utc_Dali_Application_cleanup},
+  {"UtcDaliCaptureConstructorP",UtcDaliCaptureConstructorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureNewP",UtcDaliCaptureNewP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureNewCameraP",UtcDaliCaptureNewCameraP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureAssignmentP",UtcDaliCaptureAssignmentP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureDownCastP",UtcDaliCaptureDownCastP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureStartP",UtcDaliCaptureStartP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureStartColorP",UtcDaliCaptureStartColorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureFinishedN",UtcDaliCaptureFinishedN,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
        {NULL, NULL}
 };
 

diff --git a/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h b/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h
index 484ca6b2c60af18971dbbbea26a63c4a7eac9b00..48f6b6180b57da7a70d9efb6284e541dd6f4a33e 100755 (executable)
--- a/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h
+++ b/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h
@@ -31,6 +31,8 @@ extern void utc_Dali_TtsPlayer_startup(void);
 extern void utc_Dali_TtsPlayer_cleanup(void);
 extern void utc_Dali_Application_startup(void);
 extern void utc_Dali_Application_cleanup(void);
+extern void utc_Dali_Capture_startup(void);
+extern void utc_Dali_Capture_cleanup(void);
 
 extern int UtcDaliTimerNewP(void);
 extern int UtcDaliTimerSetGetIntervalP(void);
@@ -156,6 +158,14 @@ extern int UtcDaliApplicationLowBatterySignalP(void);
 extern int UtcDaliApplicationLowBatterySignalN(void);
 extern int UtcDaliApplicationLowMemorySignalP(void);
 extern int UtcDaliApplicationLowMemorySignalN(void);
+extern int UtcDaliCaptureConstructorP(void);
+extern int UtcDaliCaptureNewP(void);
+extern int UtcDaliCaptureNewCameraP(void);
+extern int UtcDaliCaptureAssignmentP(void);
+extern int UtcDaliCaptureDownCastP(void);
+extern int UtcDaliCaptureStartP(void);
+extern int UtcDaliCaptureStartColorP(void);
+extern int UtcDaliCaptureFinishedN(void);
 
 testcase tc_array[] = {
        {"UtcDaliTimerNewP",UtcDaliTimerNewP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
@@ -282,6 +292,14 @@ testcase tc_array[] = {
        {"UtcDaliApplicationLowBatterySignalN",UtcDaliApplicationLowBatterySignalN,utc_Dali_Application_startup,utc_Dali_Application_cleanup},
        {"UtcDaliApplicationLowMemorySignalP",UtcDaliApplicationLowMemorySignalP,utc_Dali_Application_startup,utc_Dali_Application_cleanup},
        {"UtcDaliApplicationLowMemorySignalN",UtcDaliApplicationLowMemorySignalN,utc_Dali_Application_startup,utc_Dali_Application_cleanup},
+  {"UtcDaliCaptureConstructorP",UtcDaliCaptureConstructorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureNewP",UtcDaliCaptureNewP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureNewCameraP",UtcDaliCaptureNewCameraP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureAssignmentP",UtcDaliCaptureAssignmentP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureDownCastP",UtcDaliCaptureDownCastP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureStartP",UtcDaliCaptureStartP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureStartColorP",UtcDaliCaptureStartColorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureFinishedN",UtcDaliCaptureFinishedN,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
        {NULL, NULL}
 };
 

diff --git a/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h b/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h
index e7555be1390a7a99b0b6c2ae470ce676cefbe923..d1b1c77ce4ce34dc07f078f2cfe1aa1cdcc5bdc6 100755 (executable)
--- a/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h
+++ b/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h
@@ -344,14 +344,14 @@ testcase tc_array[] = {
        {"UtcDaliWatchTimeGetUtcTimeStamp",UtcDaliWatchTimeGetUtcTimeStamp,utc_dali_watchtime_startup,utc_dali_watchtime_cleanup},
        {"UtcDaliWatchTimeGetTimeZone",UtcDaliWatchTimeGetTimeZone,utc_dali_watchtime_startup,utc_dali_watchtime_cleanup},
        {"UtcDaliWatchTimeGetDaylightSavingTimeStatus",UtcDaliWatchTimeGetDaylightSavingTimeStatus,utc_dali_watchtime_startup,utc_dali_watchtime_cleanup},
-    {"UtcDaliCaptureConstructorP",UtcDaliCaptureConstructorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
-    {"UtcDaliCaptureNewP",UtcDaliCaptureNewP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
-    {"UtcDaliCaptureNewCameraP",UtcDaliCaptureNewCameraP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
-    {"UtcDaliCaptureAssignmentP",UtcDaliCaptureAssignmentP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
-    {"UtcDaliCaptureDownCastP",UtcDaliCaptureDownCastP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
-    {"UtcDaliCaptureStartP",UtcDaliCaptureStartP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
-    {"UtcDaliCaptureStartColorP",UtcDaliCaptureStartColorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
-    {"UtcDaliCaptureFinishedN",UtcDaliCaptureFinishedN,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureConstructorP",UtcDaliCaptureConstructorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureNewP",UtcDaliCaptureNewP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureNewCameraP",UtcDaliCaptureNewCameraP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureAssignmentP",UtcDaliCaptureAssignmentP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureDownCastP",UtcDaliCaptureDownCastP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureStartP",UtcDaliCaptureStartP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureStartColorP",UtcDaliCaptureStartColorP,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
+  {"UtcDaliCaptureFinishedN",UtcDaliCaptureFinishedN,utc_Dali_Capture_startup,utc_Dali_Capture_cleanup},
        {NULL, NULL}
 };