Add stitching version API 67/139067/1 tizen_4.0_tv accepted/tizen/4.0/unified/20170816.013123 accepted/tizen/4.0/unified/20170828.223718 accepted/tizen/unified/20170717.170846 submit/tizen/20170717.070038 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170828.100002 tizen_4.0.IoT.p1_release tizen_4.0.IoT.p2_release tizen_4.0.m2_release
authorjh8801.jung <jh8801.jung@samsung.com>
Mon, 17 Jul 2017 06:49:58 +0000 (15:49 +0900)
committerjh8801.jung <jh8801.jung@samsung.com>
Mon, 17 Jul 2017 06:50:14 +0000 (15:50 +0900)
Signed-off-by: jh8801.jung <jh8801.jung@samsung.com>
Change-Id: I501d1426a4348a400705d4817b7eb327db488b11

include/mtp_gdbus_deviceinfo.h
include/mtp_internal.h
packaging/capi-network-mtp.spec
src/mtp.c
src/mtp_gdbus_deviceinfo.c
src/mtp_gdbuslib.xml
test/mtp_unit_test.c

index d3fa84d..f670cb8 100755 (executable)
@@ -28,5 +28,6 @@ mtp_error_e mtp_gdbus_deviceinfo_get_serial_number(int mtp_device, char **serial
 mtp_error_e mtp_gdbus_deviceinfo_get_device_version(int mtp_device, char **deviceversion);
 mtp_error_e mtp_gdbus_deviceinfo_get_bus_location(int mtp_device, int *bus_location);
 mtp_error_e mtp_gdbus_deviceinfo_get_device_number(int mtp_device, int *device_number);
+mtp_error_e mtp_gdbus_deviceinfo_get_stitching_engine_version(int mtp_device, char **stitching_engine_version);
 
 #endif
index 7a16e69..6d5dda1 100755 (executable)
@@ -53,6 +53,7 @@ int mtp_objectinfo_get_object_info(int mtp_device, int object_handle, mtp_object
 int mtp_delete_object(mtp_device_h mtp_device, mtp_object_h object_handle);
 int mtp_deviceinfo_get_bus_location(mtp_device_h mtp_device, int *bus_locaton);
 int mtp_deviceinfo_get_device_number(mtp_device_h mtp_device, int *device_number);
+int mtp_deviceinfo_get_stitching_engine_version(mtp_device_h mtp_device, char **stitching_engine_version);
 int mtp_get_partial_object(int mtp_device, int object_handle, char *dest_path, int offset, int max_bytes, int *actual_written);
 
 #ifdef __cplusplus
index 89a7e21..a395812 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       capi-network-mtp
 Summary:    A MTP library in Native API
-Version:    1.3.18
+Version:    1.3.19
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0
index 0c3eae3..4771011 100755 (executable)
--- a/src/mtp.c
+++ b/src/mtp.c
@@ -524,6 +524,32 @@ int mtp_deviceinfo_get_device_number(int mtp_device, int *device_number)
 
        return ret;
 }
+
+int mtp_deviceinfo_get_stitching_engine_version(mtp_device_h mtp_device,
+       char **stitching_engine_version)
+{
+       int ret = MTP_ERROR_NONE;
+
+       _BEGIN();
+
+       /* precondition check start */
+
+       CHECK_SUPPORTED();
+       CHECK_INIT();
+       CHECK_ACTIVATED();
+       cond_expr_ret(mtp_device == 0, MTP_ERROR_INVALID_PARAMETER);
+
+       /* precondition check end */
+
+       ret = mtp_gdbus_deviceinfo_get_stitching_engine_version(mtp_device, stitching_engine_version);
+
+       TC_PRT("stitching engine version %s", *stitching_engine_version);
+
+       _END();
+
+       return ret;
+}
+
 /* LCOV_EXCL_STOP */
 
 /* Storage Info */
index a319dee..a278455 100755 (executable)
@@ -166,5 +166,29 @@ mtp_error_e mtp_gdbus_deviceinfo_get_device_number(int mtp_device, int *device_n
 
        return result;
 }
+
+mtp_error_e mtp_gdbus_deviceinfo_get_stitching_engine_version(int mtp_device,
+       char **stitching_engine_version)
+{
+       mtp_error_e result = MTP_ERROR_NONE;
+       GError *error = NULL;
+
+       if (deviceinfo_proxy == NULL)
+                       return MTP_ERROR_NOT_COMM_INITIALIZED;
+
+       if (mtp_gdbuslib_deviceinfo_call_get_stitching_engine_version_sync(
+                       deviceinfo_proxy,
+                       mtp_device,
+                       stitching_engine_version,
+                       &result,
+                       NULL,
+                       &error) == FALSE) {
+               result = MTP_ERROR_COMM_ERROR;
+               g_error_free(error);
+       }
+
+       return result;
+}
+
 /* LCOV_EXCL_STOP */
 
index f497f7e..fd16a54 100755 (executable)
                        <arg type="i" name="device_number" direction="out" />
                        <arg type="i" name="result" direction="out" />
                </method>
+
+               <method name="GetStitchingEngineVersion">
+                       <arg type="i" name="mtp_device" direction="in" />
+                       <arg type="s" name="stitching_engine_version" direction="out" />
+                       <arg type="i" name="result" direction="out" />
+               </method>
        </interface>
        <interface name="org.tizen.mtp.storageinfo">
                <method name="GetDescription">
index e3c9d51..25b430b 100755 (executable)
@@ -10,7 +10,7 @@
 #include <mtp_internal.h>
 
 #define BUFFER_LEN 100
-#define TEST_CASE_MAX 39
+#define TEST_CASE_MAX 40
 #define TEST_LIST_MAX 20
 
 #define PRT(format, args...) printf("%s:%d() "format, __FUNCTION__, __LINE__, ##args)
@@ -521,6 +521,19 @@ int deviceinfo_test_get_deviceversion(void)
        return ret;
 }
 
+int deviceinfo_test_get_stitching_engine_version(void)
+{
+       int ret = 0;
+       char *stitching_engine_version = NULL;
+       BEGIN();
+
+       ret = mtp_deviceinfo_get_stitching_engine_version(mtp_device, &stitching_engine_version);
+       TC_PRT("ret[%d]: stitching_engine_version[%s]", ret, stitching_engine_version);
+
+       END();
+       return ret;
+}
+
 
 int storageinfo_test_get_description(void)
 {
@@ -1162,6 +1175,7 @@ tc_table_t tc_table[] = {
        {"test add callback function",                                  36,     application_test_add_event_callback},
        {"test remove callback function",                               37,     application_test_remove_event_callback},
        {"mtp_get_partial_object",                                                      38,     manager_test_get_partial_object},
+       {"mtp_deviceinfo_get_stitching_engine_version",         39,     deviceinfo_test_get_stitching_engine_version},
        {"get object and get thumbnail test",                   TEST_CASE_MAX,  NULL},
 
        /*-----------*/