#include "URL.h"
#include "cores/IPlayer.h"
#include "interfaces/AnnouncementManager.h"
+#ifdef HAS_ZEROCONF
+#include "network/Zeroconf.h"
+#endif // HAS_ZEROCONF
using namespace ANNOUNCEMENT;
#define AIRPLAY_STATUS_NOT_IMPLEMENTED 501
#define AIRPLAY_STATUS_NO_RESPONSE_NEEDED 1000
+CCriticalSection CAirPlayServer::ServerInstanceLock;
CAirPlayServer *CAirPlayServer::ServerInstance = NULL;
int CAirPlayServer::m_isPlaying = 0;
void CAirPlayServer::Announce(AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data)
{
+ CSingleLock lock(ServerInstanceLock);
+
if ( (flag & Player) && strcmp(sender, "xbmc") == 0 && ServerInstance)
{
if (strcmp(message, "OnStop") == 0)
{
- restoreVolume();
+ bool shouldRestoreVolume = true;
+ if (data.isMember("player") && data["player"].isMember("playerid"))
+ shouldRestoreVolume = (data["player"]["playerid"] != PLAYLIST_PICTURE);
+
+ if (shouldRestoreVolume)
+ restoreVolume();
+
ServerInstance->AnnounceToClients(EVENT_STOPPED);
}
else if (strcmp(message, "OnPlay") == 0)
{
StopServer(true);
+ CSingleLock lock(ServerInstanceLock);
+
ServerInstance = new CAirPlayServer(port, nonlocal);
if (ServerInstance->Initialize())
{
bool CAirPlayServer::SetCredentials(bool usePassword, const CStdString& password)
{
+ CSingleLock lock(ServerInstanceLock);
bool ret = false;
if (ServerInstance)
void CAirPlayServer::StopServer(bool bWait)
{
+ CSingleLock lock(ServerInstanceLock);
if (ServerInstance)
{
ServerInstance->StopThread(bWait);
if (reverseHeader.size() > 0 && m_reverseSockets.find(it->m_sessionId) != m_reverseSockets.end())
{
//search the reverse socket to this sessionid
- response.Format("POST /event HTTP/1.1\r\n");
+ response = StringUtils::Format("POST /event HTTP/1.1\r\n");
reverseSocket = m_reverseSockets[it->m_sessionId]; //that is our reverse socket
response += reverseHeader;
}
CAnnouncementManager::RemoveAnnouncer(this);
}
+void handleZeroconfAnnouncement()
+{
+#if defined(HAS_ZEROCONF)
+ static XbmcThreads::EndTime timeout(10000);
+ if(timeout.IsTimePast())
+ {
+ CZeroconf::GetInstance()->ForceReAnnounceService("servers.airplay");
+ timeout.Set(10000);
+ }
+#endif
+}
+
void CAirPlayServer::Process()
{
m_bStop = false;
}
}
}
+
+ // by reannouncing the zeroconf service
+ // we fix issues where xbmc is detected
+ // as audio-only target on devices with
+ // ios7 and later
+ handleZeroconfAnnouncement();
}
Deinitialize();
const time_t ltime = time(NULL);
char *date = asctime(gmtime(<ime)); //Fri, 17 Dec 2010 11:18:01 GMT;
date[strlen(date) - 1] = '\0'; // remove \n
- response.Format("HTTP/1.1 %d %s\nDate: %s\r\n", status, statusMsg.c_str(), date);
+ response = StringUtils::Format("HTTP/1.1 %d %s\nDate: %s\r\n", status, statusMsg.c_str(), date);
if (responseHeader.size() > 0)
{
response += responseHeader;
if (responseBody.size() > 0)
{
- response.Format("%sContent-Length: %d\r\n", response.c_str(), responseBody.size());
+ response = StringUtils::Format("%sContent-Length: %d\r\n", response.c_str(), responseBody.size());
}
response += "\r\n";
case EVENT_LOADING:
case EVENT_PAUSED:
case EVENT_STOPPED:
- reverseBody.Format(EVENT_INFO, m_sessionCounter, eventStrings[state]);
+ reverseBody = StringUtils::Format(EVENT_INFO, m_sessionCounter, eventStrings[state]);
CLog::Log(LOGDEBUG, "AIRPLAY: sending event: %s", eventStrings[state]);
break;
}
reverseHeader = "Content-Type: text/x-apple-plist+xml\r\n";
- reverseHeader.Format("%sContent-Length: %d\r\n",reverseHeader.c_str(),reverseBody.size());
- reverseHeader.Format("%sx-apple-session-id: %s\r\n",reverseHeader.c_str(),m_sessionId.c_str());
+ reverseHeader = StringUtils::Format("%sContent-Length: %d\r\n",reverseHeader.c_str(), reverseBody.size());
+ reverseHeader = StringUtils::Format("%sx-apple-session-id: %s\r\n",reverseHeader.c_str(), m_sessionId.c_str());
m_lastEvent = state;
}
}
void CAirPlayServer::CTCPClient::ComposeAuthRequestAnswer(CStdString& responseHeader, CStdString& responseBody)
{
- CStdString randomStr;
int16_t random=rand();
- randomStr.Format("%i", random);
+ CStdString randomStr = StringUtils::Format("%i", random);
m_authNonce=XBMC::XBMC_MD5::GetMD5(randomStr);
- responseHeader.Format(AUTH_REQUIRED,m_authNonce);
+ responseHeader = StringUtils::Format(AUTH_REQUIRED, m_authNonce.c_str());
responseBody.clear();
}
HA1 = XBMC::XBMC_MD5::GetMD5(username + ":" + realm + ":" + password);
HA2 = XBMC::XBMC_MD5::GetMD5(method + ":" + digestUri);
- response = XBMC::XBMC_MD5::GetMD5(HA1.ToLower() + ":" + nonce + ":" + HA2.ToLower());
- return response.ToLower();
+ StringUtils::ToLower(HA1);
+ StringUtils::ToLower(HA2);
+ response = XBMC::XBMC_MD5::GetMD5(HA1 + ":" + nonce + ":" + HA2);
+ StringUtils::ToLower(response);
+ return response;
}
//helper function
for(unsigned int i = 0;i<tmpAr1.size();i++)
{
- if (tmpAr1[i].Find(field) != -1)
+ if (tmpAr1[i].find(field) != std::string::npos)
{
if (StringUtils::SplitString(tmpAr1[i], "=", tmpAr2) == 2)
{
- tmpAr2[1].Remove('\"');//remove quotes
+ StringUtils::Replace(tmpAr2[1], "\"", "");//remove quotes
return tmpAr2[1];
}
}
void CAirPlayServer::backupVolume()
{
- if (ServerInstance->m_origVolume == -1)
+ CSingleLock lock(ServerInstanceLock);
+
+ if (ServerInstance && ServerInstance->m_origVolume == -1)
ServerInstance->m_origVolume = (int)g_application.GetVolume();
}
void CAirPlayServer::restoreVolume()
{
- if (ServerInstance->m_origVolume != -1 && CSettings::Get().GetBool("services.airplayvolumecontrol"))
+ CSingleLock lock(ServerInstanceLock);
+
+ if (ServerInstance && ServerInstance->m_origVolume != -1 && CSettings::Get().GetBool("services.airplayvolumecontrol"))
{
g_application.SetVolume((float)ServerInstance->m_origVolume);
ServerInstance->m_origVolume = -1;
int status = AIRPLAY_STATUS_OK;
bool needAuth = false;
- if (m_sessionId.IsEmpty())
+ if (m_sessionId.empty())
m_sessionId = "00000000-0000-0000-0000-000000000000";
if (ServerInstance->m_usePassword && !m_bAuthenticated)
needAuth = true;
}
- int startQs = uri.Find('?');
- if (startQs != -1)
+ size_t startQs = uri.find('?');
+ if (startQs != std::string::npos)
{
- uri = uri.Left(startQs);
+ uri.erase(startQs);
}
// This is the socket which will be used for reverse HTTP
{
CAirPlayServer::m_isPlaying++;
// Get URL to play
- int start = body.Find("Content-Location: ");
- if (start == -1)
+ std::string contentLocation = "Content-Location: ";
+ size_t start = body.find(contentLocation);
+ if (start == std::string::npos)
return AIRPLAY_STATUS_NOT_IMPLEMENTED;
- start += strlen("Content-Location: ");
- int end = body.Find('\n', start);
- location = body.Mid(start, end - start);
+ start += contentLocation.size();
+ int end = body.find('\n', start);
+ location = body.substr(start, end - start);
- start = body.Find("Start-Position");
- if (start != -1)
+ std::string startPosition = "Start-Position: ";
+ start = body.find(startPosition);
+ if (start != std::string::npos)
{
- start += strlen("Start-Position: ");
- int end = body.Find('\n', start);
- CStdString positionStr = body.Mid(start, end - start);
+ start += startPosition.size();
+ int end = body.find('\n', start);
+ std::string positionStr = body.substr(start, end - start);
position = (float)atof(positionStr.c_str());
}
}
if (status != AIRPLAY_STATUS_NEED_AUTH)
{
- CStdString userAgent="AppleCoreMedia/1.0.0.8F455 (AppleTV; U; CPU OS 4_3 like Mac OS X; de_de)";
- CURL::Encode(userAgent);
+ CStdString userAgent(CURL::Encode("AppleCoreMedia/1.0.0.8F455 (AppleTV; U; CPU OS 4_3 like Mac OS X; de_de)"));
location += "|User-Agent=" + userAgent;
CFileItem fileToPlay(location, false);
if (g_application.m_pPlayer->GetTotalTime())
{
float position = ((float) g_application.m_pPlayer->GetTime()) / 1000;
- responseBody.Format("duration: %.6f\r\nposition: %.6f\r\n", (float)g_application.m_pPlayer->GetTotalTime() / 1000, position);
+ responseBody = StringUtils::Format("duration: %.6f\r\nposition: %.6f\r\n", (float)g_application.m_pPlayer->GetTotalTime() / 1000, position);
}
else
{
cachePosition = position + (duration * g_application.m_pPlayer->GetCachePercentage() / 100.0f);
}
- responseBody.Format(PLAYBACK_INFO, duration, cachePosition, position, (playing ? 1 : 0), duration);
+ responseBody = StringUtils::Format(PLAYBACK_INFO, duration, cachePosition, position, (playing ? 1 : 0), duration);
responseHeader = "Content-Type: text/x-apple-plist+xml\r\n";
if (g_application.m_pPlayer->IsCaching())
}
else
{
- responseBody.Format(PLAYBACK_INFO_NOT_READY, duration, cachePosition, position, (playing ? 1 : 0), duration);
+ responseBody = StringUtils::Format(PLAYBACK_INFO_NOT_READY, duration, cachePosition, position, (playing ? 1 : 0), duration);
responseHeader = "Content-Type: text/x-apple-plist+xml\r\n";
}
}
else if (uri == "/server-info")
{
CLog::Log(LOGDEBUG, "AIRPLAY: got request %s", uri.c_str());
- responseBody.Format(SERVER_INFO, g_application.getNetwork().GetFirstConnectedInterface()->GetMacAddress());
+ responseBody = StringUtils::Format(SERVER_INFO, g_application.getNetwork().GetFirstConnectedInterface()->GetMacAddress().c_str());
responseHeader = "Content-Type: text/x-apple-plist+xml\r\n";
}
projects / vuplus_xbmc / blobdiff