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
20831d92
Commit
20831d92
authored
Dec 08, 2015
by
François Grisez
Browse files
Display the conference view while conferences using a focus server
parent
f8a7f255
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
console/commands.c
console/commands.c
+1
-1
gtk/conference.c
gtk/conference.c
+3
-1
gtk/incall_view.c
gtk/incall_view.c
+3
-4
gtk/linphone.h
gtk/linphone.h
+1
-0
No files found.
console/commands.c
View file @
20831d92
...
...
@@ -2452,7 +2452,7 @@ static void lpc_display_call_states(LinphoneCore *lc){
const
char
*
flag
;
bool_t
in_conference
;
call
=
(
LinphoneCall
*
)
elem
->
data
;
in_conference
=
linphone_call_
params_get_local_conference_mode
(
linphone_call_get_current_params
(
call
)
);
in_conference
=
(
linphone_call_
get_conference
(
call
)
!=
NULL
);
tmp
=
linphone_call_get_remote_address_as_string
(
call
);
flag
=
in_conference
?
"conferencing"
:
""
;
flag
=
linphone_call_has_transfer_pending
(
call
)
?
"transfer pending"
:
flag
;
...
...
gtk/conference.c
View file @
20831d92
...
...
@@ -178,4 +178,6 @@ void linphone_gtk_unset_from_conference(LinphoneCall *call){
}
}
bool_t
linphone_gtk_call_is_in_conference_view
(
LinphoneCall
*
call
)
{
return
(
find_conferencee_from_call
(
call
)
!=
NULL
);
}
gtk/incall_view.c
View file @
20831d92
...
...
@@ -509,11 +509,10 @@ 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_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
);
if
(
in_conf
){
if
(
linphone_gtk_call_is_in_conference_view
(
call
)
){
linphone_gtk_unset_from_conference
(
call
);
}
linphone_call_set_user_pointer
(
call
,
NULL
);
...
...
@@ -776,7 +775,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_get_local_conference_mode
(
linphone_call_get_current_params
(
call
)
);
gboolean
in_conf
=
(
linphone_call_
get_conference
(
call
)
!=
NULL
);
GtkWidget
*
call_stats
=
(
GtkWidget
*
)
g_object_get_data
(
G_OBJECT
(
callview
),
"call_stats"
);
linphone_gtk_in_call_show_video
(
call
);
...
...
@@ -854,7 +853,7 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
video_window
=
(
GtkWidget
*
)
g_object_get_data
(
G_OBJECT
(
callview
),
"video_window"
);
status
=
linphone_gtk_get_widget
(
callview
,
"in_call_status"
);
taskid
=
GPOINTER_TO_INT
(
g_object_get_data
(
G_OBJECT
(
callview
),
"taskid"
));
in_conf
=
linphone_call_
params_get_local_conference_mode
(
linphone_call_get_current_params
(
call
)
);
in_conf
=
(
linphone_call_
get_conference
(
call
)
!=
NULL
);
if
(
video_window
)
gtk_widget_destroy
(
video_window
);
if
(
status
==
NULL
)
return
;
if
(
error_msg
==
NULL
)
...
...
gtk/linphone.h
View file @
20831d92
...
...
@@ -198,6 +198,7 @@ LINPHONE_PUBLIC void linphone_gtk_enable_transfer_button(LinphoneCore *lc, gbool
LINPHONE_PUBLIC
void
linphone_gtk_enable_conference_button
(
LinphoneCore
*
lc
,
gboolean
value
);
LINPHONE_PUBLIC
void
linphone_gtk_set_in_conference
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
void
linphone_gtk_unset_from_conference
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
bool_t
linphone_gtk_call_is_in_conference_view
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
void
linphone_gtk_terminate_conference_participant
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
void
linphone_gtk_in_call_view_show_encryption
(
LinphoneCall
*
call
);
LINPHONE_PUBLIC
void
linphone_gtk_in_call_view_hide_encryption
(
LinphoneCall
*
call
);
...
...
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