Fix some issues with language tags

Correctly set the Language metadata up as a QLocale on
gstreamer, and convert it to a human readable language
for display.

Add "No Subtitles" entry to the subtitle selection menu
in the player.

Change-Id: I58628456aa845a0a61872a894c6c4859dc752e54
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp
index 311922a9e..e01f88b16 100644
--- a/src/multimedia/qmediametadata.cpp
+++ b/src/multimedia/qmediametadata.cpp
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
     \row \li Description \li A description of the media.  \li QString
     \row \li Genre \li The genre of the media.  \li QStringList
     \row \li Date \li The date of the media. \li QDate.
-    \row \li Language \li The language of media, as an ISO 639-2 code. \li QString
+    \row \li Language \li The language of media. \li QLocale::Language
 
     \row \li Publisher \li The publisher of the media.  \li QString
     \row \li Copyright \li The media's copyright notice.  \li QString
@@ -229,7 +229,6 @@ QString QMediaMetaData::stringValue(QMediaMetaData::Key key) const
     case Comment:
     case Description:
     case Genre:
-    case Language:
     case Publisher:
     case Copyright:
     case Date:
@@ -246,6 +245,10 @@ QString QMediaMetaData::stringValue(QMediaMetaData::Key key) const
     case Orientation:
     case LeadPerformer:
         return value.toString();
+    case Language: {
+        auto l = value.value<QLocale::Language>();
+        return QLocale::languageToString(l);
+    }
     case Duration: {
         QTime time = QTime::fromMSecsSinceStartOfDay(value.toInt());
         return time.toString();