[v0.2.35] remove fixed val of lang cond len, fix feature check condition

Change-Id: If72d051b3b595aafa7fed20040fcb2fc84038a30
Signed-off-by: Eunhae Choi <eunhae1.choi@samsung.com>
(cherry picked from commit 7adafcd524f62d90397a88d208048eda5f5bc8cf)

diff --git a/legacy/include/legacy_player.h b/legacy/include/legacy_player.h
index 330175b1101556b12cea5be17fdd58896506b345..fc91c4e6fc256aa0fb7204050caa6be81ac8f4a4 100644 (file)
--- a/legacy/include/legacy_player.h
+++ b/legacy/include/legacy_player.h
@@ -1923,6 +1923,7 @@ int legacy_player_get_current_track(player_h player, player_stream_type_e type,
  * @param[in] type The type of target stream
  * @param[in] index  The index of track
  * @param[out] code A language code in ISO 639-1. "und" will be returned if the language is undefined.
+ * @param[out] len length of language code.
  * @return @c 0 on success,
  *         otherwise a negative error value
  * @retval #PLAYER_ERROR_NONE Successful
@@ -1932,7 +1933,7 @@ int legacy_player_get_current_track(player_h player, player_stream_type_e type,
  * @retval #PLAYER_ERROR_NOT_SUPPORTD Not supported
  * @pre The player state must be one of these: #PLAYER_STATE_READY, #PLAYER_STATE_PLAYING, or #PLAYER_STATE_PAUSED
  */
-int legacy_player_get_track_language_code(player_h player, player_stream_type_e type, int index, char **code);
+int legacy_player_get_track_language_code(player_h player, player_stream_type_e type, int index, char **code, int *len);
 
 /**
  * @brief Gets the track count.

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index f783ab7fb1068f81aef3a85b486f2dca5ec74749..8d982b51e2da7fd26b526167d3900ff932005bf2 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -3044,10 +3044,11 @@ int legacy_player_select_track(player_h player, player_stream_type_e type, int i
        return PLAYER_ERROR_NONE;
 }
 
-int legacy_player_get_track_language_code(player_h player, player_stream_type_e type, int index, char **code)
+int legacy_player_get_track_language_code(player_h player, player_stream_type_e type, int index, char **code, int *len)
 {
        PLAYER_INSTANCE_CHECK(player);
        PLAYER_NULL_ARG_CHECK(code);
+       PLAYER_NULL_ARG_CHECK(len);
        player_s *handle = (player_s *)player;
        if (!__player_state_validate(handle, PLAYER_STATE_READY)) {
                LOGE("[%s] PLAYER_ERROR_INVALID_STATE (0x%08x) :  current state - %d", __FUNCTION__, PLAYER_ERROR_INVALID_STATE, handle->state);
@@ -3088,6 +3089,7 @@ int legacy_player_get_track_language_code(player_h player, player_stream_type_e
                        code_len = 3;
                        *code = strndup("und", code_len);
                }
+               *len = code_len;
 
                if (language_code)
                        free(language_code);

diff --git a/legacy/test/legacy_player_test.c b/legacy/test/legacy_player_test.c
index a961496e08d3406317dcf21e181f0499cfeacf76..d3a8af06950b895ba50585a311a21960fcfd0bd0 100644 (file)
--- a/legacy/test/legacy_player_test.c
+++ b/legacy/test/legacy_player_test.c
@@ -1205,11 +1205,13 @@ static void input_subtitle_filename(char *subtitle_filename)
 
 static void switch_subtitle(int index)
 {
+       int len = 0;
        char *lang_code = NULL;
+
        if (legacy_player_select_track(g_player[0], PLAYER_STREAM_TYPE_TEXT, index) != PLAYER_ERROR_NONE)
                g_print("legacy_player_select_track failed\n");
 
-       if (legacy_player_get_track_language_code(g_player[0], PLAYER_STREAM_TYPE_TEXT, index, &lang_code) == PLAYER_ERROR_NONE) {
+       if (legacy_player_get_track_language_code(g_player[0], PLAYER_STREAM_TYPE_TEXT, index, &lang_code, &len) == PLAYER_ERROR_NONE) {
                g_print("selected track code %s\n", lang_code);
                free(lang_code);
        }

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index d22349d86c781afbc0c07f8de5c6d40bf0e0665e..3fd69fe37f7469d666d6fb85c4978149ed5191f1 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -350,7 +350,7 @@ static int _check_supportable(muse_module_h module, char *path)
                ret = PLAYER_ERROR_PERMISSION_DENIED;
                LOGE("security check failed %s", privilege);
        } else {
-               if (strncmp(privilege, INTERNET_PRIVILEGE_NAME, strlen(INTERNET_PRIVILEGE_NAME))) {
+               if (strncmp(privilege, INTERNET_PRIVILEGE_NAME, strlen(INTERNET_PRIVILEGE_NAME)) == 0) {
                        /*check internet feature*/
                        if (!_check_network_availability()) {
                                ret = PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE;
@@ -2526,13 +2526,13 @@ int player_disp_get_track_language_code(muse_module_h module)
        player_stream_type_e type = PLAYER_STREAM_TYPE_DEFAULT;
        int index = 0;
        char *code = NULL;
-       const int code_len = 2;
+       int code_len = 0;
        bool ret_val = TRUE;
 
        player_msg_get2(muse_core_client_get_msg(module), type, INT, index, INT, ret_val);
        if (ret_val) {
                muse_player = (muse_player_handle_s *)muse_core_ipc_get_handle(module);
-               ret = legacy_player_get_track_language_code(muse_player->player_handle, type, index, &code);
+               ret = legacy_player_get_track_language_code(muse_player->player_handle, type, index, &code, &code_len);
        } else {
                ret = PLAYER_ERROR_INVALID_OPERATION;
        }

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index 07581a24ffb16ebcba36dabb30f53b110aa4aff6..423dd9b1577eeab587e117ce5fe70d81517db3bc 100644 (file)
--- a/packaging/mmsvc-player.spec
+++ b/packaging/mmsvc-player.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-player
 Summary:    A Media Player module for muse server
-Version:    0.2.34
+Version:    0.2.35
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0