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
b675b297
Commit
b675b297
authored
Dec 04, 2015
by
François Grisez
Browse files
Do not automatically enter the conference when the 'Transport' implementation is used
parent
4e972721
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletion
+19
-1
coreapi/conference.cc
coreapi/conference.cc
+9
-0
coreapi/conference.h
coreapi/conference.h
+7
-0
coreapi/linphonecore.c
coreapi/linphonecore.c
+3
-1
No files found.
coreapi/conference.cc
View file @
b675b297
...
...
@@ -26,6 +26,7 @@
#include "private.h"
#include "conference.h"
#include <mediastreamer2/msvolume.h>
#include <typeinfo>
namespace
Linphone
{
class
Conference
{
...
...
@@ -726,3 +727,11 @@ void linphone_conference_on_call_stream_stopping(LinphoneConference *obj, Linpho
void
linphone_conference_on_call_terminating
(
LinphoneConference
*
obj
,
LinphoneCall
*
call
)
{
((
Conference
*
)
obj
)
->
onCallTerminating
(
call
);
}
bool_t
linphone_conference_check_class
(
LinphoneConference
*
obj
,
LinphoneConferenceClass
_class
)
{
switch
(
_class
)
{
case
LinphoneConferenceClassMedia
:
return
typeid
(
obj
)
==
typeid
(
MediaConference
);
case
LinphoneConferenceClassTransport
:
return
typeid
(
obj
)
==
typeid
(
TransportConference
);
default:
return
FALSE
;
}
}
coreapi/conference.h
View file @
b675b297
...
...
@@ -30,6 +30,11 @@
typedef
void
LinphoneConference
;
typedef
enum
{
LinphoneConferenceClassMedia
,
LinphoneConferenceClassTransport
}
LinphoneConferenceClass
;
LinphoneConference
*
linphone_media_conference_new
(
LinphoneCore
*
core
);
LinphoneConference
*
linphone_transport_conference_new
(
LinphoneCore
*
core
);
void
linphone_conference_free
(
LinphoneConference
*
obj
);
...
...
@@ -55,4 +60,6 @@ void linphone_conference_on_call_stream_starting(LinphoneConference *obj, Linpho
void
linphone_conference_on_call_stream_stopping
(
LinphoneConference
*
obj
,
LinphoneCall
*
call
);
void
linphone_conference_on_call_terminating
(
LinphoneConference
*
obj
,
LinphoneCall
*
call
);
bool_t
linphone_conference_check_class
(
LinphoneConference
*
obj
,
LinphoneConferenceClass
_class
);
#endif // CONFERENCE_H
coreapi/linphonecore.c
View file @
b675b297
...
...
@@ -7420,7 +7420,9 @@ int linphone_core_add_all_to_conference(LinphoneCore *lc) {
calls
=
calls
->
next
;
linphone_core_add_to_conference
(
lc
,
call
);
}
linphone_core_enter_conference
(
lc
);
if
(
lc
->
conf_ctx
&&
linphone_conference_check_class
(
lc
->
conf_ctx
,
LinphoneConferenceClassMedia
))
{
linphone_core_enter_conference
(
lc
);
}
return
0
;
}
...
...
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