[ScreenMirroring][Source] Change 'scmirroring_src_set_multisink_ability' function...

I checked if statement has wrong branch.
It can't take 1 current.
So i changed it.

And for Multisink test with test case suite,
i added selection with command 'g'.

Change-Id: I27abbe64367da3ea59a50fd86a1fe524640c741d
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec
index 8180d52e101fb8ecc7953b056c172ea21114b209..c3ccf8207612d050e2ec3ac05c48a2b78a3c6a85 100644 (file)
--- a/packaging/capi-media-screen-mirroring.spec
+++ b/packaging/capi-media-screen-mirroring.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-screen-mirroring
 Summary:    A screen mirroring library in Tizen C API
-Version:    0.1.91
+Version:    0.1.92
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/scmirroring_src.c b/src/scmirroring_src.c
index 6d97bff4ffe24a2e29148f391aa6b84b88ee37f2..474f1ff7cd6d35cbc9149dc3466bafa4b88b8a31 100644 (file)
--- a/src/scmirroring_src.c
+++ b/src/scmirroring_src.c
@@ -1,3 +1,4 @@
+
 /*
 * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
 *
@@ -363,7 +364,7 @@ static int __scmirroring_src_send_set_multisink(scmirroring_src_h scmirroring)
        int ret = SCMIRRORING_ERROR_NONE;
        scmirroring_src_s *_scmirroring = (scmirroring_src_s *)scmirroring;
 
-       cmd = g_strdup_printf("SET MULTISINK %d", _scmirroring->resolution);
+       cmd = g_strdup_printf("SET MULTISINK %d", _scmirroring->multisink);
        ret = __scmirroring_src_send_cmd_to_server(_scmirroring, cmd);
        if (ret != SCMIRRORING_ERROR_NONE) {
                SCMIRRORING_SAFE_G_FREE(cmd);
@@ -633,7 +634,7 @@ int scmirroring_src_set_multisink_ability(scmirroring_src_h scmirroring, scmirro
        scmirroring_retvm_if(_scmirroring == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "Handle is NULL");
        scmirroring_retvm_if(_scmirroring->magic_num != SCMIRRORING_MAGIC_NUMBER, SCMIRRORING_ERROR_INVALID_PARAMETER, "Invalid handle");
 
-       if ((multisink < SCMIRRORING_MULTISINK_DISABLE) || (multisink >= SCMIRRORING_MULTISINK_ENABLE)) {
+       if ((multisink < SCMIRRORING_MULTISINK_DISABLE) || (multisink > SCMIRRORING_MULTISINK_ENABLE)) {
                scmirroring_error("INVALID multisink ability : %d", multisink);
                return SCMIRRORING_ERROR_INVALID_PARAMETER;
        }

diff --git a/test/scmirroring_test.c b/test/scmirroring_test.c
index c76a03649aade23cf313d04b249ca0d7b4701532..84ccec91b0ad91c6ad17b93c0b1cc80684318e27 100644 (file)
--- a/test/scmirroring_test.c
+++ b/test/scmirroring_test.c
@@ -49,6 +49,7 @@ static void __displaymenu(void)
        g_print("a : set ip & port(ex. a 192.168.49.1 2022)\n");
        g_print("c : set resolution(ex. c 0 (0 : 1920x1080_P30, 1 : 1280x720_P30, 2 : 960x540_P30, 3: 640x360_P30)\n");
        g_print("f : set connection mode(ex. f 0 (0 : wifi_direct, 1 : Other)\n");
+       g_print("g : set multisink mode(ex. g 1 (0 : disable, 1 : enable)\n");
        g_print("C : Connect\n");
        g_print("I : dIsconnect\n");
        g_print("S : Start  \n");
@@ -105,6 +106,9 @@ static void __interpret(char *cmd)
        } else if (strncmp(cmd, "f", 1) == 0) {
                ret = scmirroring_src_set_connection_mode(g_scmirroring, atoi(value[1]));
                g_print("Connection mode [%d]\n", atoi(value[1]));
+       } else if (strncmp(cmd, "g", 1) == 0) {
+               ret = scmirroring_src_set_multisink_ability(g_scmirroring, atoi(value[1]));
+               g_print("Multisink mode [%d]\n", atoi(value[1]));
        } else if (strncmp(cmd, "C", 1) == 0) {
                g_print("Connect\n");
                ret = scmirroring_src_connect(g_scmirroring);