jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

Replace DRing for libjami

Browse Source 
It's not possible to replace the DRing namespace for jami because of conflicts
with namespaces and classes defined under the jami namespace.  Thus, use libjami
as the namespace.

Script to reproduce:

 rg -l DRing | sort | uniq | awk '$0 !~ /NEWS/' | xargs sed -i -e 's|DRing|libjami|g'
 rg -l DRING_ | sort | uniq | xargs sed -i -e 's|DRING_|LIBJAMI_|g'
 sed -i -e 's|dring|jami|g' src/jami/CMakeLists.txt
 sed -i -e 's|dring|jami|g' src/jami/def.h

Change-Id: I80e8c8b58a7586527a016bbef850bab07869c473
This commit is contained in:
Olivier Dion
2022-10-27 16:00:41 -04:00
committed by Sébastien Blin
parent 94ec7eea0c
commit d54a84ec0b
200 changed files with 3934 additions and 3934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/osxmain.cpp
View File

@ -42,7 +42,7 @@ static void
print_title()
{
std::cout
<< "Jami Daemon " << DRing::version()
<< "Jami Daemon " << libjami::version()
<< ", by Savoir-faire Linux 2004-2019" << std::endl
<< "https://jami.net/" << std::endl
#ifdef ENABLE_VIDEO
@ -136,13 +136,13 @@ parse_args(int argc, char *argv[], bool& persistent)
}
if (consoleFlag)
ringFlags |= DRing::DRING_FLAG_CONSOLE_LOG;
ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
if (debugFlag)
ringFlags |= DRing::DRING_FLAG_DEBUG;
ringFlags |= libjami::LIBJAMI_FLAG_DEBUG;
if (autoAnswer)
ringFlags |= DRing::DRING_FLAG_AUTOANSWER;
ringFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
return false;
}
@ -150,20 +150,20 @@ parse_args(int argc, char *argv[], bool& persistent)
static int
osxTests()
{
using SharedCallback = std::shared_ptr<DRing::CallbackWrapperBase>;
using SharedCallback = std::shared_ptr<libjami::CallbackWrapperBase>;
DRing::init(static_cast<DRing::InitFlag>(ringFlags));
libjami::init(static_cast<libjami::InitFlag>(ringFlags));
registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>());
registerSignalHandlers(std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>>());
if (!DRing::start())
if (!libjami::start())
return -1;
while (true) {
std::this_thread::sleep_for(std::chrono::seconds(1));
}
DRing::fini();
libjami::fini();
}
static int