refs #485 removed some dependencies from CDBusServer

This commit is contained in:
Klaus Basan
2016-02-16 03:41:18 +01:00
committed by Mathew Sutcliffe
parent a0b7f741ee
commit 1b587c2ee8
17 changed files with 41 additions and 31 deletions

View File

@@ -13,8 +13,8 @@
#include "contextapplication.h"
#include "voicechannel.h"
#include "voicevatlib.h"
#include "blacksound/soundgenerator.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/audio/notificationsounds.h"
#include "blackmisc/audio/voiceroomlist.h"
#include "blackmisc/logmessage.h"
@@ -72,6 +72,13 @@ namespace BlackCore
m_unusedVoiceChannels.push_back(m_channel2);
}
CContextAudio *CContextAudio::registerWithDBus(CDBusServer *server)
{
if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; }
server->addObject(IContextAudio::ObjectPath(), this);
return this;
}
CContextAudio::~CContextAudio()
{
this->leaveAllVoiceRooms();