Skip to content
Snippets Groups Projects
Commit 8e1c4c95 authored by Adrien Béraud's avatar Adrien Béraud Committed by Adrien Béraud
Browse files

bin: update date, rename to Jami Core 

Change-Id: I71bf279701b90fed0ac36b18b05d7a482a0f04eb
parent 7c2fde0c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
bin/dbus/main.cpp
+ 11
− 19
View file @ 8e1c4c95
/* /*
* Copyright (C) 2004-2024 Savoir-faire Linux Inc. * Copyright (C) 2004-2024 Savoir-faire Linux Inc.
* *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> * This program is free software: you can redistribute it and/or modify
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Simon Zeni <simon.zeni@savoirfairelinux.com>
* Author: Vladimir Stoiakin <vstoiakin@lavabit.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
...@@ -18,10 +12,8 @@ ...@@ -18,10 +12,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program. If not, see <https://www.gnu.org/licenses/>.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
...@@ -49,14 +41,14 @@ ...@@ -49,14 +41,14 @@
bool persistent = false; bool persistent = false;
std::unique_ptr<sdbus::IConnection> connection; std::unique_ptr<sdbus::IConnection> connection;
static int ringFlags = 0; static int initFlags = 0;
static void static void
print_title() print_title()
{ {
std::cout std::cout
<< "Jami Daemon " << libjami::version() << "Jami Core " << libjami::version()
<< ", by Savoir-faire Linux Inc. 2004-2023" << std::endl << ", by Savoir-faire Linux Inc. Copyright (C) 2004-2024" << std::endl
<< "https://jami.net/" << std::endl << "https://jami.net/" << std::endl
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl << "[Video support enabled]" << std::endl
...@@ -149,13 +141,13 @@ parse_args(int argc, char *argv[]) ...@@ -149,13 +141,13 @@ parse_args(int argc, char *argv[])
} }
if (consoleFlag) if (consoleFlag)
ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG; initFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
if (debugFlag) if (debugFlag)
ringFlags |= libjami::LIBJAMI_FLAG_DEBUG; initFlags |= libjami::LIBJAMI_FLAG_DEBUG;
if (autoAnswer) if (autoAnswer)
ringFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER; initFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
return false; return false;
} }
...@@ -182,7 +174,7 @@ main(int argc, char *argv []) ...@@ -182,7 +174,7 @@ main(int argc, char *argv [])
if (parse_args(argc, argv)) if (parse_args(argc, argv))
return 0; return 0;
if (!libjami::init(static_cast<libjami::InitFlag>(ringFlags))) { if (!libjami::init(static_cast<libjami::InitFlag>(initFlags))) {
std::cerr << "libjami::init() failed" << std::endl; std::cerr << "libjami::init() failed" << std::endl;
return 1; return 1;
} }
......
bin/osxmain.cpp
+ 11
− 16
View file @ 8e1c4c95
/* /*
* Copyright (C) 2004-2024 Savoir-faire Linux Inc. * Copyright (C) 2004-2024 Savoir-faire Linux Inc.
* *
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> * This program is free software: you can redistribute it and/or modify
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
...@@ -16,8 +12,7 @@ ...@@ -16,8 +12,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program. If not, see <https://www.gnu.org/licenses/>.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <iostream> #include <iostream>
#include <thread> #include <thread>
...@@ -37,14 +32,14 @@ ...@@ -37,14 +32,14 @@
#endif #endif
#include "fileutils.h" #include "fileutils.h"
static int ringFlags = 0; static int initFlags = 0;
static void static void
print_title() print_title()
{ {
std::cout std::cout
<< "Jami Daemon " << libjami::version() << "Jami Core " << libjami::version()
<< ", by Savoir-faire Linux Inc. 2004-2023" << std::endl << ", by Savoir-faire Linux Inc. Copyright (C) 2004-2024" << std::endl
<< "https://jami.net/" << std::endl << "https://jami.net/" << std::endl
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl << "[Video support enabled]" << std::endl
...@@ -137,13 +132,13 @@ parse_args(int argc, char *argv[], bool& persistent) ...@@ -137,13 +132,13 @@ parse_args(int argc, char *argv[], bool& persistent)
} }
if (consoleFlag) if (consoleFlag)
ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG; initFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
if (debugFlag) if (debugFlag)
ringFlags |= libjami::LIBJAMI_FLAG_DEBUG; initFlags |= libjami::LIBJAMI_FLAG_DEBUG;
if (autoAnswer) if (autoAnswer)
ringFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER; initFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
return false; return false;
} }
...@@ -153,7 +148,7 @@ osxTests() ...@@ -153,7 +148,7 @@ osxTests()
{ {
using SharedCallback = std::shared_ptr<libjami::CallbackWrapperBase>; using SharedCallback = std::shared_ptr<libjami::CallbackWrapperBase>;
libjami::init(static_cast<libjami::InitFlag>(ringFlags)); libjami::init(static_cast<libjami::InitFlag>(initFlags));
registerSignalHandlers(std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>>()); registerSignalHandlers(std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>>());
......
bin/winmain.cpp
+ 11
− 15
View file @ 8e1c4c95
/* /*
* Copyright (C) 2004-2024 Savoir-faire Linux Inc. * Copyright (C) 2004-2024 Savoir-faire Linux Inc.
* *
* Author: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> * This program is free software: you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
...@@ -14,10 +12,8 @@ ...@@ -14,10 +12,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program. If not, see <https://www.gnu.org/licenses/>.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <iostream> #include <iostream>
#include <thread> #include <thread>
#include <cstring> #include <cstring>
...@@ -40,15 +36,15 @@ ...@@ -40,15 +36,15 @@
using namespace std::placeholders; using namespace std::placeholders;
bool isActive = false; bool isActive = false;
static int ringFlags = 0; static int initFlags = 0;
bool loop = true; bool loop = true;
static void static void
print_title() print_title()
{ {
std::cout std::cout
<< "Jami Daemon " << libjami::version() << "Jami Core " << libjami::version()
<< ", by Savoir-faire Linux Inc. 2004-2023" << std::endl << ", by Savoir-faire Linux Inc. Copyright (C) 2004-2024" << std::endl
<< "https://jami.net/" << std::endl << "https://jami.net/" << std::endl
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl << "[Video support enabled]" << std::endl
...@@ -141,13 +137,13 @@ parse_args(int argc, char *argv[], bool& persistent) ...@@ -141,13 +137,13 @@ parse_args(int argc, char *argv[], bool& persistent)
} }
if (consoleFlag) if (consoleFlag)
ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG; initFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
if (debugFlag) if (debugFlag)
ringFlags |= libjami::LIBJAMI_FLAG_DEBUG; initFlags |= libjami::LIBJAMI_FLAG_DEBUG;
if (autoAnswer) if (autoAnswer)
ringFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER; initFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
return false; return false;
} }
...@@ -170,7 +166,7 @@ run() ...@@ -170,7 +166,7 @@ run()
{ {
using SharedCallback = std::shared_ptr<libjami::CallbackWrapperBase>; using SharedCallback = std::shared_ptr<libjami::CallbackWrapperBase>;
libjami::init(static_cast<libjami::InitFlag>(ringFlags)); libjami::init(static_cast<libjami::InitFlag>(initFlags));
std::map<std::string, SharedCallback> callHandlers; std::map<std::string, SharedCallback> callHandlers;
callHandlers.insert(libjami::exportable_callback<libjami::CallSignal::IncomingCall> callHandlers.insert(libjami::exportable_callback<libjami::CallSignal::IncomingCall>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment