Commit a74ded3b authored by Simon Morlat's avatar Simon Morlat

fix audio-only build

parent 04abb576
mediastreamer2 @ 763daeec
Subproject commit ea929123dc1ac4f7c9ade03be6a4e8c69635f26c
Subproject commit 763daeec4bf74580a140b3572f50ab676c7926bf
oRTP @ 235d9d5b
Subproject commit c1d4d9fb000ed3208ebb2f5b79987dfb115f0c99
Subproject commit 235d9d5bd7d78d16a078c1cb0e3029fc9522797f
......@@ -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
......
......@@ -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
......
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment