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
acca0f19
Commit
acca0f19
authored
Jul 01, 2014
by
Ghislain MARY
Browse files
Normalize function name.
parent
484d05b0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
7 deletions
+8
-7
console/commands.c
console/commands.c
+1
-1
coreapi/linphonecall.c
coreapi/linphonecall.c
+1
-1
coreapi/linphonecore.h
coreapi/linphonecore.h
+2
-1
coreapi/linphonecore_jni.cc
coreapi/linphonecore_jni.cc
+1
-1
gtk/incall_view.c
gtk/incall_view.c
+3
-3
No files found.
console/commands.c
View file @
acca0f19
...
...
@@ -2438,7 +2438,7 @@ static void lpc_display_call_states(LinphoneCore *lc){
for
(;
elem
!=
NULL
;
elem
=
elem
->
next
){
const
char
*
flag
;
call
=
(
LinphoneCall
*
)
elem
->
data
;
bool_t
in_conference
=
linphone_call_params_local_conference_mode
(
linphone_call_get_current_params
(
call
));
bool_t
in_conference
=
linphone_call_params_
get_
local_conference_mode
(
linphone_call_get_current_params
(
call
));
tmp
=
linphone_call_get_remote_address_as_string
(
call
);
flag
=
in_conference
?
"conferencing"
:
""
;
flag
=
linphone_call_has_transfer_pending
(
call
)
?
"transfer pending"
:
flag
;
...
...
coreapi/linphonecall.c
View file @
acca0f19
...
...
@@ -1404,7 +1404,7 @@ bool_t linphone_call_params_early_media_sending_enabled(const LinphoneCallParams
/**
* Returns true if the call is part of the locally managed conference.
**/
bool_t
linphone_call_params_local_conference_mode
(
const
LinphoneCallParams
*
cp
){
bool_t
linphone_call_params_
get_
local_conference_mode
(
const
LinphoneCallParams
*
cp
){
return
cp
->
in_conference
;
}
...
...
coreapi/linphonecore.h
View file @
acca0f19
...
...
@@ -389,7 +389,8 @@ LINPHONE_PUBLIC LinphoneMediaEncryption linphone_call_params_get_media_encryptio
LINPHONE_PUBLIC
void
linphone_call_params_set_media_encryption
(
LinphoneCallParams
*
cp
,
LinphoneMediaEncryption
e
);
LINPHONE_PUBLIC
void
linphone_call_params_enable_early_media_sending
(
LinphoneCallParams
*
cp
,
bool_t
enabled
);
LINPHONE_PUBLIC
bool_t
linphone_call_params_early_media_sending_enabled
(
const
LinphoneCallParams
*
cp
);
LINPHONE_PUBLIC
bool_t
linphone_call_params_local_conference_mode
(
const
LinphoneCallParams
*
cp
);
#define linphone_call_params_local_conference_mode linphone_call_params_get_local_conference_mode
/* Deprecated */
LINPHONE_PUBLIC
bool_t
linphone_call_params_get_local_conference_mode
(
const
LinphoneCallParams
*
cp
);
LINPHONE_PUBLIC
void
linphone_call_params_set_audio_bandwidth_limit
(
LinphoneCallParams
*
cp
,
int
bw
);
LINPHONE_PUBLIC
void
linphone_call_params_destroy
(
LinphoneCallParams
*
cp
);
LINPHONE_PUBLIC
bool_t
linphone_call_params_low_bandwidth_enabled
(
const
LinphoneCallParams
*
cp
);
...
...
coreapi/linphonecore_jni.cc
View file @
acca0f19
...
...
@@ -2789,7 +2789,7 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_getVideoEnable
}
extern
"C"
jboolean
Java_org_linphone_core_LinphoneCallParamsImpl_localConferenceMode
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
lcp
){
return
(
jboolean
)
linphone_call_params_local_conference_mode
((
LinphoneCallParams
*
)
lcp
);
return
(
jboolean
)
linphone_call_params_
get_
local_conference_mode
((
LinphoneCallParams
*
)
lcp
);
}
extern
"C"
jstring
Java_org_linphone_core_LinphoneCallParamsImpl_getCustomHeader
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
lcp
,
jstring
jheader_name
){
...
...
gtk/incall_view.c
View file @
acca0f19
...
...
@@ -442,7 +442,7 @@ void linphone_gtk_remove_in_call_view(LinphoneCall *call){
GtkWidget
*
w
=
(
GtkWidget
*
)
linphone_call_get_user_pointer
(
call
);
GtkWidget
*
main_window
=
linphone_gtk_get_main_window
();
GtkWidget
*
nb
=
linphone_gtk_get_widget
(
main_window
,
"viewswitch"
);
gboolean
in_conf
=
linphone_call_params_local_conference_mode
(
linphone_call_get_current_params
(
call
));
gboolean
in_conf
=
linphone_call_params_
get_
local_conference_mode
(
linphone_call_get_current_params
(
call
));
int
idx
;
g_return_if_fail
(
w
!=
NULL
);
idx
=
gtk_notebook_page_num
(
GTK_NOTEBOOK
(
nb
),
w
);
...
...
@@ -684,7 +684,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
GtkWidget
*
callee
=
linphone_gtk_get_widget
(
callview
,
"in_call_uri"
);
GtkWidget
*
duration
=
linphone_gtk_get_widget
(
callview
,
"in_call_duration"
);
guint
taskid
=
GPOINTER_TO_INT
(
g_object_get_data
(
G_OBJECT
(
callview
),
"taskid"
));
gboolean
in_conf
=
linphone_call_params_local_conference_mode
(
linphone_call_get_current_params
(
call
));
gboolean
in_conf
=
linphone_call_params_
get_
local_conference_mode
(
linphone_call_get_current_params
(
call
));
GtkWidget
*
call_stats
=
(
GtkWidget
*
)
g_object_get_data
(
G_OBJECT
(
callview
),
"call_stats"
);
display_peer_name_in_label
(
callee
,
linphone_call_get_remote_address
(
call
));
...
...
@@ -753,7 +753,7 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
if
(
callview
==
NULL
)
return
;
GtkWidget
*
status
=
linphone_gtk_get_widget
(
callview
,
"in_call_status"
);
guint
taskid
=
GPOINTER_TO_INT
(
g_object_get_data
(
G_OBJECT
(
callview
),
"taskid"
));
gboolean
in_conf
=
linphone_call_params_local_conference_mode
(
linphone_call_get_current_params
(
call
));
gboolean
in_conf
=
linphone_call_params_
get_
local_conference_mode
(
linphone_call_get_current_params
(
call
));
if
(
status
==
NULL
)
return
;
if
(
error_msg
==
NULL
)
...
...
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