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
d0e48986
Commit
d0e48986
authored
Sep 25, 2017
by
Ghislain MARY
Browse files
Rename and document conference factory uri API.
parent
437f4366
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
11 deletions
+23
-11
coreapi/chat.c
coreapi/chat.c
+3
-1
coreapi/linphonecore.c
coreapi/linphonecore.c
+4
-4
coreapi/private.h
coreapi/private.h
+1
-1
include/linphone/core.h
include/linphone/core.h
+12
-2
src/c-wrapper/api/c-chat-room.cpp
src/c-wrapper/api/c-chat-room.cpp
+2
-2
src/chat/client-group-chat-room.cpp
src/chat/client-group-chat-room.cpp
+1
-1
No files found.
coreapi/chat.c
View file @
d0e48986
...
...
@@ -124,7 +124,9 @@ LinphoneChatRoom *linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAd
}
LinphoneChatRoom
*
linphone_core_create_client_group_chat_room
(
LinphoneCore
*
lc
)
{
return
linphone_client_group_chat_room_new
(
lc
);
LinphoneChatRoom
*
cr
=
_linphone_client_group_chat_room_new
(
lc
);
lc
->
chatrooms
=
bctbx_list_append
(
lc
->
chatrooms
,
cr
);
return
cr
;
}
void
linphone_core_delete_chat_room
(
LinphoneCore
*
lc
,
LinphoneChatRoom
*
cr
)
{
...
...
coreapi/linphonecore.c
View file @
d0e48986
...
...
@@ -7067,12 +7067,12 @@ LinphoneConference *linphone_core_get_conference(LinphoneCore *lc) {
return
lc
->
conf_ctx
;
}
void
linphone_core_set_
chat_
conference_factory_uri
(
LinphoneCore
*
lc
,
const
char
*
uri
)
{
lp_config_set_string
(
linphone_core_get_config
(
lc
),
"misc"
,
"
chat_
conference_factory_uri"
,
uri
);
void
linphone_core_set_conference_factory_uri
(
LinphoneCore
*
lc
,
const
char
*
uri
)
{
lp_config_set_string
(
linphone_core_get_config
(
lc
),
"misc"
,
"conference_factory_uri"
,
uri
);
}
const
char
*
linphone_core_get_
chat_
conference_factory_uri
(
const
LinphoneCore
*
lc
)
{
return
lp_config_get_string
(
linphone_core_get_config
(
lc
),
"misc"
,
"
chat_
conference_factory_uri"
,
nullptr
);
const
char
*
linphone_core_get_conference_factory_uri
(
const
LinphoneCore
*
lc
)
{
return
lp_config_get_string
(
linphone_core_get_config
(
lc
),
"misc"
,
"conference_factory_uri"
,
nullptr
);
}
void
linphone_core_set_tls_cert
(
LinphoneCore
*
lc
,
const
char
*
tls_cert
)
{
...
...
coreapi/private.h
View file @
d0e48986
...
...
@@ -460,7 +460,7 @@ void _linphone_proxy_config_release_ops(LinphoneProxyConfig *obj);
/*chat*/
LinphoneChatRoom
*
linphone_chat_room_new
(
LinphoneCore
*
core
,
const
LinphoneAddress
*
addr
);
LinphoneChatRoom
*
linphone_client_group_chat_room_new
(
LinphoneCore
*
l
c
);
LinphoneChatRoom
*
_
linphone_client_group_chat_room_new
(
LinphoneCore
*
c
ore
);
void
linphone_chat_room_release
(
LinphoneChatRoom
*
cr
);
void
linphone_chat_room_set_call
(
LinphoneChatRoom
*
cr
,
LinphoneCall
*
call
);
bctbx_list_t
*
linphone_chat_room_get_transient_messages
(
const
LinphoneChatRoom
*
cr
);
...
...
include/linphone/core.h
View file @
d0e48986
...
...
@@ -4169,9 +4169,19 @@ LINPHONE_PUBLIC LinphoneStatus linphone_core_stop_conference_recording(LinphoneC
*/
LINPHONE_PUBLIC
LinphoneConference
*
linphone_core_get_conference
(
LinphoneCore
*
lc
);
void
linphone_core_set_chat_conference_factory_uri
(
LinphoneCore
*
lc
,
const
char
*
uri
);
/**
* Set the conference factory uri.
* @param[in] lc A #LinphoneCore object
* @param[in] uri The uri of the conference factory
*/
void
linphone_core_set_conference_factory_uri
(
LinphoneCore
*
lc
,
const
char
*
uri
);
const
char
*
linphone_core_get_chat_conference_factory_uri
(
const
LinphoneCore
*
lc
);
/**
* Get the conference factory uri.
* @param[in] lc A #LinphoneCore object
* @return The uri of the conference factory
*/
const
char
*
linphone_core_get_conference_factory_uri
(
const
LinphoneCore
*
lc
);
/**
* @}
...
...
src/c-wrapper/api/c-chat-room.cpp
View file @
d0e48986
...
...
@@ -278,8 +278,8 @@ LinphoneChatRoom *linphone_chat_room_new (LinphoneCore *core, const LinphoneAddr
return
cr
;
}
LinphoneChatRoom
*
linphone_client_group_chat_room_new
(
LinphoneCore
*
core
)
{
const
char
*
factoryUri
=
linphone_core_get_
chat_
conference_factory_uri
(
core
);
LinphoneChatRoom
*
_
linphone_client_group_chat_room_new
(
LinphoneCore
*
core
)
{
const
char
*
factoryUri
=
linphone_core_get_conference_factory_uri
(
core
);
if
(
!
factoryUri
)
return
nullptr
;
LinphoneAddress
*
factoryAddr
=
linphone_address_new
(
factoryUri
);
...
...
src/chat/client-group-chat-room.cpp
View file @
d0e48986
...
...
@@ -33,7 +33,7 @@ ClientGroupChatRoomPrivate::ClientGroupChatRoomPrivate (LinphoneCore *core) : Ch
ClientGroupChatRoom
::
ClientGroupChatRoom
(
LinphoneCore
*
core
,
const
Address
&
me
)
:
ChatRoom
(
*
new
ChatRoomPrivate
(
core
)),
RemoteConference
(
core
,
me
,
nullptr
)
{
string
factoryUri
=
linphone_core_get_
chat_
conference_factory_uri
(
core
);
string
factoryUri
=
linphone_core_get_conference_factory_uri
(
core
);
focus
=
make_shared
<
Participant
>
(
factoryUri
);
CallSessionParams
csp
;
shared_ptr
<
CallSession
>
session
=
focus
->
getPrivate
()
->
createSession
(
*
this
,
&
csp
,
false
,
this
);
...
...
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