Commit 6beb9625 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Move the new sal code in the src folder, respect the file naming conventions...

Move the new sal code in the src folder, respect the file naming conventions and add missing license headers.
parent 9b6d1158
......@@ -44,7 +44,6 @@ list(APPEND LINPHONE_PRIVATE_HEADER_FILES
offeranswer.h
private.h
quality_reporting.h
sal/sal.h
sqlite3_bctbx_vfs.h
vcard_private.h
xml2lpc.h
......@@ -99,7 +98,6 @@ set(LINPHONE_SOURCE_FILES_C
quality_reporting.c
remote_provisioning.c
ringtoneplayer.c
sal/sal.c
siplogin.c
sipsetup.c
sqlite3_bctbx_vfs.c
......@@ -111,13 +109,6 @@ set(LINPHONE_SOURCE_FILES_C
)
set(LINPHONE_SOURCE_FILES_CXX
conference.cc
sal/call_op.cpp
sal/event_op.cpp
sal/message_op.cpp
sal/presence_op.cpp
sal/register_op.cpp
sal/sal.cpp
sal/sal_op.cpp
tester_utils.cpp
)
set(LINPHONE_INCLUDE_DIRS ${LINPHONE_INCLUDE_DIRS})
......
......@@ -24,7 +24,7 @@
#include "linphone/core.h"
#include "linphone/lpconfig.h"
#include "sal/sal.hpp"
#include "sal/sal.h"
#include "c-wrapper/c-wrapper.h"
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef SAL_IMPL_H_
#define SAL_IMPL_H_
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include "belle-sip/belle-sip.h"
#include "belle-sip/belle-sdp.h"
......
......@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal_impl.h"
#include "sal/sal.hpp"
#include "sal/sal.h"
using namespace LinphonePrivate;
......
......@@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal/sal.h"
#include "sal/call_op.h"
#include "sal/message_op.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/call-op.h"
#include "sal/message-op.h"
#include "linphone/core.h"
#include "private.h"
......
......@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/event.h"
#include "linphone/lpconfig.h"
#include "sal/event_op.h"
#include "sal/event-op.h"
#include "c-wrapper/c-wrapper.h"
......
......@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "c-wrapper/internal/c-sal.h"
#include "sal/sal.h"
#include "sal/sal.hpp"
#include "offeranswer.h"
#include "private.h"
......
......@@ -31,12 +31,12 @@
#include "linphone/tunnel.h"
#include "linphone/core_utils.h"
#include "linphone/conference.h"
#include "sal/sal.h"
#include "sal/call_op.h"
#include "sal/event_op.h"
#include "sal/message_op.h"
#include "sal/presence_op.h"
#include "sal/register_op.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/call-op.h"
#include "sal/event-op.h"
#include "sal/message-op.h"
#include "sal/presence-op.h"
#include "sal/register-op.h"
#include "linphone/sipsetup.h"
#include "quality_reporting.h"
#include "linphone/ringtoneplayer.h"
......
......@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/core.h"
#include "private.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/sal.h"
#include "sal/sal.hpp"
#include "ortp/rtpsession.h"
#include <math.h>
......
......@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define quality_reporting_h
#include "linphone/core.h"
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#ifdef __cplusplus
extern "C"{
......
......@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "account_creator_private.h"
#include "linphone/core.h"
#include "linphone/tunnel.h"
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include <sqlite3.h>
#include "quality_reporting.h"
#include "vcard_private.h"
......
......@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/wrapper_utils.h"
#include "c-wrapper/c-wrapper.h"
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include "vcard_private.h"
#define VCARD_MD5_HASH_SIZE 16
......
......@@ -25,6 +25,7 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
address/address.h
c-wrapper/c-wrapper.h
c-wrapper/internal/c-tools.h
c-wrapper/internal/c-sal.h
call/call-listener.h
call/call-p.h
call/call.h
......@@ -96,6 +97,7 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
object/object.h
object/property-container.h
object/singleton.h
sal/sal.h
utils/payload-type-handler.h
variant/variant.h
xml/conference-info.h
......@@ -116,6 +118,7 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
c-wrapper/api/c-chat-room-cbs.cpp
c-wrapper/api/c-event-log.cpp
c-wrapper/api/c-participant.cpp
c-wrapper/internal/c-sal.cpp
call/call.cpp
chat/basic-chat-room.cpp
chat/chat-message.cpp
......@@ -162,6 +165,13 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
object/clonable-object.cpp
object/object.cpp
object/property-container.cpp
sal/call-op.cpp
sal/event-op.cpp
sal/message-op.cpp
sal/op.cpp
sal/presence-op.cpp
sal/register-op.cpp
sal/sal.cpp
utils/general.cpp
utils/payload-type-handler.cpp
utils/utils.cpp
......
......@@ -23,7 +23,7 @@ This file contains SAL API functions that do not depend on the underlying implem
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "sal/sal.h"
#include "c-wrapper/internal/c-sal.h"
#include <ctype.h>
......
......@@ -27,7 +27,7 @@
#include "content/content.h"
#include "chat-message-p.h"
#include "chat-room.h"
#include "sal/message_op.h"
#include "sal/message-op.h"
#include "logger/logger.h"
// =============================================================================
......
......@@ -22,8 +22,8 @@
#include "object/clonable-object.h"
#include "linphone/types.h"
#include "c-wrapper/internal/c-sal.h"
#include "sal/sal.h"
#include "sal/sal.hpp"
// =============================================================================
......
......@@ -22,7 +22,7 @@
#include "object/object-p.h"
#include "call-session.h"
#include "sal/call_op.h"
#include "sal/call-op.h"
// =============================================================================
......
......@@ -24,7 +24,7 @@
#include "conference/conference.h"
#include "conference/params/call-session-params.h"
#include "conference/session/call-session-listener.h"
#include "sal/call_op.h"
#include "sal/call-op.h"
// =============================================================================
......
#include "call_op.h"
/*
* call-op.cpp
* Copyright (C) 2017 Belledonne Communications SARL
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "bellesip_sal/sal_impl.h"
#include "offeranswer.h"
#include "sal/call-op.h"
#include <bctoolbox/defs.h>
#include <belle-sip/provider.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment