[stubs] Display requested message when stub files are used and no opt…

…ical drive is present
popcornmix · Apr 3, 2020 · 91947fe · 91947fe
1 parent 7b39009
commit 91947fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -2038,15 +2038,7 @@ msgctxt "#434"
 msgid "From {0:s} at {1:d} {2:s}"
 msgstr ""
 
-#: xbmc/Application.cpp
-msgctxt "#435"
-msgid "No optical disc drive detected"
-msgstr ""
-
-#: xbmc/Application.cpp
-msgctxt "#436"
-msgid "You need an optical disc drive to play this video"
-msgstr ""
+#empty strings from id 435 to 436
 
 msgctxt "#437"
 msgid "Removable disk"

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -2781,10 +2781,23 @@ bool CApplication::PlayFile(CFileItem item, const std::string& player, bool bRes
         // Can't do better as CGUIDialogPlayEject calls CMediaManager::IsDiscInDrive, which assumes default DVD drive anyway
         return MEDIA_DETECT::CAutorun::PlayDiscAskResume();
     }
-    else
 #endif
-      HELPERS::ShowOKDialogText(CVariant{435}, CVariant{436});
 
+    // Figure out Lines 1 and 2 of the dialog
+    std::string strLine1, strLine2;
+    CXBMCTinyXML discStubXML;
+    if (discStubXML.LoadFile(item.GetPath()))
+    {
+      TiXmlElement * pRootElement = discStubXML.RootElement();
+      if (!pRootElement || StringUtils::CompareNoCase(pRootElement->Value(), "discstub") != 0)
+        CLog::Log(LOGERROR, "Error loading %s, no <discstub> node", item.GetPath().c_str());
+      else
+      {
+        XMLUtils::GetString(pRootElement, "title", strLine1);
+        XMLUtils::GetString(pRootElement, "message", strLine2);
+      }
+    }
+    HELPERS::ShowOKDialogText(strLine1, strLine2);
     return true;
   }