Fix error playing disc image games

Game items ending in disc image extensions are currently played using VideoPlayer instead of RetroPlayer. This results in a brief buffering dialog before returning to the previous windows.
garbear · Jan 27, 2020 · a88b4fb · a88b4fb
1 parent f0b81e2
commit a88b4fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/system/playercorefactory.xml b/system/playercorefactory.xml
@@ -26,7 +26,7 @@
 
     <!-- DVDs -->
     <rule name="dvd" dvd="true" player="VideoPlayer" />
-    <rule name="dvdimage" dvdimage="true" player="VideoPlayer" />
+    <rule name="dvdimage" dvdimage="true" game="false" player="VideoPlayer" />
 
     <!-- Only VideoPlayer can handle these normally -->
     <rule name="sdp/asf" filetypes="sdp|asf" player="VideoPlayer" />

diff --git a/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp b/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
@@ -45,6 +45,7 @@ void CPlayerSelectionRule::Initialize(TiXmlElement* pRule)
   m_tRemote = GetTristate(pRule->Attribute("remote"));
   m_tAudio = GetTristate(pRule->Attribute("audio"));
   m_tVideo = GetTristate(pRule->Attribute("video"));
+  m_tGame = GetTristate(pRule->Attribute("game"));
 
   m_tBD = GetTristate(pRule->Attribute("bd"));
   m_tDVD = GetTristate(pRule->Attribute("dvd"));
@@ -110,6 +111,8 @@ void CPlayerSelectionRule::GetPlayers(const CFileItem& item, std::vector<std::st
     return;
   if (m_tVideo >= 0 && (m_tVideo > 0) != item.IsVideo())
     return;
+  if (m_tGame >= 0 && (m_tGame > 0) != item.IsGame())
+    return;
   if (m_tInternetStream >= 0 && (m_tInternetStream > 0) != item.IsInternetStream())
     return;
   if (m_tRemote >= 0 && (m_tRemote > 0) != item.IsRemote())

diff --git a/xbmc/cores/playercorefactory/PlayerSelectionRule.h b/xbmc/cores/playercorefactory/PlayerSelectionRule.h
@@ -35,6 +35,7 @@ class CPlayerSelectionRule
 
   int m_tAudio;
   int m_tVideo;
+  int m_tGame;
   int m_tInternetStream;
   int m_tRemote;