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
56fc713b
Commit
56fc713b
authored
Nov 12, 2010
by
Simon Morlat
Browse files
android display works
parent
a6819a4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
build/android/Android.mk
build/android/Android.mk
+1
-1
coreapi/linphonecore.c
coreapi/linphonecore.c
+7
-0
coreapi/linphonecore_jni.cc
coreapi/linphonecore_jni.cc
+9
-0
No files found.
build/android/Android.mk
View file @
56fc713b
...
...
@@ -70,7 +70,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)
/../../externals/exosip/include
\
$(LOCAL_PATH)
/../../externals/osip/include
LOCAL_LDLIBS
+=
-llog
LOCAL_LDLIBS
+=
-llog
-ldl
LOCAL_STATIC_LIBRARIES
:=
\
libmediastreamer2
\
...
...
coreapi/linphonecore.c
View file @
56fc713b
...
...
@@ -3333,7 +3333,13 @@ unsigned long linphone_core_get_native_video_window_id(const LinphoneCore *lc){
* If not set the core will create its own window.
**/
void
linphone_core_set_native_video_window_id
(
LinphoneCore
*
lc
,
unsigned
long
id
){
#ifdef VIDEO_ENABLED
LinphoneCall
*
call
=
linphone_core_get_current_call
(
lc
);
lc
->
video_window_id
=
id
;
if
(
call
!=
NULL
&&
call
->
videostream
){
video_stream_set_native_window_id
(
call
->
videostream
,
id
);
}
#endif
}
/**
...
...
@@ -4034,3 +4040,4 @@ const char *linphone_error_to_string(LinphoneReason err){
}
return
"unknown error"
;
}
coreapi/linphonecore_jni.cc
View file @
56fc713b
...
...
@@ -943,3 +943,12 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendMessage(JNIEnv*
}
extern
"C"
void
Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
lc
,
jobject
obj
)
{
linphone_core_set_native_video_window_id
((
LinphoneCore
*
)
lc
,(
unsigned
long
)
obj
);
ms_message
(
"linphone_core_set_native_video_window_id() called !!!!!!!"
);
}
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