sync upstream lib/noson

janbar-noson-9fadd35
janbar · Jul 22, 2017 · a0cbda7 · a0cbda7
1 parent 3a39fc9
commit a0cbda7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 27 deletions.
diff --git a/backend/lib/noson/noson/CMakeLists.txt b/backend/lib/noson/noson/CMakeLists.txt
@@ -20,7 +20,7 @@ endif ()
 
 ###############################################################################
 # set lib version here
-set (NOSON_LIB_VERSION "1.5.2")
+set (NOSON_LIB_VERSION "1.5.3")
 set (NOSON_LIB_SOVERSION "1")
 
 ###############################################################################

diff --git a/backend/lib/noson/noson/src/smapimetadata.cpp b/backend/lib/noson/noson/src/smapimetadata.cpp
@@ -169,7 +169,6 @@ SMAPIItemList SMAPIMetadata::GetItems()
       // no browsable
       data.item.reset(new DigitalItem(DigitalItem::Type_item, DigitalItem::SubType_unknown));
 
-    std::string tmp; // a temporary string
     switch (data.item->subType())
     {
     // container
@@ -186,14 +185,8 @@ SMAPIItemList SMAPIMetadata::GetItems()
     case DigitalItem::SubType_album:
       data.item->SetProperty(DIDL_QNAME_DC "title", media.GetAttribut("title"));
       data.item->SetProperty(DIDL_QNAME_UPNP "albumArtURI", media.GetAttribut("albumArtURI"));
-      tmp = media.GetAttribut("author");
-      if (!tmp.empty())
-      {
-        data.item->SetProperty(DIDL_QNAME_DC "creator", tmp);
-        data.item->SetProperty(DIDL_QNAME_DC "contributor", media.GetAttribut("artist"));
-      }
-      else
-        data.item->SetProperty(DIDL_QNAME_DC "creator", media.GetAttribut("artist"));
+      data.item->SetProperty(DIDL_QNAME_DC "creator", media.GetAttribut("author"));
+      data.item->SetProperty(DIDL_QNAME_DC "contributor", media.GetAttribut("artist"));
       break;
     case DigitalItem::SubType_genre:
       data.item->SetProperty(DIDL_QNAME_DC "title", media.GetAttribut("title"));
@@ -209,14 +202,8 @@ SMAPIItemList SMAPIMetadata::GetItems()
       if (itemType == track)
       {
         data.item->SetProperty(DIDL_QNAME_UPNP "albumArtURI", media.GetAttribut("albumArtURI"));
-        tmp = media.GetAttribut("composer");
-        if (!tmp.empty())
-        {
-          data.item->SetProperty(DIDL_QNAME_DC "creator", tmp);
-          data.item->SetProperty(DIDL_QNAME_DC "contributor", media.GetAttribut("artist"));
-        }
-        else
-          data.item->SetProperty(DIDL_QNAME_DC "creator", media.GetAttribut("artist"));
+        data.item->SetProperty(DIDL_QNAME_DC "creator", media.GetAttribut("composer"));
+        data.item->SetProperty(DIDL_QNAME_DC "contributor", media.GetAttribut("artist"));
         data.item->SetProperty(DIDL_QNAME_UPNP "album", media.GetAttribut("album"));
         data.item->SetProperty(DIDL_QNAME_UPNP "originalTrackNumber", media.GetAttribut("trackNumber"));
       }

diff --git a/po/noson.janbar.pot b/po/noson.janbar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-06 13:43+0200\n"
+"POT-Creation-Date: 2017-07-22 19:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -426,36 +426,36 @@ msgstr ""
 msgid "Registering the service"
 msgstr ""
 
-#: ../app/components/ServiceLogin.qml:56
-#: ../app/components/ServiceRegistration.qml:56
+#: ../app/components/ServiceLogin.qml:55
+#: ../app/components/ServiceRegistration.qml:68
 msgid ""
 "This will require to authenticate against the music service again, as "
 "credentials cannot be retrieved from Sonos device."
 msgstr ""
 
-#: ../app/components/ServiceLogin.qml:82
+#: ../app/components/ServiceLogin.qml:81
 msgid "User name"
 msgstr ""
 
-#: ../app/components/ServiceLogin.qml:95
+#: ../app/components/ServiceLogin.qml:94
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: this appears in a button with limited space (around 30 characters)
-#: ../app/components/ServiceLogin.qml:104
+#: ../app/components/ServiceLogin.qml:103
 msgid "Submit"
 msgstr ""
 
-#: ../app/components/ServiceLogin.qml:122
+#: ../app/components/ServiceLogin.qml:121
 msgid "Login failed."
 msgstr ""
 
 #. TRANSLATORS: this appears in a button with limited space (around 30 characters)
-#: ../app/components/ServiceRegistration.qml:81
+#: ../app/components/ServiceRegistration.qml:93
 msgid "Start service registration"
 msgstr ""
 
-#: ../app/components/ServiceRegistration.qml:97
+#: ../app/components/ServiceRegistration.qml:109
 msgid "Click the link below to authorize this application to use the service."
 msgstr ""