Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
38f8ef44
Commit
38f8ef44
authored
Oct 18, 2017
by
Benjamin REIS
Browse files
connect cppCore with c_core and add received conference events in db
parent
9f98fa5f
Changes
4
Hide whitespace changes
Inline
Side-by-side
coreapi/linphonecore.c
View file @
38f8ef44
...
...
@@ -2233,6 +2233,8 @@ static void linphone_core_init(LinphoneCore * lc, LinphoneCoreCbs *cbs, LpConfig
lc
->
sal
->
set_user_pointer
(
lc
);
lc
->
sal
->
set_callbacks
(
&
linphone_sal_callbacks
);
new
(
&
lc
->
cppCore
)
Core
();
#ifdef TUNNEL_ENABLED
lc
->
tunnel
=
linphone_core_tunnel_new
(
lc
);
#endif
...
...
@@ -5825,6 +5827,8 @@ void sip_config_uninit(LinphoneCore *lc)
delete
lc
->
sal
;
lc
->
sal
=
NULL
;
lc
->
cppCore
.
~
Core
();
if
(
lc
->
sip_conf
.
guessed_contact
)
ms_free
(
lc
->
sip_conf
.
guessed_contact
);
if
(
config
->
contact
)
...
...
coreapi/private.h
View file @
38f8ef44
...
...
@@ -33,6 +33,7 @@
#include "linphone/conference.h"
#include "address/address.h"
#include "c-wrapper/internal/c-sal.h"
#include "core/core.h"
#include "sal/call-op.h"
#include "sal/event-op.h"
#include "sal/message-op.h"
...
...
@@ -810,6 +811,10 @@ struct _LinphoneCore
MSList
*
vtable_refs
;
int
vtable_notify_recursion
;
LinphonePrivate
::
Sal
*
sal
;
// For migration purposes
LinphonePrivate
::
Core
cppCore
;
LinphoneGlobalState
state
;
struct
_LpConfig
*
config
;
MSList
*
default_audio_codecs
;
...
...
src/chat/chat-room/client-group-chat-room.cpp
View file @
38f8ef44
...
...
@@ -26,6 +26,7 @@
#include "conference/remote-conference-event-handler.h"
#include "conference/remote-conference-p.h"
#include "conference/session/call-session-p.h"
#include "core/core-p.h"
#include "event-log/events.h"
#include "logger/logger.h"
#include "sal/refer-op.h"
...
...
@@ -282,6 +283,7 @@ void ClientGroupChatRoom::onParticipantAdded (time_t tm, const Address &addr) {
dConference
->
eventHandler
->
getLastNotify
(),
addr
);
Conference
::
getCore
()
->
cppCore
.
getPrivate
()
->
mainDb
.
addEvent
(
event
);
if
(
cb
)
cb
(
cr
,
L_GET_C_BACK_PTR
(
&
event
));
...
...
@@ -306,6 +308,7 @@ void ClientGroupChatRoom::onParticipantRemoved (time_t tm, const Address &addr)
dConference
->
eventHandler
->
getLastNotify
(),
addr
);
Conference
::
getCore
()
->
cppCore
.
getPrivate
()
->
mainDb
.
addEvent
(
event
);
if
(
cb
)
cb
(
cr
,
L_GET_C_BACK_PTR
(
&
event
));
...
...
@@ -336,6 +339,7 @@ void ClientGroupChatRoom::onParticipantSetAdmin (time_t tm, const Address &addr,
dConference
->
eventHandler
->
getLastNotify
(),
addr
);
Conference
::
getCore
()
->
cppCore
.
getPrivate
()
->
mainDb
.
addEvent
(
event
);
if
(
cb
)
cb
(
cr
,
L_GET_C_BACK_PTR
(
&
event
));
...
...
@@ -353,6 +357,7 @@ void ClientGroupChatRoom::onSubjectChanged (time_t tm, const std::string &subjec
dConference
->
eventHandler
->
getLastNotify
(),
subject
);
Conference
::
getCore
()
->
cppCore
.
getPrivate
()
->
mainDb
.
addEvent
(
event
);
if
(
cb
)
cb
(
cr
,
L_GET_C_BACK_PTR
(
&
event
));
...
...
@@ -381,6 +386,7 @@ void ClientGroupChatRoom::onParticipantDeviceAdded (time_t tm, const Address &ad
addr
,
gruu
);
Conference
::
getCore
()
->
cppCore
.
getPrivate
()
->
mainDb
.
addEvent
(
event
);
if
(
cb
)
cb
(
cr
,
L_GET_C_BACK_PTR
(
&
event
));
...
...
@@ -409,6 +415,7 @@ void ClientGroupChatRoom::onParticipantDeviceRemoved (time_t tm, const Address &
addr
,
gruu
);
Conference
::
getCore
()
->
cppCore
.
getPrivate
()
->
mainDb
.
addEvent
(
event
);
if
(
cb
)
cb
(
cr
,
L_GET_C_BACK_PTR
(
&
event
));
...
...
src/core/core.h
View file @
38f8ef44
...
...
@@ -32,6 +32,7 @@ class ChatRoom;
class
CorePrivate
;
class
LINPHONE_PUBLIC
Core
:
public
Object
{
friend
class
ClientGroupChatRoom
;
public:
Core
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment