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
071581ff
Commit
071581ff
authored
Jan 18, 2016
by
François Grisez
Browse files
Declare LinphoneConference and LinphoneConferenceParams in conference.h instead of linphonecore.h
parent
fcadf804
Changes
4
Hide whitespace changes
Inline
Side-by-side
coreapi/CMakeLists.txt
View file @
071581ff
...
...
@@ -35,6 +35,7 @@ set(LINPHONE_HEADER_FILES
buffer.h
call_log.h
call_params.h
conference.h
content.h
event.h
friendlist.h
...
...
coreapi/Makefile.am
View file @
071581ff
...
...
@@ -29,6 +29,7 @@ linphone_include_HEADERS=\
buffer.h
\
call_log.h
\
call_params.h
\
conference.h
\
content.h
\
event.h
\
friendlist.h
\
...
...
@@ -57,7 +58,7 @@ liblinphone_la_SOURCES=\
call_params.c
\
chat.c
\
chat_file_transfer.c
\
conference.cc
conference.h
conference_private.h
\
conference.cc conference_private.h
\
contactprovider.c contactprovider.h contact_providers_priv.h
\
content.c
\
dict.c
\
...
...
coreapi/conference.h
View file @
071581ff
...
...
@@ -37,6 +37,11 @@ extern "C" {
* @{
*/
/**
* Parameters for initialization of conferences
*/
typedef
struct
_LinphoneCorferenceParams
LinphoneConferenceParams
;
/**
* Create a #LinphoneConferenceParams with default parameters set.
* @param core #LinphoneCore to use to find out the default parameters. Can be NULL.
...
...
@@ -67,6 +72,12 @@ LINPHONE_PUBLIC void linphone_conference_params_enable_video(LinphoneConferenceP
LINPHONE_PUBLIC
bool_t
linphone_conference_params_video_requested
(
const
LinphoneConferenceParams
*
params
);
/**
* LinphoneConference class
*/
typedef
struct
_LinphoneConference
LinphoneConference
;
/**
* Remove a participant from a conference
* @param obj A #LinphoneConference
...
...
coreapi/linphonecore.h
View file @
071581ff
...
...
@@ -66,18 +66,6 @@ struct _LinphoneInfoMessage;
*/
typedef
struct
_LinphoneCore
LinphoneCore
;
/**
* Internal object of LinphoneCore representing a conference
* @ingroup call_control
*/
typedef
struct
_LinphoneConference
LinphoneConference
;
/**
* Parameters for initialization of conferences
* @ingroup call_control
*/
typedef
struct
_LinphoneCorferenceParams
LinphoneConferenceParams
;
/**
* Disable a sip transport
...
...
@@ -423,6 +411,7 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
#include "event.h"
#include "linphonefriend.h"
#include "xmlrpc.h"
#include "conference.h"
#else
#include "linphone/buffer.h"
#include "linphone/call_log.h"
...
...
@@ -431,6 +420,7 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
#include "linphone/event.h"
#include "linphone/linphonefriend.h"
#include "linphone/xmlrpc.h"
#include "linphone/conference.h"
#endif
LINPHONE_PUBLIC
LinphoneAddress
*
linphone_address_new
(
const
char
*
addr
);
...
...
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