fixups

Author: CastagnaIT

src/decrypters/DrmEngine.cpp

@@ -433,7 +433,7 @@ bool DRM::CDRMEngine::ConfigureClearKey(std::vector<DRM::DRMInfo>& drmInfos)
 
   const ADP::KODI_PROPS::DrmCfg& drmCfg = kodiProps.GetDrmConfig(KS_CLEARKEY);
 
-  // The ClearKey configuration will replace all DRMInfo when
+  // The ClearKey configuration can add (or replace) CK DRMInfo when
   // it finds a custom license uri or keys
   if (drmCfg.license.serverUri.empty() && drmCfg.license.keys.empty())
     return false;
@@ -442,7 +442,17 @@ bool DRM::CDRMEngine::ConfigureClearKey(std::vector<DRM::DRMInfo>& drmInfos)
   const CryptoMode cryptoMode = drmInfos[0].cryptoMode;
   const std::string defaultKid = drmInfos[0].defaultKid;
 
-  drmInfos.clear();
+  if (kodiProps.GetDrmConfigs().size() == 1) // Single config (CK)
+  {
+    // Delete all the DRMInfo, so you can force CK even if the manifest uses a different DRM
+    drmInfos.clear();
+  }
+  else // More configs, behavior based on "priority" its needed to preserve DRMInfos
+  {
+    drmInfos.erase(std::remove_if(drmInfos.begin(), drmInfos.end(), [](const DRM::DRMInfo& info)
+                                  { return info.keySystem == KS_CLEARKEY; }),
+                   drmInfos.end());
+  }
 
   std::string licenseUri;
 
@@ -488,7 +498,6 @@ bool DRM::CDRMEngine::ConfigureClearKey(std::vector<DRM::DRMInfo>& drmInfos)
   drmInfo.cryptoMode = cryptoMode;
   drmInfo.defaultKid = defaultKid;
   drmInfo.licenseServerUri = licenseUri;
-
   drmInfos.emplace_back(drmInfo);
 
   return true;