The branch, master has been updated
via fbf1f628a6d0d9345e61624547b58673b7df7a36 (commit)
from 2908a127413f1ba4486b6a440e043718345f086e (commit)
https://github.com/xbmc/xbmc/commit/fbf1f628a6d0d9345e61624547b58673b7df7a36
commit fbf1f628a6d0d9345e61624547b58673b7df7a36
Author: Cyril <cyril.leclerc@...>
Date: Mon Feb 13 20:06:26 2012 +0000
Add plugin:// resolving before queueing next track
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 2475853..d6bfb64 100644
--- a/xbmc/Application.cpp
+++ b/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;
}
-----------------------------------------------------------------------
Summary of changes:
xbmc/Application.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
[xbmc/xbmc]
|