Use multi-listener API only

This commit is contained in:
François Grisez 2019-05-09 14:36:11 +02:00 committed by Nicolas Michon
parent 84121028e1
commit 49297e4329
4 changed files with 7 additions and 7 deletions

View file

@ -202,7 +202,7 @@ void Logger::init (const shared_ptr<linphone::Config> &config) {
{ {
shared_ptr<linphone::LoggingService> loggingService = mInstance->mLoggingService = linphone::LoggingService::get(); shared_ptr<linphone::LoggingService> loggingService = mInstance->mLoggingService = linphone::LoggingService::get();
loggingService->setLogLevel(linphone::LogLevel::Message); loggingService->setLogLevel(linphone::LogLevel::Message);
loggingService->setListener(make_shared<LinphoneLogger>(mInstance)); loggingService->addListener(make_shared<LinphoneLogger>(mInstance));
} }
linphone::Core::setLogCollectionPath(Utils::appStringToCoreString(folder)); linphone::Core::setLogCollectionPath(Utils::appStringToCoreString(folder));

View file

@ -150,7 +150,7 @@ AssistantModel::AssistantModel (QObject *parent) : QObject(parent) {
mAccountCreator = core->createAccountCreator( mAccountCreator = core->createAccountCreator(
core->getConfig()->getString("assistant", "xmlrpc_url", DefaultXmlrpcUri) core->getConfig()->getString("assistant", "xmlrpc_url", DefaultXmlrpcUri)
); );
mAccountCreator->setListener(mHandlers); mAccountCreator->addListener(mHandlers);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

View file

@ -409,7 +409,7 @@ void ChatModel::removeAllEntries () {
void ChatModel::sendMessage (const QString &message) { void ChatModel::sendMessage (const QString &message) {
shared_ptr<linphone::ChatMessage> _message = mChatRoom->createMessage(Utils::appStringToCoreString(message)); shared_ptr<linphone::ChatMessage> _message = mChatRoom->createMessage(Utils::appStringToCoreString(message));
_message->setListener(mMessageHandlers); _message->addListener(mMessageHandlers);
insertMessageAtEnd(_message); insertMessageAtEnd(_message);
mChatRoom->sendChatMessage(_message); mChatRoom->sendChatMessage(_message);
@ -435,7 +435,7 @@ void ChatModel::resendMessage (int id) {
case MessageStatusFileTransferError: case MessageStatusFileTransferError:
case MessageStatusNotDelivered: { case MessageStatusNotDelivered: {
shared_ptr<linphone::ChatMessage> message = static_pointer_cast<linphone::ChatMessage>(entry.second); shared_ptr<linphone::ChatMessage> message = static_pointer_cast<linphone::ChatMessage>(entry.second);
message->setListener(mMessageHandlers); message->addListener(mMessageHandlers);
message->resend(); message->resend();
break; break;
@ -473,7 +473,7 @@ void ChatModel::sendFileMessage (const QString &path) {
shared_ptr<linphone::ChatMessage> message = mChatRoom->createFileTransferMessage(content); shared_ptr<linphone::ChatMessage> message = mChatRoom->createFileTransferMessage(content);
message->setFileTransferFilepath(Utils::appStringToCoreString(path)); message->setFileTransferFilepath(Utils::appStringToCoreString(path));
message->setListener(mMessageHandlers); message->addListener(mMessageHandlers);
createThumbnail(message); createThumbnail(message);
@ -518,7 +518,7 @@ void ChatModel::downloadFile (int id) {
} }
message->setFileTransferFilepath(Utils::appStringToCoreString(safeFilePath)); message->setFileTransferFilepath(Utils::appStringToCoreString(safeFilePath));
message->setListener(mMessageHandlers); message->addListener(mMessageHandlers);
if (!message->downloadFile()) if (!message->downloadFile())
qWarning() << QStringLiteral("Unable to download file of entry %1.").arg(id); qWarning() << QStringLiteral("Unable to download file of entry %1.").arg(id);

View file

@ -143,7 +143,7 @@ void SoundPlayer::buildInternalPlayer () {
mInternalPlayer = coreManager->getCore()->createLocalPlayer( mInternalPlayer = coreManager->getCore()->createLocalPlayer(
Utils::appStringToCoreString(settingsModel->getRingerDevice()), "", nullptr Utils::appStringToCoreString(settingsModel->getRingerDevice()), "", nullptr
); );
mInternalPlayer->setListener(mHandlers); mInternalPlayer->addListener(mHandlers);
QObject::connect(settingsModel, &SettingsModel::ringerDeviceChanged, this, [this] { QObject::connect(settingsModel, &SettingsModel::ringerDeviceChanged, this, [this] {
rebuildInternalPlayer(); rebuildInternalPlayer();