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
a74ded3b
Commit
a74ded3b
authored
Mar 26, 2015
by
Simon Morlat
Browse files
fix audio-only build
parent
04abb576
Changes
5
Hide whitespace changes
Inline
Side-by-side
mediastreamer2
@
763daeec
Subproject commit
ea929123dc1a
c4f7
c9ade03be6a4e8c69635f26c
Subproject commit
763daee
c4
b
f7
4580a140b3572f50ab676c7926bf
oRTP
@
235d9d5b
Subproject commit
c1d4d9fb000ed3208ebb2f5b79987dfb115f0c99
Subproject commit
235d9d5bd7d78d16a078c1cb0e3029fc9522797f
tester/tester.c
View file @
a74ded3b
...
...
@@ -263,17 +263,14 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
{
MSWebCam
*
cam
;
#ifdef _MSC_VER
extern
__declspec
(
dllimport
)
MSWebCamDesc
mire_desc
;
#else
extern
MSWebCamDesc
mire_desc
;
#endif
cam
=
ms_web_cam_manager_get_cam
(
ms_web_cam_manager_get
(),
"Mire: Mire (synthetic moving picture)"
);
if
(
cam
==
NULL
)
{
cam
=
ms_web_cam_new
(
&
mire_desc
);
ms_web_cam_manager_add_cam
(
ms_web_cam_manager_get
(),
cam
);
MSWebCamDesc
*
desc
=
ms_mire_webcam_desc_get
();
if
(
desc
){
cam
=
ms_web_cam_new
(
desc
);
ms_web_cam_manager_add_cam
(
ms_web_cam_manager_get
(),
cam
);
}
}
}
#endif
...
...
tools/Makefile.am
View file @
a74ded3b
...
...
@@ -45,7 +45,8 @@ lp_gen_wrappers_LDADD= \
auto_answer_SOURCES
=
auto_answer.c
auto_answer_CFLAGS
=
$(COMMON_CFLAGS)
auto_answer_LDADD
=
\
$(top_builddir)
/coreapi/liblinphone.la
$(top_builddir)
/coreapi/liblinphone.la
\
$(MEDIASTREAMER_LIBS)
endif
...
...
tools/auto_answer.c
View file @
a74ded3b
...
...
@@ -138,8 +138,13 @@ int main(int argc, char *argv[]){
linphone_core_set_play_file
(
lc
,
PACKAGE_DATA_DIR
"/sounds/linphone/hello16000.wav"
);
linphone_core_set_use_files
(
lc
,
TRUE
);
ms_web_cam_manager_add_cam
(
ms_web_cam_manager_get
(),
ms_web_cam_new
(
&
mire_desc
));
linphone_core_set_video_device
(
lc
,
"Mire: Mire (synthetic moving picture)"
);
{
MSWebCamDesc
*
desc
=
ms_mire_webcam_desc_get
();
if
(
desc
){
ms_web_cam_manager_add_cam
(
ms_web_cam_manager_get
(),
ms_web_cam_new
(
desc
));
linphone_core_set_video_device
(
lc
,
"Mire: Mire (synthetic moving picture)"
);
}
}
if
(
!
addr
)
{
addr
=
linphone_address_new
(
"sip:bot@localhost:5060"
);
...
...
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