Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add plugin:// resolving before queueing next track

  • Loading branch information...
commit fbf1f628a6d0d9345e61624547b58673b7df7a36 1 parent 2908a12
Cyril authored Jonathan Marshall committed
Showing with 9 additions and 4 deletions.
  1. +9 −4 xbmc/Application.cpp
View
13 xbmc/Application.cpp
@@ -4857,19 +4857,24 @@ bool CApplication::OnMessage(CGUIMessage& message)
if (m_pPlayer) m_pPlayer->OnNothingToQueueNotify();
return true; // nothing to do
}
+
// ok, grab the next song
- CFileItemPtr item = playlist[iNext];
+ CFileItem file(*playlist[iNext]);
+ // handle plugin://
+ CURL url(file.GetPath());
+ if (url.GetProtocol() == "plugin")
+ XFILE::CPluginDirectory::GetPluginResult(url.Get(), file);
#ifdef HAS_UPNP
- if (URIUtils::IsUPnP(item->GetPath()))
+ if (URIUtils::IsUPnP(file.GetPath()))
{
- if (!XFILE::CUPnPDirectory::GetResource(item->GetPath(), *item))
+ if (!XFILE::CUPnPDirectory::GetResource(file.GetPath(), file))
return true;
}
#endif
// ok - send the file to the player if it wants it
- if (m_pPlayer && m_pPlayer->QueueNextFile(*item))
+ if (m_pPlayer && m_pPlayer->QueueNextFile(file))
{ // player wants the next file
m_nextPlaylistItem = iNext;
}
Please sign in to comment.
Something went wrong with that request. Please try again.