aboutsummaryrefslogtreecommitdiff
path: root/xbmc/network/AirTunesServer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'xbmc/network/AirTunesServer.cpp')
-rw-r--r--xbmc/network/AirTunesServer.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
index 7341343497..3add8b7037 100644
--- a/xbmc/network/AirTunesServer.cpp
+++ b/xbmc/network/AirTunesServer.cpp
@@ -54,7 +54,6 @@
#define ZEROCONF_DACP_SERVICE "_dacp._tcp"
using namespace XFILE;
-using namespace ANNOUNCEMENT;
using namespace KODI::MESSAGING;
DllLibShairplay *CAirTunesServer::m_pLibShairplay = NULL;
@@ -159,9 +158,9 @@ void CAirTunesServer::SetMetadataFromBuffer(const char *buffer, unsigned int siz
RefreshMetadata();
}
-void CAirTunesServer::Announce(AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data)
+void CAirTunesServer::Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data)
{
- if ( (flag & Player) && strcmp(sender, "xbmc") == 0)
+ if ( (flag & ANNOUNCEMENT::Player) && strcmp(sender, "xbmc") == 0)
{
if ((strcmp(message, "OnPlay") == 0 || strcmp(message, "OnResume") == 0) && m_streamStarted)
{
@@ -647,13 +646,13 @@ void CAirTunesServer::RegisterActionListener(bool doRegister)
{
if (doRegister)
{
- CAnnouncementManager::GetInstance().AddAnnouncer(this);
+ CServiceBroker::GetAnnouncementManager()->AddAnnouncer(this);
g_application.RegisterActionListener(this);
ServerInstance->Create();
}
else
{
- CAnnouncementManager::GetInstance().RemoveAnnouncer(this);
+ CServiceBroker::GetAnnouncementManager()->RemoveAnnouncer(this);
g_application.UnregisterActionListener(this);
ServerInstance->StopThread(true);
}