[0.2.94] remove additional handling of lang code

- move the language code converting and error handling
  to libmm-player

Change-Id: I7b036b345bee2ed6467ecc8aa7b64a03c097b6cb

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index 6586c1f..b83ab76 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -2315,7 +2315,6 @@ int legacy_player_get_track_language_code(player_h player, player_stream_type_e
                return PLAYER_ERROR_INVALID_STATE;
        }
 
-       char *language_code = NULL;
        MMPlayerTrackType track_type = 0;
        switch (type) {
        case PLAYER_STREAM_TYPE_AUDIO:
@@ -2332,31 +2331,16 @@ int legacy_player_get_track_language_code(player_h player, player_stream_type_e
                return PLAYER_ERROR_INVALID_PARAMETER;
        }
 
-       int ret = mm_player_get_track_language_code(handle->mm_handle, track_type, index, &language_code);
-       if (ret != MM_ERROR_NONE) {
-               if (language_code != NULL)
-                       free(language_code);
+       *code = NULL;
+       int ret = mm_player_get_track_language_code(handle->mm_handle, track_type, index, code);
 
-               language_code = NULL;
+       if (ret != MM_ERROR_NONE) {
                return __player_convert_error_code(ret, (char *)__FUNCTION__);
-       } else {
-               int code_len = 0;
-               *code = NULL;
-               if (language_code != NULL && strncmp(language_code, "und", 3)) {
-                       code_len = 2;
-                       *code = strndup(language_code, code_len);
-               } else {
-                       code_len = 3;
-                       *code = strndup("und", code_len);
-               }
-               *len = code_len;
-
-               if (language_code)
-                       free(language_code);
-
-               language_code = NULL;
-               return PLAYER_ERROR_NONE;
        }
+
+       LOGD("idx %d, lang code %s", index, *code);
+       *len = strlen(*code);
+       return PLAYER_ERROR_NONE;
 }
 
 int legacy_player_set_video_roi_area(player_h player, double scale_x,

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index e8874f7..5df9c50 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.93
+Version:    0.2.94
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0